From: Andy Allan Date: Wed, 28 Feb 2018 07:46:25 +0000 (+0800) Subject: Merge branch 'master' into moderation X-Git-Tag: live~3002^2~45 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493?hp=7821bf48ad301c4d4253ed0ae7f6d53e2176b6bc Merge branch 'master' into moderation --- diff --git a/.rubocop.yml b/.rubocop.yml index 55be8141c..5e7be9797 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -41,12 +41,18 @@ Naming/FileName: Rails/ApplicationRecord: Enabled: false +Rails/CreateTableWithTimestamps: + Enabled: false + Rails/HasManyOrHasOneDependent: Enabled: false Rails/HttpPositionalArguments: Enabled: false +Rails/InverseOf: + Enabled: false + Rails/SkipsModelValidations: Exclude: - 'db/migrate/*.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d22f0f73c..5846de44f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -55,11 +55,6 @@ Lint/InterpolationCheck: Exclude: - 'test/controllers/node_controller_test.rb' -# Offense count: 2 -Lint/RescueWithoutErrorClass: - Exclude: - - 'app/helpers/browse_helper.rb' - # Offense count: 2 Lint/ShadowingOuterLocalVariable: Exclude: @@ -82,7 +77,7 @@ Metrics/BlockNesting: # Offense count: 63 # Configuration parameters: CountComments. Metrics/ClassLength: - Max: 1796 + Max: 1797 # Offense count: 71 Metrics/CyclomaticComplexity: @@ -227,3 +222,8 @@ Style/NumericLiterals: # SupportedStyles: compact, exploded Style/RaiseArgs: Enabled: false + +# Offense count: 2 +Style/RescueStandardError: + Exclude: + - 'app/helpers/browse_helper.rb' diff --git a/.travis.yml b/.travis.yml index 48ddb4a1d..8ae3d1141 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ env: - OSM_MEMCACHE_SERVERS="127.0.0.1" before_script: - cp config/example.application.yml config/application.yml + - ruby -C lib/quad_tile extconf.rb + - make -C lib/quad_tile - psql -U postgres -c "CREATE DATABASE openstreetmap" - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap - make -C db/functions libpgosm.so diff --git a/Gemfile b/Gemfile index 67a3a1f5e..55493b9b6 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "psych", :platforms => :ruby_20 gem "json" # Use postgres as the database -gem "pg" +gem "pg", "~> 0.18" # Use SCSS for stylesheets gem "sass-rails", "~> 5.0" @@ -48,7 +48,7 @@ gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" -gem "paperclip", "~> 4.0" +gem "paperclip", "~> 5.2" gem "rack-cors" gem "rails-i18n", "~> 4.0.0" gem "record_tag_helper" diff --git a/Gemfile.lock b/Gemfile.lock index 9164f63d1..601477824 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,20 +48,20 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (8.0.0) - ast (2.3.0) - autoprefixer-rails (7.1.6) + ast (2.4.0) + autoprefixer-rails (8.0.0) execjs bigdecimal (1.1.0) builder (3.2.3) - canonical-rails (0.2.1) + canonical-rails (0.2.2) rails (>= 4.1, < 5.2) - capybara (2.16.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) @@ -73,8 +73,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.1) - activerecord (~> 5.1.0) + composite_primary_keys (10.0.2) + activerecord (~> 5.1.0, >= 5.1.4) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -90,7 +90,7 @@ GEM dynamic_form (1.1.4) erubi (1.7.0) execjs (2.7.0) - exifr (1.3.2) + exifr (1.3.3) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -98,20 +98,20 @@ GEM railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.9.21) fspath (3.1.0) geoip (1.6.3) globalid (0.4.1) activesupport (>= 4.2.0) hashdiff (0.3.7) - hashie (3.5.6) + hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.2) + i18n-js (3.0.4) i18n (~> 0.6, >= 0.6.6) - image_optim (0.26.0) + image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -138,9 +138,9 @@ GEM actionpack jsonify (< 0.4.0) jwt (1.5.6) - kgio (2.11.0) + kgio (2.11.2) libv8 (3.16.14.19) - libxml-ruby (3.0.0) + libxml-ruby (3.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -150,7 +150,7 @@ GEM activesupport (>= 4.0) logstash-event (~> 1.2.0) request_store - loofah (2.1.1) + loofah (2.2.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -159,17 +159,17 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - multi_json (1.12.2) + minitest (5.11.3) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nio4r (2.1.0) - nokogiri (1.8.1) + nio4r (2.2.0) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogumbo (1.4.13) + nokogumbo (1.5.0) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -183,7 +183,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.7.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -191,19 +191,18 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) omniauth-mediawiki (0.0.3) jwt (~> 1.0) omniauth-oauth (~> 1.0) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -212,27 +211,27 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (4.3.7) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.2.1) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types - mimemagic (= 0.3.0) - parallel (1.12.0) + mimemagic (~> 0.3.0) + parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) pg (0.21.0) - poltergeist (1.16.0) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) progress (3.4.0) - psych (2.2.4) - public_suffix (3.0.1) - puma (3.11.0) + psych (3.0.2) + public_suffix (3.0.2) + puma (3.11.2) r2 (0.2.7) - rack (2.0.3) + rack (2.0.4) rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) @@ -270,8 +269,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -280,25 +278,26 @@ GEM actionview (~> 5.x) redcarpet (3.4.0) ref (2.0.0) - request_store (1.3.2) - rinku (2.0.3) + request_store (1.4.0) + rack (>= 1.4) + rinku (2.0.4) rotp (3.3.0) - rubocop (0.51.0) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) ruby-progressbar (1.9.0) ruby_dep (1.5.0) safe_yaml (1.0.4) - sanitize (4.5.0) + sanitize (4.6.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.5.3) + nokogumbo (~> 1.4) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -309,7 +308,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (5.0.3) + secure_headers (5.0.5) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -331,25 +330,25 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.16.0) - tzinfo (1.2.4) + tins (1.16.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.6) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) - useragent (0.16.8) + useragent (0.16.10) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.1.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -393,8 +392,8 @@ DEPENDENCIES omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) - paperclip (~> 4.0) - pg + paperclip (~> 5.2) + pg (~> 0.18) poltergeist psych puma (~> 3.7) diff --git a/INSTALL.md b/INSTALL.md index 7571cff50..768cbd540 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -32,7 +32,7 @@ sudo apt-get install ruby2.3 libruby2.3 ruby2.3-dev \ libmagickwand-dev libxml2-dev libxslt1-dev nodejs \ apache2 apache2-dev build-essential git-core \ postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \ - libsasl2-dev imagemagick + libsasl2-dev imagemagick libffi-dev sudo gem2.3 install bundler ``` @@ -47,7 +47,7 @@ sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ libxml2-devel js \ gcc gcc-c++ git \ postgresql postgresql-server postgresql-contrib postgresql-devel \ - perl-podlators ImageMagick + perl-podlators ImageMagick libffi-devel ``` If you didn't already have PostgreSQL installed then create a PostgreSQL instance and start the server: diff --git a/app/assets/images/banners/banner-sotmus2017.png b/app/assets/images/banners/banner-sotmus2017.png deleted file mode 100644 index 25382bf4a..000000000 Binary files a/app/assets/images/banners/banner-sotmus2017.png and /dev/null differ diff --git a/app/assets/images/banners/foss4g-it2018-banner.png b/app/assets/images/banners/foss4g-it2018-banner.png new file mode 100755 index 000000000..7ed898f8b Binary files /dev/null and b/app/assets/images/banners/foss4g-it2018-banner.png differ diff --git a/app/assets/images/banners/fossgis2018.png b/app/assets/images/banners/fossgis2018.png new file mode 100644 index 000000000..bff192990 Binary files /dev/null and b/app/assets/images/banners/fossgis2018.png differ diff --git a/app/assets/images/banners/osmf-membership-drive-2017.png b/app/assets/images/banners/osmf-membership-drive-2017.png deleted file mode 100644 index 0b62b2168..000000000 Binary files a/app/assets/images/banners/osmf-membership-drive-2017.png and /dev/null differ diff --git a/app/assets/images/banners/sotmasia-2017-banner.png b/app/assets/images/banners/sotmasia-2017-banner.png deleted file mode 100644 index f18f5bf72..000000000 Binary files a/app/assets/images/banners/sotmasia-2017-banner.png and /dev/null differ diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png index c511bd90f..e25617013 100644 Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index df8e3e3d5..b9270279f 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,290 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - -

' + I18n.t('javascripts.directions.errors.no_route') + '

'); } @@ -202,7 +216,7 @@ OSM.Directions = function (map) { .setLatLngs(route.line) .addTo(map); - if (!dragging) { + if (fitRoute) { map.fitBounds(polyline.getBounds().pad(0.05)); } @@ -305,13 +319,13 @@ OSM.Directions = function (map) { chosenEngine = engines[e.target.selectedIndex]; $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' }); if (map.hasLayer(polyline)) { - getRoute(); + getRoute(true, true); } }); $(".directions_form").on("submit", function(e) { e.preventDefault(); - getRoute(); + getRoute(true, true); }); $(".routing_marker").on('dragstart', function (e) { @@ -344,28 +358,24 @@ OSM.Directions = function (map) { pt.y += 20; var ll = map.containerPointToLatLng(pt); endpoints[type === 'from' ? 0 : 1].setLatLng(ll); - getRoute(); + getRoute(true, true); }); var params = querystring.parse(location.search.substring(1)), - route = (params.route || '').split(';'); + route = (params.route || '').split(';'), + from = route[0] && L.latLng(route[0].split(',')), + to = route[1] && L.latLng(route[1].split(',')); if (params.engine) { setEngine(params.engine); } - endpoints[0].setValue(params.from || ""); - endpoints[1].setValue(params.to || ""); - - var o = route[0] && L.latLng(route[0].split(',')), - d = route[1] && L.latLng(route[1].split(',')); - - if (o) endpoints[0].setLatLng(o); - if (d) endpoints[1].setLatLng(d); + endpoints[0].setValue(params.from || "", from); + endpoints[1].setValue(params.to || "", to); - map.setSidebarOverlaid(!o || !d); + map.setSidebarOverlaid(!from || !to); - getRoute(); + getRoute(true, true); }; page.load = function() { diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index e7c91e9dc..e31c053ef 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -95,9 +95,41 @@ function OSRMEngine() { Array.prototype.push.apply(line, step_geometry); var instText = "" + (idx + 1) + ". "; - var name = step.name ? "" + step.name + "" : I18n.t('javascripts.directions.instructions.unnamed'); + var destinations = "" + step.destinations + ""; + var namedRoad = true; + var name; + + if (step.name && step.ref) { + name = "" + step.name + " (" + step.ref + ")"; + } else if (step.name) { + name = "" + step.name + ""; + } else if (step.ref) { + name = "" + step.ref + ""; + } else { + name = I18n.t('javascripts.directions.instructions.unnamed'); + namedRoad = false; + } + if (step.maneuver.type.match(/rotary|roundabout/)) { - instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } ); + if (step.maneuver.exit) { + instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } ); + } else { + instText += I18n.t(template + '_without_exit', { name: name } ); + } + } else if (step.maneuver.type.match(/on ramp|off ramp/)) { + if (step.destinations) { + if (namedRoad) { + instText += I18n.t(template + '_with_name_and_directions', { name: name, directions: destinations } ); + } else { + instText += I18n.t(template + '_with_directions', { directions: destinations } ); + } + } else { + if (namedRoad) { + instText += I18n.t(template + '_without_exit', { name: name }); + } else { + instText += I18n.t(template + '_without_directions'); + } + } } else { instText += I18n.t(template + '_without_exit', { name: name }); } diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js index 7cfd50c8e..044c767cf 100644 --- a/app/assets/javascripts/leaflet.share.js +++ b/app/assets/javascripts/leaflet.share.js @@ -346,7 +346,7 @@ L.OSM.share = function (options) { $('#embed_html').val( '
' + '' + escapeHTML(I18n.t('javascripts.share.view_larger_map')) + ''); diff --git a/app/assets/javascripts/leaflet.zoom.js b/app/assets/javascripts/leaflet.zoom.js index 205527432..0ef0f64de 100644 --- a/app/assets/javascripts/leaflet.zoom.js +++ b/app/assets/javascripts/leaflet.zoom.js @@ -53,7 +53,7 @@ L.OSM.Zoom = L.Control.extend({ _updateDisabled: function () { var map = this._map, - className = 'leaflet-disabled'; + className = 'disabled'; L.DomUtil.removeClass(this._zoomInButton, className); L.DomUtil.removeClass(this._zoomOutButton, className); diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 971f80be3..a67117510 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -6,6 +6,7 @@ OSM = { <% end %> MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, + SERVER_PROTOCOL: <%= SERVER_PROTOCOL.to_json %>, SERVER_URL: <%= SERVER_URL.to_json %>, API_VERSION: <%= API_VERSION.to_json %>, STATUS: <%= STATUS.to_json %>, diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index f647302fb..3e64728a7 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1002,6 +1002,11 @@ header .search_forms, vertical-align: middle; } } + + a.reverse_directions { + cursor: pointer; + margin: 0px 0px 5px 25px; + } } /* Rules for the map key which appears in the popout sidebar */ diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 4c24a1cec..9f909ea10 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -508,14 +508,10 @@ class AmfController < ApplicationController rels = [] if searchterm.to_i > 0 rel = Relation.where(:id => searchterm.to_i).first - if rel && rel.visible - rels.push([rel.id, rel.tags, rel.members, rel.version]) - end + rels.push([rel.id, rel.tags, rel.members, rel.version]) if rel && rel.visible else RelationTag.where("v like ?", "%#{searchterm}%").limit(11).each do |t| - if t.relation.visible - rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) - end + rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) if t.relation.visible end end rels @@ -558,9 +554,7 @@ class AmfController < ApplicationController mid = renumberednodes[mid] if m[0] == "Node" mid = renumberedways[mid] if m[0] == "Way" end - if mid - typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] - end + typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] if mid end # assign new contents @@ -748,9 +742,7 @@ class AmfController < ApplicationController return [-4, "node", id] end - unless visible || node.ways.empty? - return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version - end + return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version unless visible || node.ways.empty? end # We always need a new node, based on the data that has been sent to us new_node = Node.new @@ -793,9 +785,7 @@ class AmfController < ApplicationController n = Node.where(:id => id).first if n v = n.version - unless timestamp == "" - n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first - end + n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless timestamp == "" end if n diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index c6cc3ba5f..f9b48cb1c 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -157,9 +157,7 @@ class ApiController < ApplicationController # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0] - unless nodes_to_fetch.empty? - nodes += Node.includes(:node_tags).find(nodes_to_fetch) - end + nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty? visible_nodes = {} changeset_cache = {} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a51dad875..a24df48e0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,9 +29,7 @@ class ApplicationController < ActionController::Base end end elsif session[:token] - if self.current_user = User.authenticate(:token => session[:token]) - session[:user] = current_user.id - end + session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end rescue StandardError => ex logger.info("Exception authorizing user: #{ex}") @@ -381,9 +379,7 @@ class ApplicationController < ActionController::Base ## # ensure that there is a "this_user" instance variable def lookup_this_user - unless @this_user = User.active.find_by(:display_name => params[:display_name]) - render_unknown_user params[:display_name] - end + render_unknown_user params[:display_name] unless @this_user = User.active.find_by(:display_name => params[:display_name]) end ## @@ -469,9 +465,7 @@ class ApplicationController < ActionController::Base authdata = request.env["HTTP_AUTHORIZATION"].to_s.split end # only basic authentication supported - if authdata && authdata[0] == "Basic" - user, pass = Base64.decode64(authdata[1]).split(":", 2) - end + user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic" [user, pass] end diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 8fbbe1362..0a63d5253 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -7,12 +7,12 @@ class ChangesetController < ApplicationController skip_before_action :verify_authenticity_token, :except => [:list] before_action :authorize_web, :only => [:list, :feed, :comments_feed] before_action :set_locale, :only => [:list, :feed, :comments_feed] - before_action :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :authorize, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_action :require_moderator, :only => [:hide_comment, :unhide_comment] - before_action :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_action :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe] - before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] + before_action :require_allow_write_api, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :require_public_data, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe] + before_action :check_api_writable, :only => [:create, :update, :upload, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed] around_action :api_call_timeout, :except => [:list, :feed, :comments_feed, :upload] @@ -296,9 +296,7 @@ class ChangesetController < ApplicationController changesets = changesets.where(:user_id => current_user.nearby) end - if @params[:max_id] - changesets = changesets.where("changesets.id <= ?", @params[:max_id]) - end + changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id] @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments) @@ -334,9 +332,7 @@ class ChangesetController < ApplicationController # Notify current subscribers of the new comment changeset.subscribers.visible.each do |user| - if current_user != user - Notifier.changeset_comment_notification(comment, user).deliver_now - end + Notifier.changeset_comment_notification(comment, user).deliver_now if current_user != user end # Add the commenter to the subscribers if necessary @@ -357,7 +353,6 @@ class ChangesetController < ApplicationController # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open? raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.exists?(current_user.id) # Add the subscriber @@ -378,7 +373,6 @@ class ChangesetController < ApplicationController # Find the changeset and check it is valid changeset = Changeset.find(id) - raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open? raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.exists?(current_user.id) # Remove the subscriber diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 9e0fd4991..5bd95775d 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -65,9 +65,7 @@ class DiaryEntryController < ApplicationController # Notify current subscribers of the new comment @entry.subscribers.visible.each do |user| - if current_user != user - Notifier.diary_comment_notification(@diary_comment, user).deliver_now - end + Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user end # Add the commenter to the subscribers if necessary @@ -159,7 +157,7 @@ class DiaryEntryController < ApplicationController @entries = user.diary_entries @title = I18n.t("diary_entry.feed.user.title", :user => user.display_name) @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name) - @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" + @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/user/#{user.display_name}/diary" else head :not_found return @@ -171,11 +169,11 @@ class DiaryEntryController < ApplicationController @entries = @entries.where(:language_code => params[:language]) @title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name) @description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name) - @link = "http://#{SERVER_URL}/diary/#{params[:language]}" + @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary/#{params[:language]}" else @title = I18n.t("diary_entry.feed.all.title") @description = I18n.t("diary_entry.feed.all.description") - @link = "http://#{SERVER_URL}/diary" + @link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary" end end diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index 1b7beaad6..afdf4d8d7 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -19,7 +19,7 @@ class ExportController < ApplicationController format = params[:mapnik_format] scale = params[:mapnik_scale] - redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" + redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" end end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index b9bde31ab..e9fa7f26a 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -112,9 +112,7 @@ class GeocoderController < ApplicationController maxlat = params[:maxlat] # get view box - if minlon && minlat && maxlon && maxlat - viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" - end + viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat # get objects to excude exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude] @@ -153,9 +151,7 @@ class GeocoderController < ApplicationController rank = (place.attributes["place_rank"].to_i + 1) / 2 prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name place.elements["extratags"].elements.each("tag") do |extratag| - if extratag.attributes["key"] == "place" - prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name - end + prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place" end end prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 29651bceb..20baf6bb4 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -40,9 +40,7 @@ class NodeController < ApplicationController node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - unless new_node && new_node.id == node.id - raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id node.update_from(new_node, current_user) render :plain => node.version.to_s @@ -55,24 +53,18 @@ class NodeController < ApplicationController node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - unless new_node && new_node.id == node.id - raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id node.delete_with_history!(new_node, current_user) render :plain => node.version.to_s end # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes - unless params["nodes"] - raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"] ids = params["nodes"].split(",").collect(&:to_i) - if ids.empty? - raise OSM::APIBadUserInput, "No nodes were given to search for" - end + raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty? doc = OSM::API.new.get_xml_doc Node.find(ids).each do |node| diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 92f63e304..a51d70f90 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -350,9 +350,7 @@ class NotesController < ApplicationController comment = note.comments.create!(attributes) note.comments.map(&:author).uniq.each do |user| - if notify && user && user != current_user && user.visible? - Notifier.note_comment_notification(comment, user).deliver_now - end + Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible? end end end diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 734783a35..84bbcf185 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -63,9 +63,7 @@ class OauthController < ApplicationController "&oauth_token=#{@token.token}" end - unless @token.oauth10? - @redirect_url.query += "&oauth_verifier=#{@token.verifier}" - end + @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10? redirect_to @redirect_url.to_s end diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 25532a95c..059fb8d7e 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -35,9 +35,7 @@ class RelationController < ApplicationController relation = Relation.find(params[:id]) new_relation = Relation.from_xml(request.raw_post) - unless new_relation && new_relation.id == relation.id - raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id relation.update_from new_relation, current_user render :plain => relation.version.to_s @@ -123,15 +121,11 @@ class RelationController < ApplicationController end def relations - unless params["relations"] - raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"] ids = params["relations"].split(",").collect(&:to_i) - if ids.empty? - raise OSM::APIBadUserInput, "No relations were given to search for" - end + raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty? doc = OSM::API.new.get_xml_doc diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 74dbc41f5..fa8ec5a1e 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -11,9 +11,7 @@ class SiteController < ApplicationController before_action :update_totp, :only => [:index] def index - unless STATUS == :database_readonly || STATUS == :database_offline - session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) - end + session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline end def permalink @@ -147,9 +145,7 @@ class SiteController < ApplicationController def redirect_map_params anchor = [] - if params[:lat] && params[:lon] - anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" - end + anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon] if params[:layers] anchor << "layers=#{params.delete(:layers)}" @@ -157,8 +153,6 @@ class SiteController < ApplicationController anchor << "layers=N" end - if anchor.present? - redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) - end + redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present? end end diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 105405ccf..a720c5fff 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -119,9 +119,7 @@ class TraceController < ApplicationController if @trace.id flash[:notice] = t "trace.create.trace_uploaded" - if current_user.traces.where(:inserted => false).count > 4 - flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count - end + flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4 redirect_to :action => :list, :display_name => current_user.display_name end @@ -176,9 +174,7 @@ class TraceController < ApplicationController @trace.description = params[:trace][:description] @trace.tagstring = params[:trace][:tagstring] @trace.visibility = params[:trace][:visibility] - if @trace.save - redirect_to :action => "view", :display_name => current_user.display_name - end + redirect_to :action => "view", :display_name => current_user.display_name if @trace.save end end rescue ActiveRecord::RecordNotFound @@ -205,9 +201,7 @@ class TraceController < ApplicationController def georss @traces = Trace.visible_to_all.visible - if params[:display_name] - @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) - end + @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name] @traces = @traces.tagged(params[:tag]) if params[:tag] @traces = @traces.order("timestamp DESC") diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 5c41a79dc..0c3ad0b05 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -45,9 +45,7 @@ class UserController < ApplicationController if current_user current_user.terms_seen = true - if current_user.save - flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe - end + flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save if params[:referer] redirect_to params[:referer] @@ -533,9 +531,7 @@ class UserController < ApplicationController session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid - if email_verified && email == session[:new_user].email - session[:new_user].status = "active" - end + session[:new_user].status = "active" if email_verified && email == session[:new_user].email redirect_to :action => "terms" else diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a330eb5f9..adcf5c6c0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -40,9 +40,7 @@ module ApplicationHelper end def if_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") - end + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user end def unless_user(user, tag = :div, &block) @@ -110,9 +108,7 @@ module ApplicationHelper if current_user data[:user] = current_user.id.to_json - unless current_user.home_lon.nil? || current_user.home_lat.nil? - data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } - end + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil? end data[:location] = session[:location] if session[:location] diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c2e974e93..b90e27f85 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -8,18 +8,14 @@ module BrowseHelper object.id end name = t "printable_name.with_id", :id => id.to_s - if version - name = t "printable_name.with_version", :id => name, :version => object.version.to_s - end + name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. unless object.redacted? locale = I18n.locale.to_s - while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") - locale = locale.sub(/-[^-]+/, "") - end + locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") if object.tags.include? "name:#{locale}" name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 2ec26ecee..502637c2a 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -55,9 +55,6 @@ class Changeset < ActiveRecord::Base before_save :update_closed_at - # over-expansion factor to use when updating the bounding box - EXPAND = 0.1 - # maximum number of elements allowed in a changeset MAX_ELEMENTS = 10000 @@ -127,12 +124,9 @@ class Changeset < ActiveRecord::Base end ## - # expand the bounding box to include the given bounding box. also, - # expand a little bit more in the direction of the expansion, so that - # further expansions may be unnecessary. this is an optimisation - # suggested on the wiki page by kleptog. + # expand the bounding box to include the given bounding box. def update_bbox!(bbox_update) - bbox.expand!(bbox_update, EXPAND) + bbox.expand!(bbox_update) # update active record. rails 2.1's dirty handling should take care of # whether this object needs saving or not. @@ -141,8 +135,7 @@ class Changeset < ActiveRecord::Base ## # the number of elements is also passed in so that we can ensure that - # a single changeset doesn't contain too many elements. this, of course, - # destroys the optimisation described in the bbox method above. + # a single changeset doesn't contain too many elements. def add_changes!(elements) self.num_changes += elements end diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 8f9e3e295..36564f614 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -9,6 +9,7 @@ class Notifier < ActionMailer::Base def signup_confirm(user, token) with_recipient_locale user do @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "confirm", :display_name => user.display_name, :confirm_string => token.token) @@ -22,6 +23,7 @@ class Notifier < ActionMailer::Base with_recipient_locale user do @address = user.new_email @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "confirm_email", :confirm_string => token.token) @@ -33,6 +35,7 @@ class Notifier < ActionMailer::Base def lost_password(user, token) with_recipient_locale user do @url = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "reset_password", :token => token.token) @@ -73,9 +76,11 @@ class Notifier < ActionMailer::Base @text = message.body @title = message.title @readurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "read", :message_id => message.id) @replyurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "reply", :message_id => message.id) @author = @from_user @@ -95,18 +100,21 @@ class Notifier < ActionMailer::Base @text = comment.body @title = comment.diary_entry.title @readurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "diary_entry", :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id, :anchor => "comment#{comment.id}") @commenturl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "diary_entry", :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id, :anchor => "newcomment") @replyurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "message", :action => "new", :display_name => comment.user.display_name, @@ -125,9 +133,11 @@ class Notifier < ActionMailer::Base with_recipient_locale friend.befriendee do @friend = friend @viewurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "view", :display_name => @friend.befriender.display_name) @friendurl = url_for(:host => SERVER_URL, + :protocol => SERVER_PROTOCOL, :controller => "user", :action => "make_friend", :display_name => @friend.befriender.display_name) @author = @friend.befriender.display_name diff --git a/app/models/relation.rb b/app/models/relation.rb index 157794cd6..2495830ee 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -182,9 +182,7 @@ class Relation < ActiveRecord::Base end def delete_with_history!(new_relation, user) - unless visible - raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) - end + raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) unless visible # need to start the transaction here, so that the database can # provide repeatable reads for the used-by checks. this means it @@ -208,9 +206,7 @@ class Relation < ActiveRecord::Base Relation.transaction do lock! check_consistency(self, new_relation, user) - unless new_relation.preconditions_ok?(members) - raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." unless new_relation.preconditions_ok?(members) self.changeset_id = new_relation.changeset_id self.changeset = new_relation.changeset self.tags = new_relation.tags @@ -222,9 +218,7 @@ class Relation < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok? self.version = 0 self.visible = true save_with_history! @@ -259,9 +253,7 @@ class Relation < ActiveRecord::Base element = model.lock("for share").find_by(:id => m[1]) # and check that it is OK to use. - unless element && element.visible? && element.preconditions_ok? - raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" - end + raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element && element.visible? && element.preconditions_ok? hash[m[1]] = true end diff --git a/app/models/user.rb b/app/models/user.rb index 678bbad9d..352c58fb5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -283,9 +283,7 @@ class User < ActiveRecord::Base ## # perform a spam check on a user def spam_check - if status == "active" && spam_score > SPAM_THRESHOLD - update(:status => "suspended") - end + update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD end ## diff --git a/app/models/way.rb b/app/models/way.rb index 1954f744c..e5b73ceaa 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -120,14 +120,10 @@ class Way < ActiveRecord::Base way_nodes.each do |nd| if visible_nodes # if there is a list of visible nodes then use that to weed out deleted nodes - if visible_nodes[nd.node_id] - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id] else # otherwise, manually go to the db to check things - if nd.node && nd.node.visible? - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node && nd.node.visible? end end @@ -184,9 +180,7 @@ class Way < ActiveRecord::Base Way.transaction do lock! check_consistency(self, new_way, user) - unless new_way.preconditions_ok?(nds) - raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds) self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset @@ -199,9 +193,7 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok? self.version = 0 self.visible = true save_with_history! @@ -209,9 +201,7 @@ class Way < ActiveRecord::Base def preconditions_ok?(old_nodes = []) return false if nds.empty? - if nds.length > MAX_NUMBER_OF_WAY_NODES - raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) - end + raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) if nds.length > MAX_NUMBER_OF_WAY_NODES # check only the new nodes, for efficiency - old nodes having been checked last time and can't # be deleted when they're in-use. diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index 2637d28b2..98b3c6c54 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -23,6 +23,9 @@ <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { disable_with: false } %> +
+ <%= t('site.search.reverse_directions_text') %> +
<%= image_tag "searching.gif" %>
diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index 99d570cf0..0fecd8f99 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -15,8 +15,7 @@ (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) <% end %> ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> - <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> / - <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> / + <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> / <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> <%= t('trace.trace.' + trace.visibility) %>
diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index dda78f954..57cc39a08 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -25,7 +25,7 @@ <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> <%= t'trace.view.start_coordinates' %> -
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>) +
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>) <% end %> diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder index 0e8bfa5ef..fe5af4bcf 100644 --- a/app/views/user/api_read.builder +++ b/app/views/user/api_read.builder @@ -10,9 +10,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do else xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present? end - if @this_user.image.file? || @this_user.image_use_gravatar - xml.tag! "img", :href => user_image_url(@this_user, :size => 256) - end + xml.tag! "img", :href => user_image_url(@this_user, :size => 256) if @this_user.image.file? || @this_user.image_use_gravatar xml.tag! "roles" do @this_user.roles.each do |role| xml.tag! role.role diff --git a/config/application.rb b/config/application.rb index 02dd1d2b2..9ba122daf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -34,9 +34,7 @@ module OpenStreetMap config.paths["app/models"].skip_eager_load! if STATUS == :database_offline # Use memcached for caching if required - if defined?(MEMCACHE_SERVERS) - config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } - end + config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS) # Use logstash for logging if required if defined?(LOGSTASH_PATH) diff --git a/config/banners.yml b/config/banners.yml index ce53c3f02..8cc7be5f0 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -1,18 +1,12 @@ -sotmasia2017: - id: sotmasia2017 - alt: State of the Map Asia 2017 - link: http://stateofthemap.asia/ - img: banners/sotmasia-2017-banner.png - enddate: 2017-sep-25 -sotmus2017: - id: sotmus2017 - alt: State of the Map US 2017 - link: https://2017.stateofthemap.us/ - img: banners/banner-sotmus2017.png - enddate: 2017-oct-20 -osmfmembership2017: - id: osmfmembership2017 - alt: Join the OpenStreetMap Foundation - link: https://blog.openstreetmap.org/2017/09/25/join-the-openstreetmap-foundation-now-and-help-shape-the-future-of-the-project/ - img: banners/osmf-membership-drive-2017.png - enddate: 2017-nov-11 +fossgis2018: + id: fossgis2018 + alt: FOSSGIS Conference 2018 + link: https://fossgis-konferenz.de/2018/ + img: banners/fossgis2018.png + enddate: 2018-mar-24 +osmit2018: + id: osmit2018 + alt: FOSS4G-IT 2018 + link: http://foss4g-it2018.gfoss.it/ + img: banners/foss4g-it2018-banner.png + enddate: 2018-feb-22 diff --git a/config/environments/development.rb b/config/environments/development.rb index 8e7213a9d..97226480c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -35,9 +35,7 @@ Rails.application.configure do config.active_support.deprecation = :log # Raise an error on page load if there are pending migrations. - unless STATUS == :database_offline - config.active_record.migration_error = :page_load - end + config.active_record.migration_error = :page_load unless STATUS == :database_offline # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large diff --git a/config/environments/production.rb b/config/environments/production.rb index c4c98ad48..56bd22881 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -93,9 +93,7 @@ Rails.application.configure do end # Do not dump schema after migrations. - unless STATUS == :database_offline - config.active_record.dump_schema_after_migration = false - end + config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline # Enable autoloading of dependencies. config.enable_dependency_loading = true diff --git a/config/initializers/compressed_requests.rb b/config/initializers/compressed_requests.rb new file mode 100644 index 000000000..c6a84a103 --- /dev/null +++ b/config/initializers/compressed_requests.rb @@ -0,0 +1,42 @@ +module OpenStreetMap + class CompressedRequests + def initialize(app) + @app = app + end + + def method_handled?(env) + %w[POST PUT].include? env["REQUEST_METHOD"] + end + + def encoding_handled?(env) + %w[gzip deflate].include? env["HTTP_CONTENT_ENCODING"] + end + + def call(env) + if method_handled?(env) && encoding_handled?(env) + extracted = decode(env["rack.input"], env["HTTP_CONTENT_ENCODING"]) + + env.delete("HTTP_CONTENT_ENCODING") + env["CONTENT_LENGTH"] = extracted.bytesize + env["rack.input"] = StringIO.new(extracted) + end + + if env["HTTP_CONTENT_ENCODING"] + [415, {}, []] + else + @app.call(env) + end + end + + def decode(input, content_encoding) + input.rewind + + case content_encoding + when "gzip" then Zlib::GzipReader.new(input).read + when "deflate" then Zlib::Inflate.inflate(input.read) + end + end + end +end + +Rails.configuration.middleware.use OpenStreetMap::CompressedRequests diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index ee0b0d98f..2bd558d2f 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -7,9 +7,7 @@ module OpenStreetMap class Cors < Rack::Cors def call(env) status, headers, body = super env - if headers["Access-Control-Allow-Origin"] - headers["Cache-Control"] = "no-cache" - end + headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"] [status, headers, body] end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 180469bfc..7e499c0e6 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -26,9 +26,7 @@ windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" github_options = { :name => "github", :scope => "user:email" } wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } } -if defined?(GOOGLE_OPENID_REALM) - google_options[:openid_realm] = GOOGLE_OPENID_REALM -end +google_options[:openid_realm] = GOOGLE_OPENID_REALM if defined?(GOOGLE_OPENID_REALM) Rails.application.config.middleware.use OmniAuth::Builder do provider :openid, openid_options diff --git a/config/locales/af.yml b/config/locales/af.yml index c5ab546a3..2da4b90fc 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -400,33 +400,26 @@ af: crematorium: Krematorium dentist: Tandarts doctors: Dokters - dormitory: Studentehuis drinking_water: Drinkwater driving_school: Bestuurskool embassy: Ambassade - emergency_phone: Noodtelefoon fast_food: Wegneemetes ferry_terminal: Pontterminaal - fire_hydrant: Brandkraan fire_station: Brandweerstasie food_court: Kosarea fountain: Fontein fuel: Brandstof gambling: Dobbelary grave_yard: Begraafplaas - gym: Fiksheidsentrum / Gim - health_centre: Gesondheidsentrum hospital: Hospitaal hunting_stand: Jagtoring ice_cream: Roomys kindergarten: Kleuterskool library: Biblioteek - market: Mark marketplace: Markplein monastery: Monnikeklooster motorcycle_parking: Motorfietsparkering nightclub: Nagklub - nursery: Kleuterskool nursing_home: Verpleging- en versorgingshuis office: Kantoor parking: Parkering @@ -440,7 +433,6 @@ af: prison: Tronk pub: Kroeg public_building: Openbare Gebou - reception_area: Ontvangsarea recycling: Herwinningspunt restaurant: Restaurant retirement_home: Ouetehuis @@ -530,7 +522,6 @@ af: trunk: Hoofroete trunk_link: Hoofroete unclassified: Ongeklassifiseerde pad - unsurfaced: Grondpad "yes": Straat historic: archaeological_site: Argeologiese werf @@ -590,7 +581,6 @@ af: leisure: beach_resort: Strandoord bird_hide: Voëlkykhuisie - club: Klub dog_park: Hondepark fishing: Visvanggebied fitness_centre: Fiksheidsentrum @@ -678,8 +668,6 @@ af: "yes": Kantoor place: allotments: Toekennings - block: Blokkeer - airport: Lughawe city: Stad country: Land county: Distrik @@ -691,7 +679,6 @@ af: islet: Eilandjie isolated_dwelling: Geïsoleerde woning locality: Ligging - moor: Vleiland municipality: Munisipaliteit neighbourhood: Woonbuurt postcode: Poskode @@ -708,10 +695,8 @@ af: abandoned: Verlate Spoorweg construction: Spoor in aanbou disused: Spoorweg in onbruik - disused_station: Spoorwegstasie in onbruik funicular: Kabelspoorweg halt: Treinhalte - historic_station: Historiese spoorwegstasie junction: Spoorwegkruising level_crossing: Spooroorgang light_rail: Ligte spoor @@ -772,7 +757,6 @@ af: hairdresser: Haarkapper hardware: Hardewarewinkel hifi: Hoëtrou - insurance: Versekering jewelry: Juwelierswinkel kiosk: Kiosk laundry: Wassery @@ -788,10 +772,8 @@ af: pet: Troeteldierwinkel pharmacy: Apteek photo: Fotowinkel - salon: Skoonheidssalon second_hand: Tweedehandswinkel shoes: Skoenwinkel - shopping_centre: Winkelsentrum sports: Sportwinkel stationery: Skryfbehoeftewinkel supermarket: Supermark diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 6d8730d99..23ab08ead 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -271,29 +271,22 @@ aln: crematorium: Krematorium dentist: Mjeku i dhomve doctors: Mjekët - dormitory: Konvikt drinking_water: Pirja e ujit driving_school: Auto shkollë embassy: Ambasada - emergency_phone: Urgjencës Phone fast_food: Ushqim I shpejtë ferry_terminal: Terminali i Trageteve - fire_hydrant: Zjarri hydrant fire_station: Zjarrëfiksat fountain: Burim fuel: Lëndë djegëse grave_yard: Varrezë - gym: Qendra Kalitje fizike / palestër - health_centre: Qendër e Shëndetësore hospital: Spital hunting_stand: Gjuetia Stand ice_cream: Akullore kindergarten: Kopshti i fëmijëve library: Bibliotekë - market: Treg marketplace: Treg nightclub: Night Club - nursery: Fidanishte nursing_home: shtëpi pleqsh office: Zyrë parking: Parking @@ -306,7 +299,6 @@ aln: prison: Burg pub: Pijetore public_building: Publike Ndërtimi - reception_area: Zona e pritjes recycling: Pika riciklimit restaurant: Restorant retirement_home: Daljes në pension Home @@ -363,7 +355,6 @@ aln: trunk: rrugën kryesore trunk_link: rrugën kryesore unclassified: Paklasifikuara Road - unsurfaced: Rrugë pa sipërfaqe historic: archaeological_site: Arkeologjik Faqes battlefield: Fushë beteje @@ -463,7 +454,6 @@ aln: wetland: Lagunat wood: Dru place: - airport: Aeroport city: Qyteti country: Veni county: Qark @@ -474,7 +464,6 @@ aln: island: Ishull islet: Ishull locality: Lokalitet - moor: Knete municipality: Komuna postcode: Post kodi region: Regjioni @@ -489,10 +478,8 @@ aln: abandoned: Braktisur hekurudhave construction: Hekurudhave në ndërtim disused: Hekurudhave papërdorur - disused_station: Stacioni hekurudhor Historike funicular: Me litar hekurudhave halt: Trajnimi Stop - historic_station: Stacioni hekurudhor Historike junction: Hekurudhave kryqëzim level_crossing: Kalim në nivel light_rail: hekurudhor Lehta @@ -550,7 +537,6 @@ aln: hairdresser: Floktar hardware: dyqan mjet hifi: dyqan hi-fi - insurance: Sigurim jewelry: Bizhuteri Shop kiosk: kiosk laundry: Lavanderi @@ -565,9 +551,7 @@ aln: outdoor: dyqan në natyrë pet: Shitore e kafshëve photo: dyqan fotografik - salon: Sallon shoes: dyqan këpucësh - shopping_centre: Qendra tregtare sports: Sport Dyqani stationery: dyqan shkrimi supermarket: Supermarket diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 0a01084cc..bb0daccfd 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -4,6 +4,7 @@ # Author: Ali1 # Author: Aude # Author: Ayatun +# Author: Azouz.anis # Author: Bassem JARKAS # Author: ButterflyOfFire # Author: Fahad @@ -455,33 +456,26 @@ ar: crematorium: محرقة جثث dentist: طبيب أسنان doctors: أطباء - dormitory: عنبر نوم drinking_water: مياه عذبة driving_school: مدرسة تعليم قيادة embassy: سفارة - emergency_phone: هاتف طوارئ fast_food: وجبات سريعة ferry_terminal: مرسى عبّارة - fire_hydrant: مواد مكافحة حرائق fire_station: فوج إطفاء food_court: مطعم وجبات سريعة fountain: نافورة fuel: وقود gambling: مقامرة grave_yard: مقبرة - gym: مركز للرشاقة/الرياضة - health_centre: مركز صحي hospital: مستشفى hunting_stand: مربط للصيد ice_cream: مثلجات kindergarten: حضانة أطفال library: مكتبة - market: سوق marketplace: سوق monastery: دير motorcycle_parking: مرآب دراجات نارية nightclub: نادي ليلي - nursery: رعاية تمريضية nursing_home: دار رعاية مسنين/معاقين office: مكتب parking: موقف سيارات @@ -495,7 +489,6 @@ ar: prison: سجن pub: حانة public_building: مبنى عام - reception_area: منطقة استقبال recycling: نقطة إعادة تصنيع restaurant: مطعم retirement_home: بيت مسنين @@ -582,6 +575,7 @@ ar: services: خدمات الطرق السريعة speed_camera: كاميرا كشف السرعة steps: درج + stop: إشارة وقوف street_lamp: مصباح شارع tertiary: طريق فرعي tertiary_link: طريق فرعي @@ -591,7 +585,6 @@ ar: trunk: طريق رئيسي trunk_link: طريق رئيسي unclassified: طريق غير مصنّف - unsurfaced: طريق غير معبد "yes": طريق historic: archaeological_site: موقع أثري @@ -619,6 +612,7 @@ ar: wayside_cross: صليب تذكاري wayside_shrine: مزار جانب طريق wreck: حطام + "yes": موقع تاريخي junction: "yes": تقاطع landuse: @@ -656,7 +650,6 @@ ar: leisure: beach_resort: شاطئ منتجع bird_hide: مخبئ طيور - club: نادي common: أرض مشاع dog_park: حديقة كلاب fishing: منطقة صيد سمك @@ -692,6 +685,7 @@ ar: airfield: منطقة عسكرية barracks: ثكنات bunker: دشمة + "yes": عسكري mountain_pass: "yes": ممر جبلي natural: @@ -742,6 +736,7 @@ ar: estate_agent: سمسار مباني government: دائرة حكومية insurance: مكتب شركة تأمين + it: مكتب تقنية معلومات lawyer: محامي ngo: مكتب منظمة غير حكومية telecommunication: مكتب شركة إتصالات @@ -749,8 +744,6 @@ ar: "yes": مكتب place: allotments: المخصصات - block: حظر - airport: مطار city: مدينة country: دولة county: مقاطعة @@ -762,7 +755,6 @@ ar: islet: جزيرة صغيرة isolated_dwelling: سكن منعزل locality: محلة - moor: أرض جرداء municipality: البلدية neighbourhood: حي postcode: الرمز البريدي @@ -779,10 +771,8 @@ ar: abandoned: سكة حديد مهجورة construction: سكة حديدية تحت الإنشاء disused: سكة حديد مهجورة - disused_station: محطة سكة حديدية مهجورة funicular: سكة حديدية معلقة halt: موقف قطار - historic_station: محطة سكة حديد تاريخية junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية light_rail: قطار خفيف @@ -846,7 +836,6 @@ ar: hairdresser: مزين/مصفف شعر hardware: متجر عتاد hifi: متجر هاي فاي - insurance: بوليصات تأمين jewelry: متجر مجوهرات kiosk: كشك laundry: مصبغة @@ -862,10 +851,8 @@ ar: pet: متجر حيوانات أليفة pharmacy: صيدلية photo: متجر صور - salon: صالون second_hand: متجر أغراض مستعملة shoes: متجر أحذية - shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت @@ -873,7 +860,7 @@ ar: toys: متجر ألعاب travel_agency: وكالة سفر video: متجر فيديو - wine: متجر نبيذ للبيع الخارجي + wine: محل لبيع النبيذ "yes": متجر tourism: alpine_hut: كوخ جبلي @@ -1089,6 +1076,11 @@ ar: community_driven_title: نابعة من المجتمع المحلي open_data_title: البيانات المفتوحة legal_title: قانوني + legal_html: |- + هذا الموقع والعديد من الخدمات الأخرى ذات الصلة يتم تشغيلها رسميا من قبل OpenStreetMapمؤسسة(OSMF) نيابة عن المجتمع. يخضع استخدام جميع خدمات تشغيل OSMF الينا + Acceptable Use Policies و Privacy Policy + + OpenStreetMap, الشعار المكبر و الخريطة هيregistered trademarks of the OSMF. partners_title: الشركاء notifier: diary_comment_notification: @@ -1301,6 +1293,7 @@ ar: where_am_i: أين أنا؟ where_am_i_title: صِف الموقع الحالي باستخدام محرك البحث submit_text: اذهب + reverse_directions_text: اعكس الاتجاهات key: table: entry: diff --git a/config/locales/arz.yml b/config/locales/arz.yml index a32b4ecb8..3079aa99e 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -242,29 +242,22 @@ arz: crematorium: محرقه جثث dentist: طبيب أسنان doctors: أطباء - dormitory: عنبر نوم drinking_water: مياه عذبة driving_school: مدرسه تعليم قيادة embassy: سفارة - emergency_phone: هاتف طوارئ fast_food: وجبات سريعة ferry_terminal: مرسى عبّارة - fire_hydrant: مواد مكافحه حرائق fire_station: فوج إطفاء fountain: نافورة fuel: وقود grave_yard: مقبرة - gym: مركز للرشاقة/الرياضة - health_centre: مركز صحي hospital: مستشفى hunting_stand: مربط للصيد ice_cream: مثلجات kindergarten: حضانه أطفال library: مكتبة - market: سوق marketplace: سوق nightclub: نادى ليلي - nursery: رعايه تمريضية nursing_home: دار رعايه مسنين/معاقين office: مكتب parking: موقف سيارات @@ -277,7 +270,6 @@ arz: prison: سجن pub: حانة public_building: مبنى عام - reception_area: منطقه استقبال recycling: نقطه إعاده تصنيع restaurant: مطعم sauna: حمّام بخارى حار @@ -329,7 +321,6 @@ arz: trunk: طريق رئيسي trunk_link: طريق رئيسي unclassified: طريق غير مصنّف - unsurfaced: طريق غير معبد historic: archaeological_site: موقع أثري battlefield: ساحه معركة @@ -422,7 +413,6 @@ arz: wetland: أرض رطبة wood: حرج place: - airport: مطار city: مدينة country: دولة county: مقاطعة @@ -433,7 +423,6 @@ arz: island: جزيرة islet: جزيره صغيرة locality: محلة - moor: أرض جرداء municipality: بلدية postcode: الرمز البريدي region: منطقة @@ -447,9 +436,7 @@ arz: abandoned: سكه حديد مهجورة construction: سكه حديديه تحت الإنشاء disused: سكه حديد مهجورة - disused_station: محطه سكه حديد مهجورة halt: موقف قطار - historic_station: محطه سكه حديد تاريخية junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية monorail: قطار ذات سكه حديد واحدة @@ -495,7 +482,6 @@ arz: grocery: بقالة hairdresser: مزين/مصفف شعر hardware: متجر عتاد - insurance: بوليسات تأمين jewelry: متجر مجوهرات kiosk: كشك laundry: مصبغة @@ -510,9 +496,7 @@ arz: outdoor: متجر للنشاطات الخارجية pet: متجر حيوانات أليفة photo: متجر صور - salon: صالون shoes: متجر أحذية - shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت diff --git a/config/locales/ast.yml b/config/locales/ast.yml index e6fdc0037..098f5fdc1 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Enolp +# Author: Fitoschido # Author: Macofe # Author: Xuacu --- @@ -339,7 +340,7 @@ ast: map_image: Imaxe del mapa (amuesa la capa estándar) embeddable_html: HTML pa embrivir licence: Llicencia - export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la llicencia + export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la llicencia Open Data Commons Open Database (ODbL). too_large: advice: 'Si falla la esportación anterior, considera utilizar una de les fontes @@ -380,14 +381,14 @@ ast: geocoder: search: title: - latlon: Resultaos internos + latlon: Resultaos internos uk_postcode: Resultaos de NPEMap / FreeThe Postcode - ca_postcode: Resultaos de Geocoder.CA - osm_nominatim: Resultaos de OpenStreetMap + ca_postcode: Resultaos de Geocoder.CA + osm_nominatim: Resultaos de OpenStreetMap Nominatim geonames: Resultaos de GeoNames - osm_nominatim_reverse: Resultaos de OpenStreetMap + osm_nominatim_reverse: Resultaos de OpenStreetMap Nominatim geonames_reverse: Resultaos de GeoNames search_osm_nominatim: @@ -397,12 +398,19 @@ ast: chair_lift: Telesilla drag_lift: Telesquí gondola: Telecabina + platter: Telesquí + pylon: Poste station: Estación de cable + t-bar: Remonte de barra en T aeroway: aerodrome: Aeródromu + airstrip: Campu d'aviación apron: Aparcaderu d'aviones gate: Puerta + hangar: Hangar helipad: Helipuertu + holding_position: Posición d'espera + parking_position: Posición d'aparcamientu runway: Pista taxiway: Cai de rodaxe terminal: Terminal @@ -437,37 +445,32 @@ ast: crematorium: Crematoriu dentist: Dentista doctors: Médicos - dormitory: Residencia drinking_water: Agua potable driving_school: Autoescuela embassy: Embaxada - emergency_phone: Teléfonu d'emerxencia fast_food: Comida rápida ferry_terminal: Terminal de ferry - fire_hydrant: Boca d'incendios fire_station: Bomberos food_court: Zona de restoranes fountain: Fonte fuel: Combustible gambling: Xuegos d'azar grave_yard: Cementeriu - gym: Ximnasiu - health_centre: Centru de salú + grit_bin: Caxa d'arenón con sal hospital: Hospital hunting_stand: Puestu de caza ice_cream: Xelaos kindergarten: Xardín d'infancia library: Biblioteca - market: Mercáu marketplace: Mercáu monastery: Monasteriu motorcycle_parking: Aparcamientu pa motocicletes nightclub: Sala de fiestes - nursery: Guardería nursing_home: Residencia asistida office: Oficina parking: Aparcamientu parking_entrance: Entrada d'aparcamientu + parking_space: Plaza d'aparcamientu pharmacy: Farmacia place_of_worship: Llugar de cultu police: Policía @@ -477,7 +480,6 @@ ast: prison: Cárcel pub: Pub public_building: Edificiu públicu - reception_area: Área de recepción recycling: Puntu llimpiu restaurant: Restorán retirement_home: Residencia de xubilaos @@ -502,6 +504,7 @@ ast: village_hall: Sala polivalente waste_basket: Papelera waste_disposal: Contenedor pa basories + water_point: Toma d'agua youth_centre: Centru de mocedá boundary: administrative: Llende alministrativa @@ -510,6 +513,7 @@ ast: protected_area: Área protexida bridge: aqueduct: Acueductu + boardwalk: Camín de tables suspension: Ponte colgante swing: Ponte xiratoria viaduct: Viaductu @@ -529,25 +533,31 @@ ast: "yes": Tienda d'artesanía emergency: ambulance_station: Base d'ambulancies + assembly_point: Puntu de xuntanza defibrillator: Desfibrilador landing_site: Llugar de aterrizaxe d'emerxencia phone: Teléfonu d'emerxencia + water_tank: Depósitu d'agua pa emerxencies + "yes": Emerxencia highway: abandoned: Estrada abandonada bridleway: Caleya bus_guideway: Carril bus con guía bus_stop: Parada d'autobús construction: Estrada en construcción + corridor: Pasiellu cycleway: Pista pa bicicletes elevator: Ascensor emergency_access_point: Accesu d'emerxencia footway: Senderu ford: Vau + give_way: Señal de dexar pasu living_street: Rúa residencial milestone: Moyón motorway: Autoestrada motorway_junction: Encruz d'autoestrada motorway_link: Enllaz d'autovía + passing_place: Apartaderu p'adelantamientu path: Camín pedestrian: Camín peonil platform: Andén @@ -564,6 +574,7 @@ ast: services: Área de serviciu speed_camera: Radar steps: Escaleres + stop: Señal de stop street_lamp: Farola tertiary: Estrada terciaria tertiary_link: Estrada terciaria @@ -572,8 +583,8 @@ ast: trail: Senderu trunk: Estrada nacional trunk_link: Estrada nacional + turning_loop: Carril pa dar vuelta unclassified: Estrada ensin clasificar - unsurfaced: Estrada ensin asfaltar "yes": Estrada historic: archaeological_site: Xacimientu arqueolóxicu @@ -592,6 +603,7 @@ ast: manor: Casona memorial: Memorial mine: Mina + mine_shaft: Pozu mineru monument: Monumentu roman_road: Via romana ruins: Ruines @@ -601,6 +613,7 @@ ast: wayside_cross: Cruceru wayside_shrine: Santuariu de camín wreck: Naufraxu + "yes": Sitiu históricu junction: "yes": Interseición landuse: @@ -638,9 +651,9 @@ ast: leisure: beach_resort: Complexu playeru bird_hide: Observatoriu d'aves - club: Club common: Terrén común dog_park: Parque pa perros + firepit: Pozu pa fogueres fishing: Área de pesca fitness_centre: Ximnasiu (fitness) fitness_station: Ximnasiu @@ -665,15 +678,46 @@ ast: water_park: Parque acuáticu "yes": Folganza man_made: + adit: Socavón + beacon: Baliza + beehive: Colmena + breakwater: Rompeoles + bridge: Ponte + bunker_silo: Búnquer + chimney: Chimenea + crane: Grúa + dolphin: Poste d'amarre + dyke: Dique + embankment: Terremplén + flagpole: Asta + gasometer: Gasómetru + groyne: Espigón + kiln: Kiln lighthouse: Faru + mast: Mástil + mine: Mina + mineshaft: Pozu mineru + monitoring_station: Estación de control + petroleum_well: Pozu petrolíferu + pier: Muelle pipeline: Tubería + silo: Silu + storage_tank: Depósitu + surveillance: Vixilancia tower: Torre + wastewater_plant: Planta depuradora + watermill: Molín d'agua + water_tower: Depósitu d'agua eleváu + water_well: Pozu + water_works: Captación d'agua potable + windmill: Molín de vientu works: Fábrica "yes": Artificial military: airfield: Aeródromu militar barracks: Cuartel bunker: Bunker + "yes": Militar mountain_pass: "yes": Puertu de montaña natural: @@ -719,11 +763,14 @@ ast: accountant: Contable administrative: Alministración architect: Arquitectu + association: Asociación company: Empresa + educational_institution: Institución educativa employment_agency: Oficina d'emplegu estate_agent: Axencia inmobiliaria government: Oficina gubernamental insurance: Axencia de seguros + it: Oficina de Teunoloxíes de la información lawyer: Abogáu ngo: Oficina d'ONG telecommunication: Oficina de telecomunicaciones @@ -731,9 +778,8 @@ ast: "yes": Oficina place: allotments: Güertos recreativos - block: Bloque - airport: Aeropuertu city: Ciudá + city_block: Mazana de cases country: País county: Condáu farm: Casería @@ -744,12 +790,13 @@ ast: islet: Castru de mar isolated_dwelling: Vivienda aisllada locality: Llocalidá - moor: Granda municipality: Conceyu neighbourhood: Barriu postcode: Códigu postal + quarter: Barriada region: Rexón sea: Mar + square: Plaza state: Estáu o provincia subdivision: Subdivisión suburb: Suburbiu @@ -761,10 +808,8 @@ ast: abandoned: Ferrocarril abandonáu construction: Ferrocarril en construcción disused: Ferrocarril ensin usu - disused_station: Estación de ferrocarril ensin usu funicular: Tren funicular halt: Parada de tren - historic_station: Estación de ferrocarril históricu junction: Encruz ferroviariu level_crossing: Pasu a nivel light_rail: Ferrocarril llixeru @@ -790,6 +835,7 @@ ast: beauty: Cuidaos corporales beverages: Venta de bébores bicycle: Tienda de bicicletes + bookmaker: Casa d'apuestes books: Llibrería boutique: Boutique butcher: Carnicería @@ -828,12 +874,16 @@ ast: hairdresser: Peluquería hardware: Ferretería hifi: Hi-Fi - insurance: Seguros + houseware: Tienda de cacía + interior_decoration: Decoración d'interiores jewelry: Xoyería kiosk: Quioscu + kitchen: Venta de cocines laundry: Llavandería + lottery: Llotería mall: Centru comercial market: Mercáu + massage: Masaxe mobile_phone: Tienda de telefonía móvil motorcycle: Venta de motos music: Tienda de música @@ -841,21 +891,27 @@ ast: optician: Óptica organic: Comida ecolóxica outdoor: Deportes d'aire llibre + paint: Tienda de pinturea + pawnbroker: Casa d'empeños pet: Tienda d'animales pharmacy: Farmacia photo: Fotografía - salon: Cuidaos corporales + seafood: Mariscos second_hand: Tienda d'oxetos usaos shoes: Zapatería - shopping_centre: Centru comercial sports: Tienda de deportes stationery: Papelería supermarket: Supermercáu tailor: Sastrería + ticket: Venta d'entraes + tobacco: Estancu toys: Xuguetería travel_agency: Axencia de viaxes + tyres: Neumáticos + vacant: Tienda zarrada + variety_store: Tienda de too a 100 video: Videu club - wine: Venta de llicores + wine: Vinatería "yes": Tienda tourism: alpine_hut: Refuxu de monte @@ -879,6 +935,7 @@ ast: viewpoint: Mirador zoo: Zoo tunnel: + building_passage: Pasu per edificiu culvert: Cañu "yes": Túnel waterway: @@ -910,7 +967,7 @@ ast: level10: Frontera de barriu description: title: - osm_nominatim: Llugar según OpenStreetMap + osm_nominatim: Llugar según OpenStreetMap Nominatim geonames: Llugar según GeoNames types: @@ -986,21 +1043,21 @@ ast: title_html: Drechos d'autor y llicencia intro_1_html: |- OpenStreetMap® son datos abiertos, baxo llicencia Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) de la Fundación OpenStreetMap (OSMF). + href="https://osmfoundation.org/">Fundación OpenStreetMap (OSMF). intro_2_html: Puedes copiar, distribuir, tresmitir y adautar los nuesos datos de mou llibre, mentanto deas reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o crees conteníu sobre los nuesos datos, namái podrás distribuir - el resultáu baxo la mesma llicencia. El códigu + el resultáu baxo la mesma llicencia. El códigu llegal completu t'esplica los tos drechos y obligaciones. intro_3_html: La cartografía de los mosaicos del mapa y la nuesa documentación, - tan llicenciaos baxo la llicencia Creative - Commons Reconocimientu-CompartirIgual 2.0 (CC-BY-SA). + tán llicenciaos baxo la llicencia Creative + Commons Reconocimientu-CompartirIgual 2.0 (CC BY-SA). credit_title_html: Cómo dar reconocimientu a OpenStreetMap credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”. credit_2_html: |- - Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Pues facelo enllazando a esta páxina de drechos d'autor. + Tamién tienes de dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC BY-SA. Puedes facelo enllazando a esta páxina de drechos d'autor. Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste dirixir a los llectores a openstreetmap.org (espandiendo 'OpenStreetMap' a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org. credit_3_html: |- Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa. @@ -1011,7 +1068,7 @@ ast: more_title_html: Pa saber más more_1_html: |- Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na páxina de Llicencia de la OSMF. + href="https://osmfoundation.org/Licence">páxina de Llicencia de la OSMF. more_2_html: |- Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros. Llei la nuesa Política d'usu de la API (n'inglés), @@ -1023,10 +1080,10 @@ ast: d''otres fontes, ente elles:' contributors_at_html: |- Austria: Contien datos de - Stadt Wien (baxo - CC BY), - Land Vorarlberg y - Land Tirol (baxo CC-BY AT con enmiendes). + Stadt Wien (baxo + CC BY), + Land Vorarlberg y + Land Tirol (baxo CC BY AT con enmiendes). contributors_ca_html: |- Canadá: Contien datos de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural @@ -1034,12 +1091,12 @@ ast: Statistics Canada). contributors_fi_html: |- Finlandia: Contien datos de la base de datos topográfica de la National Land Survey de Finlandia - y otros conxuntos de datos, baxo la Llicencia NLSFI. + y otros conxuntos de datos, baxo la Llicencia NLSFI. contributors_fr_html: 'Francia: Contien datos sacaos de Direction Générale des Impôts.' contributors_nl_html: |- - Holanda: Contien datos © AND, 2007 - (www.and.com) + Paises Baxos: Contien datos © AND, 2007 + (www.and.com) contributors_nz_html: 'Nueva Zelanda: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved.' contributors_si_html: |- @@ -1056,7 +1113,7 @@ ast: contributors_footer_1_html: |- Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a ameyorar OpenStreetMap, por favor, llei la Páxina + href="https://wiki.openstreetmap.org/wiki/Contributors">Páxina de los collaboradores na Wiki d'OpenStreetMap. contributors_footer_2_html: La inclusión de datos n'OpenStreetMap nun significa que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía @@ -1068,14 +1125,14 @@ ast: d'autor. infringement_2_html: Si crees que s'amestó de mou inapropiáu material con drechos d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l nuesu - procedimientu + procedimientu de retirada de datos o pidilo direutamente nel nuesu formulariu en llinia. trademarks_title_html: Marques rexistraes - trademarks_1_html: OpenStreetMap ,el logotipu de la lente y Estáu del Mapa son - marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues tocante - al usu de les marques, mándales al grupu - de trabayu sobro llicencies. + trademarks_1_html: OpenStreetMap, el logotipu de la lente y «State of the Map» + son marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues + tocante al usu de les marques, consulta la nuesa política + de marques rexistraes. welcome_page: title: ¡Afáyate! introduction_html: |- @@ -1109,8 +1166,8 @@ ast: paragraph_1_html: OpenStreetMap tien poques regles formales, pero esperamos que tolos participantes collaboren y se comuniquen cola comunidá. Si tas considerando cualquier actividá distinta de la edición manual, llei y sigui les instrucciones - sobro importaciones - y ediciones + sobro importaciones + y ediciones automatizaes. questions: title: ¿Tien alguna entruga? @@ -1145,7 +1202,7 @@ ast: title: Otres preocupaciones explanation_html: |- Si tienes dalguna preocupación tocante a cómo tan usándose los nuesos datos o tocante al conteníu, consulta la - páxina de drechos d'autor pa más información llegal, o comunícate col grupu de trabayu de la OSMF afayadizu. + páxina de drechos d'autor pa más información llegal, o comunícate col grupu de trabayu de la OSMF afayadizu. help_page: title: Algamar ayuda introduction: OpenStreetMap tien dellos recursos p'aprender sobro'l proyeutu, @@ -1156,7 +1213,7 @@ ast: title: Bienveníos a OSM description: Principie con esta guía rápida que cubre lo básico d'OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Ast:Beginners%27_guide title: Guía del principiante description: Guía pa principiantes, mantenida pola comunidá. help: @@ -1181,7 +1238,7 @@ ast: description: Ayuda pa les empreses y organizaciones que cambien a mapes y otros servicios, basaos n'OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/wiki/Ast:Main_Page title: wiki.openstreetmap.org description: Mirar na wiki la documentación d'OSM más a fondu. about_page: @@ -1203,7 +1260,7 @@ ast: inxenieros que xestionen los sirvidores d'OSM, voluntarios que faen mapes de les zones afeutaes por desastres, y muncho más. Pa saber más tocante a la comunidá, ver el - Blog d'OpenStreetMap, los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. + Blog d'OpenStreetMap, los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. open_data_title: Datos abiertos open_data_html: |- OpenStreetMap son datos abiertos: tienes la llibertá d'usalos pa cualquier @@ -1213,13 +1270,15 @@ ast: pa más detalles. legal_title: Llegal legal_html: "Esti sitiu y munchos otros servicios rellacionaos xestiónalos formalmente - la \nFundación OpenStreetMap (OSMF) - \nnel nome de la comunidá. L'usu de tolos servicios remanaos pola OSMF tán suxetos - a les nueses polítiques - d'usu aceptable y la nuesa política - de privacidá\n
\nComunícate - cola OSMF \nsi tienes entrugues o problemes relativos a les llicencies, - drechos d'autor u otru tema llegal." + la \nFundación OpenStreetMap (OSMF) + \nnel nome de la comunidá. L'usu de tolos servicios alministraos pola OSMF tán + suxetos a les nueses polítiques + d'usu aceptable y la nuesa política + de privacidá\n
\nComunícate + cola OSMF \nsi tienes entrugues relativos a les llicencies, drechos d'autor + u otru tema llegal.\n
\nOpenStreetMap, el logo de la lente y «Estáu del mapa» + son marques + rexistraes de la OSMF." partners_title: Asociaos notifier: diary_comment_notification: @@ -1421,13 +1480,13 @@ ast: user_page_link: páxina d'usuariu anon_edits_link_text: Descubri por qué ye'l casu. flash_player_required: Necesites un reproductor Flash pa usar Potlatch, l'editor - Flash d'OpenStreetMap. Puedes descargar - el reproductor Flash d'Adobe.com. Tamién hai disponibles otres + Flash d'OpenStreetMap. Puedes descargar + el reproductor Flash d'Adobe.com. Tamién hai disponibles otres opciones pa editar OpenStreetMap. potlatch_unsaved_changes: Tienes cambios ensin guardar. (Pa guardalos en Potlatch, tienes de deseleicionar la vía o puntu actual si tas editando en vivo, o calcar nel botón guardar si apaez esi botón). - potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pa más información potlatch2_unsaved_changes: Tienes cambios ensin guardar. (Pa guardar en Potlatch 2, tienes de calcar en guardar). @@ -1446,6 +1505,7 @@ ast: where_am_i: ¿Ú esto? where_am_i_title: Describi el to allugamientu actual usando el motor de gueta submit_text: Dir + reverse_directions_text: Invertir direiciones key: table: entry: @@ -1520,7 +1580,7 @@ ast: edit: Editar preview: Vista previa markdown_help: - title_html: Analizáu con Markdown + title_html: Analizáu con Markdown headings: Cabeceres heading: Cabecera subheading: Cabecera secundaria @@ -1629,7 +1689,7 @@ ast: description: Ver les xubes más nueves de traces GPS tagged_with: ' etiquetaes con %{tags}' empty_html: Entá nun hai nada equí. Carga una nueva - traza o deprendi más tocante a cómo trazar col GPS na página + traza o depriende más tocante a cómo trazar col GPS na páxina de la wiki. delete: scheduled_for_deletion: Traza marcada pa desaniciar @@ -1839,11 +1899,11 @@ ast:

De mou distintu a otros mapes, OpenStreetMap ta creáu completamente por persones como tu, y cualquiera tien llibertá pa igualu, anovalu, descargalu y usalu.

Date d'alta pa empezar a collaborar. Unviaremoste un corréu pa confirmar la cuenta.

- license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos + license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos de collaboración. email address: 'Direición de corréu electrónicu:' confirm email address: 'Confirmar direición de corréu:' - not displayed publicly: La to direición nun s'amuesa en público, ver la política de protección de datos pa más información display name: 'Nome a amosar:' @@ -1963,23 +2023,23 @@ ast: email never displayed publicly: (nunca s'amuesa en público) external auth: 'Autenticación esterna:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: ¿qué ye esto? public editing: heading: 'Ediciones públiques:' enabled: Activaes. Nun yes anónimu y puedes editar los datos. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: ¿qué ye esto? disabled: Desactivaes y nun puedes editar los datos; toles ediciones anteriores son anónimes. disabled link text: ¿por qué nun puedo editar? public editing note: heading: Edición pública - text: Anguaño, les tos ediciones son anónimes y la xente nun te pue unviar + text: Anguaño, les tos ediciones son anónimes y la xente nun puede unviate mensaxes o ver la to llocalización. P'amosar lo qu'editasti y permitir que - la xente se ponga en contautu contigo pela páxina web, calca nel botón qu'apaez - abaxo. Dende'l cambiu al API 0.6, sólo los usuarios públicos pueden editar - los datos del mapa (por + la xente se ponga en contautu contigo pela páxina web, pulsia nel botón + qu'apaez abaxo. Dende'l cambiu al API 0.6, sólo los usuarios públicos + pueden editar los datos del mapa (por estes razones). @@ -2367,7 +2427,15 @@ ast: continue_without_exit: Siguir en %{name} slight_right_without_exit: Llixeramente a la drecha haza %{name} offramp_right_without_exit: Cueye la rampla a la drecha haza %{name} + offramp_right_with_directions: Toma l'enllaz a la derecha hacia %{directions} + offramp_right_with_name_and_directions: Toma l'enllaz a la derecha pa %{name}, + hacia %{directions} + offramp_right_without_directions: Toma l'enllaz a la derecha onramp_right_without_exit: Xira a la drecha na rampla haza %{name} + onramp_right_with_directions: Xira a la derecha pal enllaz hacia %{directions} + onramp_right_with_name_and_directions: Xira a la derecha nel enllaz pa %{name}, + hacia %{directions} + onramp_right_without_directions: Xira a la derecha pal enllaz endofroad_right_without_exit: Al final de la carretera xira a la drecha haza %{name} merge_right_without_exit: Xúnite a la drecha haza %{name} @@ -2378,7 +2446,15 @@ ast: sharp_left_without_exit: Zarrao a la izquierda haza %{name} turn_left_without_exit: Xira a la izquierda haza %{name} offramp_left_without_exit: Cueye la rampla a la izquierda haza %{name} + offramp_left_with_directions: Toma l'enllaz a la izquierda hacia %{directions} + offramp_left_with_name_and_directions: Toma l'enllaz a la izquierda pa %{name}, + hacia %{directions} + offramp_left_without_directions: Toma l'enllaz a la izquierda onramp_left_without_exit: Xira a la izquierda na rampla haza %{name} + onramp_left_with_directions: Xira a la izquierda pal enllaz hacia %{directions} + onramp_left_with_name_and_directions: Xira a la izquierda nel enllaz pa %{name}, + hacia %{directions} + onramp_left_without_directions: Xira a la izquierda nel enllaz endofroad_left_without_exit: Al final de la carretera xira a la izquierda haza %{name} merge_left_without_exit: Xúnite a la izquierda haza %{name} diff --git a/config/locales/az.yml b/config/locales/az.yml index e819673e5..947e481a1 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -309,30 +309,23 @@ az: crematorium: Krematoriya dentist: Diş həkimi doctors: Həkimlər - dormitory: Yataqxana drinking_water: İçməli su driving_school: Sürücülük məktəbi embassy: Səfirlik - emergency_phone: Fövqəladə hallar üçün telefon fast_food: Fəst Fud ferry_terminal: Parom Terminalı - fire_hydrant: Yanğın Hidrantı fire_station: Yanğın söndürmə Stansiyası food_court: Açıq havada Yeməkxana fountain: Fontan fuel: Yanacaq doldurma grave_yard: Qəbirsanlıq - gym: Fitnes mərkəzi - health_centre: Sağlamlıq mərkəzi hospital: Qospital hunting_stand: Ov stendi ice_cream: Dondurma kindergarten: Uşaq bağçası library: Kitabxana - market: Market marketplace: Bazar meydanı nightclub: Gecə klubu - nursery: Pansionat nursing_home: Qocalar evi office: Ofis parking: Dayanacaq @@ -345,7 +338,6 @@ az: prison: Həbsxana pub: Pivəxana public_building: Ä°ctimai Binalar - reception_area: Qəbul sahəsi recycling: Utilizasiya yeri restaurant: Restoran retirement_home: Qocalar Evi @@ -418,7 +410,6 @@ az: trunk: Baş yol trunk_link: Baş yol unclassified: Təsnifatsız yol - unsurfaced: Örtüksüz yol historic: archaeological_site: Arxeoloji qazıntılar battlefield: Döyüş meydanı @@ -546,7 +537,6 @@ az: travel_agent: Səyahət Agentliyi "yes": Ofislər place: - airport: Aeroport city: Şəhər country: Ölkə county: Ölkə @@ -558,7 +548,6 @@ az: islet: Adacıq isolated_dwelling: Ayrıca ev-ferma locality: Təkr edilmiş ərazi - moor: Torfluq municipality: Bələdiyyə postcode: Poçt indeksi region: Bölgə @@ -573,10 +562,8 @@ az: abandoned: Sökülmüş dəmiryol xətti construction: Dəmiryol xətti təmirdədir disused: Ä°stifadə olunmayan (atılmış) dəmiryol xətti - disused_station: Ä°stifadə olunmayan (atılmış) dəmiryol stansiyası funicular: Funikulyor halt: Qatar dayanacağı - historic_station: Tarixi dəmiryol stansiyası junction: Dəmiryol oxu level_crossing: Dəmiryol keçidi light_rail: Yüngül resli dəmiryol xətti @@ -636,7 +623,6 @@ az: hairdresser: Saç ustası hardware: Məişət Alətləri Dükanı hifi: Audio və Video avadanlıqları dükanı - insurance: Sığorta şirkəti jewelry: Zərgərlik dükanı kiosk: Kiosk laundry: Camaşırxana @@ -651,9 +637,7 @@ az: outdoor: Küçə satışı pet: Zoomaqazin photo: Fotomaqazin - salon: Salon shoes: Ayaqqabı dükanı - shopping_centre: Ticarət Mərkəzi sports: Ä°dman malları dükanı stationery: Dəftərxana Ləvazimatı supermarket: Supermarket diff --git a/config/locales/ba.yml b/config/locales/ba.yml index 562dbf745..f1bcdafb6 100644 --- a/config/locales/ba.yml +++ b/config/locales/ba.yml @@ -412,31 +412,24 @@ ba: crematorium: Крематорий dentist: Стоматология doctors: Табибтар - dormitory: Дөйөм ятаҡ drinking_water: Эсәр һыу driving_school: Автошкола embassy: Илселек - emergency_phone: Ашығыс хеҙмәт телефоны fast_food: Фаст-фуд ferry_terminal: Паром станцияһы - fire_hydrant: Янғын һүндереү гидранты fire_station: Янғын һүндереү һағы food_court: Ресторан ихатаһы fountain: Фонтан fuel: Заправка gambling: Уйын йорто grave_yard: Зыярат - gym: Фитнес-үҙәк/Тренажер залы - health_centre: Һауыҡтырыу үҙәге hospital: Госпиталь hunting_stand: Һунарсы вышкаһы ice_cream: Туңдырма kindergarten: Балалар баҡсаһы - market: Магазин marketplace: Баҙар motorcycle_parking: Мотоцикл парковкаһы nightclub: Төнгө клуб - nursery: Пансионат nursing_home: Ҡарттар йорто parking: Туҡталҡа parking_entrance: Туҡталҡаға инеү @@ -449,7 +442,6 @@ ba: prison: Төрмә pub: Һырахана public_building: Йәмғиәти бина - reception_area: Ҡабул итеү бүлмәһе recycling: Киренән эшкәртеү урыны restaurant: Ресторан retirement_home: Ҡарттар йорто @@ -543,7 +535,6 @@ ba: trunk: Төп юл trunk_link: Магистраль unclassified: Урындағы юл - unsurfaced: Шоссе юлы historic: archaeological_site: Археологик ҡаҙыныуҙар battlefield: Һуғыш яланы @@ -606,7 +597,6 @@ ba: leisure: beach_resort: Үҫентеле пляж bird_hide: Йәшерен ултырғыс (ҡоштарҙы күҙәтеү өсөн) - club: Клуб common: Альменда dog_park: Эт өсөн майҙансыҡ fishing: Балыҡ тотоу diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 2b2201668..00c2b74e7 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -260,7 +260,7 @@ be-Tarask: map_image: Выява мапы (паказвае стандартны слой) embeddable_html: HTML-код для ўстаўкі licence: Ліцэнзія - export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open + export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open Data Commons Open Database License (ODbL). too_large: body: 'Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. @@ -283,11 +283,11 @@ be-Tarask: geocoder: search: title: - latlon: Вынікі з Internal + latlon: Вынікі з Internal uk_postcode: Вынікі з NPEMap / FreeThe Postcode - ca_postcode: Вынікі з Geocoder.CA - osm_nominatim: Вынікі з OpenStreetMap + ca_postcode: Вынікі з Geocoder.CA + osm_nominatim: Вынікі з OpenStreetMap Nominatim geonames: Вынікі з GeoNames search_osm_nominatim: @@ -321,29 +321,22 @@ be-Tarask: crematorium: Крэматорый dentist: Стаматалёгія doctors: Дактары - dormitory: Інтэрнат drinking_water: Пітная вада driving_school: Аўташкола embassy: Амбасада - emergency_phone: Тэлефон для экстранных выклікаў fast_food: Забягайлаўка ferry_terminal: Паромная станцыя - fire_hydrant: Пажарны гідрант fire_station: Пажарны пастарунак fountain: Фантан fuel: Запраўка grave_yard: Могілкі - gym: Фітнэс цэнтар /Трэнажорны зал - health_centre: Цэнтар здароўя hospital: Шпіталь hunting_stand: Паляўнічая вежа ice_cream: Марозіва kindergarten: Дзіцячы садок library: Бібліятэка - market: Рынак marketplace: Рынкавая плошча nightclub: Начны клюб - nursery: Дзіцячы пакой nursing_home: Дом састарэлых office: Офіс parking: Стаянка @@ -356,7 +349,6 @@ be-Tarask: prison: Турма pub: Шынок public_building: Грамадзкі будынак - reception_area: Прыёмная recycling: Месца перапрацоўкі адыходаў restaurant: Рэстаран retirement_home: Дом састарэлых @@ -413,7 +405,6 @@ be-Tarask: trunk: Шаша trunk_link: Шаша unclassified: Дарога раённага значэньня - unsurfaced: Дарога без пакрыцьця historic: archaeological_site: Археалягічныя раскопкі battlefield: Поле гістарычнай бойкі @@ -529,7 +520,6 @@ be-Tarask: government: Дзяржаўная ўстанова insurance: Страхавое бюро place: - airport: Аэрапорт city: Горад country: Краіна county: Раён @@ -541,7 +531,6 @@ be-Tarask: islet: Выспачка isolated_dwelling: Ізаляванае жытло locality: Населены пункт - moor: Тарфянік municipality: Муніцыпалітэт postcode: Паштовы індэкс region: Рэгіён @@ -556,10 +545,8 @@ be-Tarask: abandoned: Пакінутая чыгуначная лінія construction: Будаўніцтва чыгункі disused: Пакінутая чыгунка - disused_station: Пакінутая чыгуначная станцыя funicular: Фунікулёр halt: Чыгуначны прыпынак - historic_station: Гістарычная чыгуначная станцыя junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Лінія для лёгкага чыгуначнага транспарту @@ -619,7 +606,6 @@ be-Tarask: hairdresser: Цырульня hardware: Гаспадарчыя тавары hifi: Крама аўдыё/відэё тэхнікі - insurance: Страхаваньне jewelry: Ювэлірная крама kiosk: Шапік laundry: Пральня @@ -634,9 +620,7 @@ be-Tarask: outdoor: Выязны гандаль pet: Зоалягічная крама photo: Фотакрама - salon: Салён shoes: Крама абутку - shopping_centre: Гандлёвы цэнтар sports: Спартовая крама stationery: Канцтавары supermarket: Супэрмаркет @@ -685,7 +669,7 @@ be-Tarask: weir: Плаціна description: title: - osm_nominatim: Месцазнаходжаньне з OpenStreetMap + osm_nominatim: Месцазнаходжаньне з OpenStreetMap Nominatim geonames: Месцазнаходжаньне з GeoNames types: @@ -714,8 +698,8 @@ be-Tarask: edit_with: Рэдагаваць праз %{editor} tag_line: Вольная Wiki-мапа сьвету intro_2_create_account: Стварыце рахунак - partners_html: Гостынг падтрымліваецца %{ucl}, %{ic} і %{bytemark}, і іншымі %{partners}. - partners_ucl: UCL VR Centre + partners_html: Гостынг падтрымліваецца %{ucl}, %{bytemark}, %{ic} і іншымі %{partners}. + partners_ucl: UCL partners_ic: Лёнданскім імпэрскім каледжам osm_offline: База зьвестак OpenStreetMap у цяперашні момант недаступная, таму што праводзяцца неабходныя тэхнічныя работы. @@ -748,42 +732,36 @@ be-Tarask: title_html: Аўтарскія правы і ліцэнзія intro_1_html: |- OpenStreetMap® — вольныя зьвесткі, ліцэнзаваныя паводле ліцэнзіі Адкрытых баз зьвестак Адкрытых агульных зьвестак (ODbL) Фундацыяй OpenStreetMap Foundation (OSMF). + href="https://opendatacommons.org/licenses/odbl/">ліцэнзіі Адкрытых базаў зьвестак Адкрытых агульных зьвестак (ODbL) Фундацыяй OpenStreetMap Foundation (OSMF). intro_2_html: Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя - зьвесткі да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў. - Калі Вы зьмяняеце ці выкарыстоўваеце нашыя зьвесткі, Вы можаце распаўсюджваць - вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст - ліцэнзіі растлумачыць Вам правы і адказнасьці. + зьвесткі да той пары, пакуль вы спасылаецеся на OpenStreetMap і яе ўдзельнікаў. + Калі вы зьмяняеце ці выкарыстоўваеце нашыя зьвесткі, вы можаце распаўсюджваць + вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст + ліцэнзіі растлумачыць вам правы і адказнасьці. credit_title_html: Як спасылацца на OpenStreetMap credit_1_html: |- Мы патрабуем, каб Вы пазначалі “© удзельнікі OpenStreetMap”. - credit_2_html: |- - Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся на гэтую старонку правоў. Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце разьмяшчаць наўпроставую спасылку на ліцэнзіі. Калі - Вы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр. - друкаваныя працы), мы прапануем накіроўваць Вашых чытачоў на - www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу - ‘OpenStreetMap’), на opendatacommons.org і, пры неабходнасьці, на - www.creativecommons.org. + credit_2_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле + ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што картаграфія + ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся на гэтую + старонку правоў. Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце + разьмяшчаць наўпроставую спасылку на ліцэнзіі. Калі вы выкарыстоўваеце носьбіты, + дзе выкарыстаньне спасылак немагчымае (напрыклад, друкаваныя працы), мы прапануем + накіроўваць вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне + поўнага адрасу ‘OpenStreetMap’), на opendatacommons.org і, пры + неабходнасьці, на www.creativecommons.org. more_title_html: Даведацца болей - more_1_html: |- - Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне на нас на старонцы ліцэнзіі OSMF і старонцы адказаў - і пытаньняў. + more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне + на нас на старонцы ліцэнзіі OSMF. more_2_html: |- Хоць OpenStreetMap ёсьць адкрытымі зьвесткамі, мы ня здольныя прадаставіць бяскоштны API мапаў для староньніх распрацоўнікаў. Глядзіце нашыя правілы карыстаньня API, правілы карыстаньня частак мапаў і правілы карыстаньня Nominatim. contributors_title_html: Нашыя ўдзельнікі - contributors_intro_html: |- - Нашая ліцэнзія CC BY-SA патрабуе ад Вас “падаць арыгінальнага аўтара - у адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў - ”. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства - болей чым “удзельнікі OpenStreetMap - ”, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных - картаграфічных агенцтваў ці іншых падобных крыніцаў, - таму, магчыма, мае сэнс спасылацца непасрэдна на іх - як на крыніцу, ці дадаць спасылку на гэтую старонку. + contributors_intro_html: 'Нашы аўтары — гэта тысячы асобаў. Мы таксама ўключаем + зьвесткі з вольнай ліцэнзіяй ад нацыянальных картаграфічных службаў і зь іншых + крыніц, сярод іх:' contributors_at_html: |- Аўстрыя: Утрымлівае зьвесткі горада Вены на ўмовах diff --git a/config/locales/be.yml b/config/locales/be.yml index e78338ad0..56a2cdb5f 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -443,33 +443,26 @@ be: crematorium: Крэматорый dentist: Стаматолагія doctors: Лекары - dormitory: Інтэрнат drinking_water: Пітная вада driving_school: Аўташкола embassy: Амбасада - emergency_phone: Тэлефон экстранай сувязі fast_food: Фаст-Фуд ferry_terminal: Паромны тэрмінал - fire_hydrant: Пажарны гідрант fire_station: Пажарная станцыя food_court: Фуд-Корт fountain: Фантан fuel: АЗС gambling: Азартныя гульні grave_yard: Могілкі - gym: Фітнес-цэнтр ці Трэнажорная зала - health_centre: Медыцынскі цэнтр hospital: Бальніца hunting_stand: Паляўнічая вежа ice_cream: Марозіва kindergarten: Дзіцячы сад library: Бібліятэка - market: Рынак marketplace: Рыначная плошча monastery: Кляштар motorcycle_parking: Паркоўка для матацыклаў nightclub: Начны клуб - nursery: Яслі nursing_home: Прыватная лякарня office: Офіс parking: Паркоўка @@ -483,7 +476,6 @@ be: prison: Турма pub: Паб public_building: Грамадскі будынак - reception_area: Зона прыёму recycling: Пункт перапрацоўкі restaurant: Рэстаран retirement_home: Дом састарэлых @@ -579,7 +571,6 @@ be: trunk: Шаша trunk_link: Магістраль unclassified: Некласіфікаваная дарога - unsurfaced: Дарога без пакрыцця "yes": Дарога historic: archaeological_site: Археалагічныя раскопы @@ -644,7 +635,6 @@ be: leisure: beach_resort: Пляжны курорт bird_hide: Засада - club: Клуб common: Агульная зямля dog_park: Пляцоўка для сабак fishing: Раён рыбалоўства @@ -737,8 +727,6 @@ be: "yes": Офіс place: allotments: Сады-агароды - block: Блок - airport: Аэрапорт city: Горад country: Краіна county: Акруга @@ -750,7 +738,6 @@ be: islet: Астравок isolated_dwelling: Ізаляванае жыллё locality: Мясцовасць - moor: Швартоўка municipality: Муніцыпалітэт neighbourhood: Наваколле postcode: Паштовы індэкс @@ -767,10 +754,8 @@ be: abandoned: Закінутая чыгунка construction: Будаўніцтва чыгункі disused: Закінутая чыгунка - disused_station: Закінуты чыгуначны вакзал funicular: Фунікулер halt: Чыгуначны прыпынак - historic_station: Гістарычны чыгуначны вакзал junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Хуткасны трамвай @@ -834,7 +819,6 @@ be: hairdresser: Цырульнік hardware: Гаспадарчая крама hifi: Аўдыётэхніка - insurance: Страхаванне jewelry: Ювелірная крама kiosk: Кіёск laundry: Пральня @@ -850,10 +834,8 @@ be: pet: Заалагічная крама pharmacy: Аптэка photo: Фота майстэрня - salon: Салон second_hand: Крама патрыманых рэчаў shoes: Абутковая крама - shopping_centre: Гандлёвы цэнтр sports: Спартыўная крама stationery: Крама канцылярскіх тавараў supermarket: Супермаркет diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 1b29d774c..ab533285b 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -341,25 +341,20 @@ bg: crematorium: Крематориум dentist: Зъболекар doctors: Лекари - dormitory: Пансион drinking_water: Питейна вода driving_school: Автошкола embassy: Посолство - emergency_phone: Телефон за спешни повиквания fast_food: Заведения за бързо хранене ferry_terminal: Фериботен терминал - fire_hydrant: Пожарен кран fire_station: Пожарна станция fountain: Фонтан fuel: Гориво gambling: Хазартни игри grave_yard: Гробище - gym: Фитнес зала hospital: Болница ice_cream: Сладолед kindergarten: Детска градина library: Библиотека - market: Пазар marketplace: Пазар monastery: Манастир nightclub: Нощен клуб @@ -374,7 +369,6 @@ bg: prison: Затвор pub: Кръчма public_building: Обществена сграда - reception_area: Рецепция restaurant: Ресторант retirement_home: Старчески дом sauna: Сауна @@ -455,7 +449,6 @@ bg: traffic_signals: Светофар trunk: Междуградски път trunk_link: Междуградски път - unsurfaced: Път без настилка "yes": Път historic: archaeological_site: Разкопки @@ -510,7 +503,6 @@ bg: vineyard: Лозя leisure: beach_resort: Морски курорт - club: Клуб dog_park: Парк за кучета fishing: Място за риболов fitness_centre: Фитнес център @@ -582,7 +574,6 @@ bg: "yes": Офис place: allotments: Градини - airport: Летище city: Град country: Страна county: Област @@ -592,7 +583,6 @@ bg: houses: Къщи island: Остров islet: Островче - moor: Тресавище municipality: Община neighbourhood: Квартал postcode: Пощенски код @@ -607,9 +597,7 @@ bg: abandoned: Изоставена железопътна линия construction: Железопътна линия в строеж disused: Изоставена ж.п. линия - disused_station: изоставена гара halt: Железопътна спирка - historic_station: Гара с историческо значение junction: Железопътен възел level_crossing: Прелез light_rail: Лека железница @@ -650,7 +638,6 @@ bg: greengrocer: Плод и зеленчук grocery: Магазин за хранителни стоки hairdresser: Фризьорски салон - insurance: Застраховане jewelry: Бижутериен магазин laundry: Пералня mall: Търговски център @@ -662,7 +649,6 @@ bg: pharmacy: Аптека photo: Фотомагазин shoes: Магазин за обувки - shopping_centre: Търговски център sports: Спортен магазин stationery: Канцеларски материали supermarket: Супермаркет @@ -856,10 +842,10 @@ bg: unread_button: Отбелязване като непрочетено read_button: Отбелязване като прочетено reply_button: Отговор - delete_button: Изтрий + delete_button: Изтриване new: - title: Изпратете съобщение - send_message_to: Изпратете ново съобщение на %{name} + title: Изпращане на съобщение + send_message_to: Изпращане ново съобщение на %{name} subject: Тема body: Текст send_button: Изпращане @@ -934,19 +920,19 @@ bg: - терминал admin: Административна граница forest: Гора - wood: Лес + wood: Дървета golf: Игрище за голф park: Парк resident: Жилищна зона common: 1: ливада - retail: Зона за търговия на дребно + retail: Търговска зона industrial: Промишлена зона commercial: Търговска зона heathland: Пустош lake: - Езеро - farm: Земеделско стопанство + farm: Ферма brownfield: Място за строеж cemetery: Гробище allotments: Градини @@ -1237,6 +1223,7 @@ bg: creator: Автор ago_html: преди %{when} javascripts: + close: Затваряне share: title: Споделяне cancel: Отказ diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 6d6a4fcc4..a02d8fc40 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -434,33 +434,26 @@ bn: crematorium: শ্মশান dentist: দন্তচিকিৎসক doctors: ডাক্তার - dormitory: ছাত্রাবাস drinking_water: পানীয় জল driving_school: ড্রাইভিং স্কুল embassy: দূতাবাস - emergency_phone: জরুরি ফোন fast_food: ফাস্ট ফুড ferry_terminal: ফেরিঘাট - fire_hydrant: ফায়ার হাইড্র্যান্ট fire_station: অগ্নি নির্বাপন কেন্দ্র food_court: খাবার দোকান fountain: ঝরনা fuel: জ্বালানি gambling: জুয়াখেলার আড্ডা grave_yard: কবরস্থান - gym: ব্যায়াম কেন্দ্র / জিমখানা - health_centre: স্বাস্থকেন্দ্র hospital: হাসপাতাল hunting_stand: শিকারশালা ice_cream: আইসক্রিম kindergarten: শিশুবিদ্যালয় library: পাঠাগার - market: বাজার marketplace: নগরচত্বর monastery: আশ্রম motorcycle_parking: মোটরসাইকেল পার্কিং nightclub: নৈশক্লাব - nursery: শিশুশালা nursing_home: নার্সিংহোম office: দপ্তর parking: পার্কিং @@ -474,7 +467,6 @@ bn: prison: কারাগার pub: মদ্যশালা public_building: সরকারি ভবন - reception_area: অভ্যর্থন এলাকা restaurant: রেঁস্তোরা retirement_home: অবসর গৃহ sauna: বাষ্পস্নান @@ -560,7 +552,6 @@ bn: trunk: মূল সড়ক trunk_link: মূল সড়ক unclassified: অশ্রেণীকৃত সড়ক - unsurfaced: কাঁচা সড়ক "yes": সড়ক historic: archaeological_site: প্রত্নতাত্ত্বিক স্থান @@ -615,7 +606,6 @@ bn: "yes": ব্যবহার্য ভূমি leisure: beach_resort: সৈকতীয় রিসোর্ট - club: ক্লাব common: সাধারণ ভূমি dog_park: কুকুর উদ্যান fishing: মৎস শিকারের এলাকা @@ -693,8 +683,6 @@ bn: travel_agent: ভ্রমণ দালাল "yes": দপ্তর place: - block: ব্লক - airport: বিমানবন্দর city: নগর country: দেশ county: প্রদেশ @@ -706,7 +694,6 @@ bn: islet: ক্ষুদ্র দ্বীপ isolated_dwelling: বিচ্ছিন্ন বাসস্থান locality: বসতি - moor: প্রাস্তর municipality: পৌরসভা neighbourhood: শহরতলি postcode: ডাক সংখ্যা @@ -723,8 +710,6 @@ bn: abandoned: পরিত্যক্ত রেলপথ construction: নির্মীয়মাণ রেলপথ disused: অব্যবহৃত রেলপথ - disused_station: অব্যবহৃত রেল স্টেশন - historic_station: ঐতিহাসিক রেল স্টেশন junction: রেল জংশন monorail: মনোরেল narrow_gauge: সংকীর্ণ গেজ রেল @@ -776,7 +761,6 @@ bn: hairdresser: নাপিত hardware: যন্ত্রাংশের দোকান hifi: হাই-ফাই - insurance: বিমা jewelry: গহনার দোকান laundry: ধোপার দোকান mall: মল @@ -789,10 +773,8 @@ bn: organic: জৈব খাদ্যের দোকান pharmacy: ঔষধালয় photo: ছবির দোকান - salon: সালোন second_hand: পুরনো-সামগ্রীর দোকান shoes: জুতোর দোকান - shopping_centre: বিপনি কেন্দ্র sports: ক্রীড়াসামগ্রীর দোকান stationery: স্টেশনারি দোকান supermarket: অধিবিপণী diff --git a/config/locales/br.yml b/config/locales/br.yml index ff8c3b1a8..37f59b46a 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -134,6 +134,8 @@ br: title_comment: Strollad kemmoù %{id} - %{comment} join_discussion: Kevreañ evit kaozeal discussion: Kaozeadenn + still_open: Strollad kemmoù digor - an diviz a zigoro ur wech ma vo serret ar + strollad kemmoù. node: title: 'Skoulm : %{name}' history_title: 'Istor ar skoulm : %{name}' @@ -347,7 +349,7 @@ br: map_image: Skeudenn gartenn (diskouez ur gwiskad boutin) embeddable_html: HTML enkorfadus licence: Aotre-implijout - export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout Open + export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout Open Data Commons Open Database License (ODbL). too_large: advice: 'Ma c''hwit an ezporzhiadur amañ a-us, implijit unan eus an elfennoù @@ -387,11 +389,11 @@ br: geocoder: search: title: - latlon: Disoc'hoù diwar Internal + latlon: Disoc'hoù diwar Internal uk_postcode: Disoc'hoù diwar NPEMap / FreeThe Postcode - ca_postcode: Disoc'hoù diwar Geocoder.CA - osm_nominatim: Disoc'hoù diwar OpenStreetMap + ca_postcode: Disoc'hoù diwar Geocoder.CA + osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim geonames: Disoc'hoù diwar GeoNames osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap @@ -404,12 +406,17 @@ br: chair_lift: fungador drag_lift: Teleski gondola: Funlogell + platter: Saver pladoù + pylon: Peul station: Arsav funlogell aeroway: aerodrome: Nijva + airstrip: Leurenn bradañ apron: ↓Parklec'h nijerezioù gate: Dor + hangar: Karrdi helipad: biñsporzh + parking_position: Plas parkañ runway: Leurenn taxiway: Roudenn evit an taksioù terminal: Termenva @@ -444,37 +451,32 @@ br: crematorium: Krematoriom dentist: Dentour doctors: Mezeien - dormitory: Kouskva drinking_water: Dour mat da evañ driving_school: Skol bleinañ embassy: Kannati - emergency_phone: Pellgomzer evit an trummadoù fast_food: Fast Food ferry_terminal: Porzh karrlistri - fire_hydrant: Dour evit an tan fire_station: Kazarn pomperien food_court: ↓Predva fountain: Feunteun fuel: Trelosk gambling: C'hoari grave_yard: Bered - gym: Fitness/embregerezh-korf - health_centre: Kreizenn yec'hed + grit_bin: Bailh holen hospital: Ospital hunting_stand: Stand tennañ ice_cream: Dienn skorn kindergarten: Liorzh ar vugale library: Levraoueg - market: Marc'had marketplace: Marc'hallac'h monastery: Manati motorcycle_parking: Parklec'h evit marc'hoù-tan nightclub: Klub-noz - nursery: Spluseg nursing_home: Ti yec'hed office: Burev parking: Parklec'h parking_entrance: Mont tre ur parklec'h + parking_space: Plas parkañ pharmacy: Apotikerezh place_of_worship: Lec'h azeuliñ police: Polis @@ -484,7 +486,6 @@ br: prison: Toull-bac'h pub: Tavarn public_building: Savadur foran - reception_area: Takad degemer recycling: Lec'h adaozañ restaurant: Preti retirement_home: Ti-retredidi @@ -509,6 +510,7 @@ br: village_hall: Sal ar gumun waste_basket: Pod-lastez waste_disposal: Skarzhañ al lastez + water_point: Lec'h dour youth_centre: Kreizenn evit ar re yaouank boundary: administrative: Bevennoù melestradurel @@ -517,6 +519,7 @@ br: protected_area: Takad gwarezet bridge: aqueduct: Dourbont + boardwalk: Pourmenadenn suspension: Pont-skourr swing: Pont-tro viaduct: Karrbont @@ -536,25 +539,31 @@ br: "yes": Stal artizanelezh emergency: ambulance_station: Sanailh ambulañsoù + assembly_point: Lec'h bodañ defibrillator: Difibrilator landing_site: Tachenn bradañ trumm phone: Pellgomzer evit an trummadoù + water_tank: Beol dour trumm + "yes": Trummadoù highway: abandoned: Hent-houarn dilezet bridleway: Hent evit ar varc'hegerien bus_guideway: Roudenn vus heñchet bus_stop: Arsav bus construction: Chanter gourhent + corridor: Trepad cycleway: Roudenn divrodegoù elevator: Pignerez emergency_access_point: Poent moned trummadoù footway: Gwenodenn evit an droadeien ford: Roudour + give_way: Panell "Lezit da dremen" living_street: Straed annez milestone: ↓Maen-bonn motorway: Gourhent motorway_junction: Kengej gourhent motorway_link: Gourhent + passing_place: Lec'h tremen path: Gwenodenn pedestrian: Hent evit an droadeien platform: Leurenn @@ -571,6 +580,7 @@ br: services: Servijoù gourhent speed_camera: Radar tizh steps: Diri + stop: Sinal paouez street_lamp: Post lamp tertiary: Hent trede renk tertiary_link: Hent trede renk @@ -579,8 +589,8 @@ br: trail: Roudenn trunk: Hent-tizh trunk_link: Hent-tizh + turning_loop: Kammdro dizehan unclassified: Hent dirumm - unsurfaced: Hent dizolo "yes": Hent historic: archaeological_site: Lec'hienn henoniel @@ -599,6 +609,7 @@ br: manor: Maner memorial: Kounlec'h mine: Mengleuz + mine_shaft: Poull mengleuz monument: Monumant roman_road: Hent roman ruins: Dismantroù @@ -608,6 +619,7 @@ br: wayside_cross: Kroaz wayside_shrine: Ti-pediñ wreck: Peñse + "yes": Lec'h Istorel junction: "yes": Kej landuse: @@ -645,9 +657,9 @@ br: leisure: beach_resort: Kêr-gouronkañ bird_hide: Bod evned - club: Klub common: Tachennoù foran dog_park: Park chas + firepit: Oaled fishing: Takad pesketa fitness_centre: Kreizenn fitness fitness_station: ↓Atalier da embreger ar c'horf @@ -672,15 +684,44 @@ br: water_park: Kreizenn dour "yes": Diduamantoù man_made: + beacon: Tour-tan + beehive: Ruskenn + breakwater: Diwagenner + bridge: Pont + bunker_silo: Bunker + chimney: Siminal + crane: Garv-houarn + dolphin: Post amariñ + dyke: Chaoser + embankment: Kleuz + flagpole: Gwern + gasometer: Gazometr + kiln: Forn briajoù lighthouse: Tour-tan + mast: Peul + mine: Mengleuz + mineshaft: Poull mengleuz + monitoring_station: Savlec'h evezhiañ + petroleum_well: Poull tireoul + pier: Sav-mein pipeline: Eoulsan + silo: Silo + storage_tank: Beol stokañ + surveillance: Evezh tower: Tour + wastewater_plant: Purlec'h tretañ an dourioù lous + watermill: Milin-dour + water_tower: Kastell-dour + water_well: Puñs + water_works: Reizhiad dre zour + windmill: Milin-avel works: Labouradeg "yes": Krouet gant Mab-den military: airfield: Nijva milourel barracks: Kazarn bunker: Bunker + "yes": Milourel mountain_pass: "yes": Ode menez natural: @@ -726,11 +767,14 @@ br: accountant: Kontour administrative: Melestradur architect: Ti-savour + association: kevredigezh company: Embregerezh + educational_institution: Ensavadur desavadurel employment_agency: Ajañs evit al labour estate_agent: Kourater tiez government: Ajañs c'houarnamantel insurance: Ajañs asurañsoù + it: Burev urzhiataerezh lawyer: Alvokad ngo: Burev un AMG (aozadur e-maez gouarnamant) telecommunication: Burev pellgehentiñ @@ -738,9 +782,8 @@ br: "yes": Burev place: allotments: Liorzhoù tiegezhel - block: Blog - airport: Aerborzh city: Meurgêr + city_block: Bloc'h kêrel country: Bro county: Kontelezh farm: Atant @@ -751,12 +794,13 @@ br: islet: Enezennig isolated_dwelling: Ti distro locality: Kêr - moor: Lanneg municipality: Kumun neighbourhood: Ardremez postcode: Kod post + quarter: Karter region: Rannvro sea: Mor + square: Plasenn state: Stad subdivision: Isrann suburb: Karter @@ -768,10 +812,8 @@ br: abandoned: Hent-houarn dilezet construction: Hent-houarn war sevel disused: Hent-houarn dilezet - disused_station: Porzh-houarn dilezet funicular: Hent-houarn fundren halt: Arsav tren - historic_station: Arsav tren istorel junction: Kej hent-houarn level_crossing: Treuzenn hent-houarn light_rail: Hent-houarn bihan @@ -797,6 +839,7 @@ br: beauty: Stal produioù kened beverages: Stal evajoù bicycle: Stal marc'hoù-houarn + bookmaker: Burev klaoustreoù books: Levrdi boutique: Stal butcher: Kiger @@ -835,12 +878,16 @@ br: hairdresser: Perukenner hardware: Stal urzhiataerezh hifi: Stal Hi-Fi - insurance: Asurañs + houseware: Stal traoù a diegezh + interior_decoration: Kinkladur diabarzh jewelry: Bravigerezh kiosk: Kiosk + kitchen: Stal-gegin laundry: Kanndi + lottery: Lotiri mall: Palier kenwerzh market: Marc'had + massage: Kemenadenn mobile_phone: Stal pellgomzerioù hezoug motorcycle: Stal marc'hoù-tan music: Stal sonerezh @@ -848,21 +895,27 @@ br: optician: Luneder organic: Stal boued bio outdoor: Stal oberiantizoù diavaez + paint: Palier livadurioù + pawnbroker: Prester ouzh gouestl pet: Stal loened pharmacy: Apotikerezh photo: Stal luc'hskeudenniñ - salon: Saloñs + seafood: Boued-mor second_hand: Stal traoù eildorn shoes: Stal voteier - shopping_centre: Kreizenn-genwerzh sports: Stal sport stationery: Paperaerezh supermarket: Gourmarc'had tailor: Kemener + ticket: Billederezh + tobacco: Stal-vutun toys: Stal c'hoarielloù travel_agency: Ajañs-veaj + tyres: Stal vandennoù-rod + vacant: Stal vak + variety_store: Stal seurtadoù video: Stal videoioù - wine: Kavour gwin + wine: Kavour "yes": Stal tourism: alpine_hut: Bod menez @@ -886,6 +939,7 @@ br: viewpoint: Gwelva zoo: Zoo tunnel: + building_passage: Tremen savadur culvert: kan-dour "yes": Riboul waterway: @@ -991,16 +1045,15 @@ br: legal_babble: title_html: Copyright hag aotre-implijout intro_1_html: |- - OpenStreetMap ® zo dindan un aotre-implijout digor, Open Data - Commons Open Database License (ODbL) gant ® - intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n - \ hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. - Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n - \ ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n legal\ncode e kavot - munudoù ho kwirioù hag ho teverioù." + OpenStreetMap ® zo dindan un aotre-implijout digor, href "htpps : //Open Data + Commons Open Database License (ODbL)gant OpenStreetMap Foundation (OSMF). + intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù + hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e genlabourerien. + Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,ne + c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \nlegal\ncode + e kavot munudoù ho kwirioù hag ho teverioù." intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout - Creative \nCommons + Creative \nCommons Attribution-ShareAlike 2.0 license (CC-BY-SA)." credit_title_html: Penaos reiñ kred da OpenStreetMap credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg “© @@ -1009,7 +1062,7 @@ br: Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du http://www.openstreetmap.org/ ha CC BY-SA war-du http://creativecommons.org/licenses/by-sa/2.0/. + href="https://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/. Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer : un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da www.openstreetmap.org (marteze en ur astenn @@ -1023,7 +1076,7 @@ br: title: Skouer deverkadur more_title_html: Titouroù ouzhpenn more_1_html: Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor - roadennoù, lennit Licence OSMF + roadennoù, lennit Licence OSMF Licence page hag ar gumuniezh Aostria : Ennañ roadennoù eus - Stadt Wien (dindan - CC BY. - CC BY), - Land Vorarlberg ha + Stadt Wien (dindan + CC BY. + CC BY), + Land Vorarlberg ha Land Tirol (dindan CC-BY AT gant enkemmadoù). contributors_ca_html: |- Kanada : Ennañ roadennoù eus @@ -1051,12 +1104,12 @@ br: Statistics Canada). contributors_fi_html: |- Finland: Ennañ ez eus roadennoù eus diaz roadennoù Ensellerezh Broadel Tiriad hag holladoù roadennoù all, dindan an - aotre-implij NLSFI. + aotre-implij NLSFI. contributors_fr_html: 'Frañs : Ennañ roadennoù eus Renerezh Hollek an Tailhoù.' contributors_nl_html: |- Netherlands : Contains © AND data, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Zeland-Nevez : Ennañ roadennoù eus Land Information New Zealand. Crown Copyright reserved. @@ -1072,7 +1125,7 @@ br: Survey data © Crown copyright and database right 2010-12. contributors_footer_1_html: |- ↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar Bajenn Skoazellerien e Wiki OpenStreetMap. + href="https://wiki.openstreetmap.org/wiki/Contributors">Bajenn Skoazellerien e Wiki OpenStreetMap. contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont, na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe. @@ -1083,14 +1136,14 @@ br: ezpleg ar re zo ar gwirioù-aozer ganto. infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se - da c'houzout d'hon argerzh + da c'houzout d'hon argerzh dizober, mar plij, pe skrivit war-eeun war hor furmskrid enlinenn. trademarks_title_html: Merkoù trademarks_1_html: Openstreet, al logo brasaer ha State of the Map zo merkoù marilhet gant OpenStreetMap Foundation. M'ho pez goulennoù da sevel diwar-benn - implij ar merkoù-se, kit e darempred gant Licence - Working Group, mar plij. + implij ar merkoù-se, sellit ouzh Trademark + Policy, mar plij. welcome_page: title: Deuet-mat oc'h ! introduction_html: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed @@ -1123,8 +1176,8 @@ br: paragraph_1_html: OpenStreetMap en deus un nebeud reolennoù furmel, met gortoz a reomp ma vo kemeret perzh gant an holl berzhidi ha ma vo darempredoù gant ar gumuniezh. Ma vezit e-sell d'ober traoù all estreget ober cheñchamantoù - gant an dorn, lennit ha heuilhit ar sturiadoù, mar plij, e An - ezporzhiadurioù ha + gant an dorn, lennit ha heuilhit ar sturiadoù, mar plij, e An + ezporzhiadurioù ha Ar c'hemmoù emgefre>/a>. questions: title: Traoù da c'houlenn ? @@ -1156,7 +1209,7 @@ br: title: Prederioù all explanation_html: Ma'z oc'h chalet gant an doare ma vez implijet hor roadennoù pe gant an endalc'hadoù, sellit ouzh hor pajenn gwir-eilañ - evit muioc'h a ditouroù lezennel, pe kit e darempred gant ar strollad-labour + evit muioc'h a ditouroù lezennel, pe kit e darempred gant ar strollad-labour OSMF a zere. help_page: title: Tapout sikour @@ -1211,7 +1264,7 @@ br: community_driven_title: Renet gant ar gumuniezh community_driven_html: |- Liesseurt hag entanet eo kumuniezh OpenStreetMap. O kreskiñ emañ bemdez. E-mesk hor c'henlabourerien ez eus kartennourien entanet, tud a-vicher eus ar GIS, ijinourien hag a laka servijerien OSM da vont en-dro, denegourien hag a sav kartennoù eus an takadoù gwastet gant gwallreuzioù ha kalz re all. - Evit gouzout hiroc'h diwar-benn ar gumuniezh, sellit ouzh deizlevrioù an implijerien, blogoù ar gumuniezh, hag lec'hienn web Diazezadur OSM. + Evit gouzout hiroc'h diwar-benn ar gumuniezh, sellit ouzh blogoù OpenStreetMap, deizlevrioù an implijerien,blogoù ar gumuniezh, hag lec'hienn web open data: gallout a rit implijout anezhañ evit forzh pseeurt pal keit ha ma roit kred da OpenStreetMap ha d''ar re a labour @@ -1220,14 +1273,16 @@ br: ha pajenn an aotre-implij evit gouzout hiroc''h.' legal_title: Lezennel legal_html: "Al lec'hienn-mañ hag e-leizh a servijoù all kar zo korvoet ent furmel - gant an Diazezaddur OpenStreetMap + gant an Diazezaddur OpenStreetMap (OSMF) \nen anv ar gumuniezh.\nEvit implijout an holl servijoù kinniget gant - an OSMF e ranker doujañ d'hor \n - Politikerezh war an implijoù degemeret ha d'hor Politikerzh - prevezded.\n
\nKit contacter + an OSMF e ranker doujañ d'hor \n + Politikerezh war an implijoù degemeret ha d'hor Politikerzh + prevezded.\n
\nKit contacter l'OSMF e darempred gant an OSMF, mar plij, m'ho peus goulennoù da sevel diwar-benn an aotreoù-implijout, ar gwirioù oberour pe diwar-benn goulennoù - lezennel all.\n
" + lezennel all.\n
\nOpenStreetMap, al logo gant ar brasaer ha ''State of the + Map'' zomerkoù + marilhet OSMF." partners_title: Kevelerien notifier: diary_comment_notification: @@ -1450,12 +1505,12 @@ br: anon_edits_link_text: Kavit perak. flash_player_required: Ezhomm hoc'h eus eus ul lenner Flash evit implijout Potlatch, aozer flash OpenStreetMap. Gallout a rit pellgargañ - Flash Player diwar Adobe.com. Meur - a zibarzh a c'haller kaout evit aozañ OpenStreetMap. + Flash Player diwar Adobe.com. Meur + a zibarzh a c'haller kaout evit kemmañ OpenStreetMap. potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.) - potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 da c'houzout hiroc'h potlatch2_unsaved_changes: Kemmoù n'int ket enrollet zo ganeoc'h. (Evit enrollañ ho kemmoù e Potlach2, klikit war enrollañ) @@ -1471,10 +1526,11 @@ br: get_directions_title: Kavit an hentoù etre an daou boent from: Eus to: Da - where_am_i: Pelec'h emaon ? + where_am_i: Pelec'h emañ ? where_am_i_title: Deskrivañ al lec'hiadur a-vremañ en ur implijout al lusker enklask submit_text: Kas + reverse_directions_text: Eilpennañ an durc'hadurioù key: table: entry: @@ -1549,7 +1605,7 @@ br: edit: Aozañ preview: Rakwelet markdown_help: - title_html: Dielfennet gant Markdown + title_html: Dielfennet gant Markdown headings: Titloù heading: Titl subheading: Istitl @@ -1657,7 +1713,7 @@ br: tagged_with: ' balizennet gant %{tags}' empty_html: N'eus netra da welet amañ. Pellgargit ur roudenn nevez evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh - ar href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i. + ar href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i. delete: scheduled_for_deletion: Roudenn da vezañ dilamet make_public: @@ -1864,12 +1920,12 @@ br: html: |-

E kemm gant kartennoù all, OpenStreetMap zo krouet penn-da-benn gant tud eveldoc'h. Forzh piv a c'hall dresañ, hizivaat, pellgargañ hag implijout anezhi.

Lakait hoc'h anv evit kregiñ da genlabourat. Kas a raimp ur postel deoc'h da gadarnaat ho kont.

- license_agreement: Pa gadarnaot ho kont e tleot asantiñ da ziferadennoù + license_agreement: Pa gadarnaot ho kont e tleot asantiñ da ziferadennoù ar c'henlabourer. email address: 'Chomlec''h postel :' confirm email address: 'Kadarnaat ar chomlec''h postel :' not displayed publicly: N'eo ket diskwelet ho chomlec'h d'an holl (gwelet hor c'harta prevezded) evit gouzout hiroc'h display name: 'Anv diskwelet :' @@ -1994,12 +2050,12 @@ br: email never displayed publicly: (n'eo ket diskwelet d'an holl morse) external auth: 'Dilesadur diavaez :' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: petra eo se ? public editing: heading: 'Aozañ foran :' enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Petra eo se ? disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl aozadennoù kent. @@ -2010,10 +2066,11 @@ br: pe gwelet ho lec'hiadur. Evit diskouez ar pezh hoc'h eus embannet ha reiñ an tu d'an dud da vont e darempred ganeoc'h dre al lec'hienn, klikit war al liamm da-heul. Abaoe ar c'hemm davet ar stumm API 0.6, n'eus nemet - an dud gant an doare "kemmoù foran" a c'hall embann kartennoù. (gouzout - hiroc'h).
  • Ne vo ket roet ho chomlec'h postel d'an dud.
  • N'hall - ket an obererezh-se bezañ nullet hag emañ an holl implijerien nevez gant - an doare "kemmoù foran" dre ziouer.
+ an dud gant an doare "kemmoù foran" a c'hall kemmañ roadennoù ar c'hartennoù. + (gouzout hiroc'h).
  • Ne + vo ket roet ho chomlec'h postel d'an dud.
  • N'hall ket an obererezh-se + bezañ nullet hag emañ an holl implijerien nevez gant an doare "kemmoù foran" + dre ziouer.
contributor terms: heading: 'Diferadennoù ar c''henlabourer :' agreed: Degemeret hoc'h eus diferadennoù nevez ar c'henlabourer. @@ -2137,6 +2194,8 @@ br: not_a_role: An neudennad « %{role} » n'eo ket ur roll reizh. already_has_role: Ar roll %{role} zo gant an implijer dija. doesnt_have_role: N'emañ ket ar roll %{role} gant an implijer. + not_revoke_admin_current_user: Ne c'haller ket tennañ ar gwirioù melestrer digant + an implijer bremañ. grant: title: Kadarnaat roidigezh ar roll heading: Kadarnaat roidigezh ar roll @@ -2363,9 +2422,10 @@ br: new: intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat - ha skrivet un notenn da zisplegañ ar gudenn. (Arabat skrivañ amañ titouroù - personel pe titouroù tennet eus kartennoù dindan aotre-implijout pe rolloù - kavlec'h, mar plij.) + ha skrivit un notenn da zisplegañ ar gudenn. + advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar + gartenn. Setu perak eo abarat ebarzhiñ titouroù personel pe titouroù o tont + eus kartennoù gwarezet na endalc'hioù rolloù. add: Ouzhpennañ un notenn show: anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 2f2d03731..3ab825186 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -377,33 +377,26 @@ bs: crematorium: Krematorij dentist: Zubar doctors: Doktor - dormitory: Studentski dom drinking_water: Voda za piće driving_school: AutoÅ¡kola embassy: Ambasada - emergency_phone: S.O.S. Telefon fast_food: Fast food ferry_terminal: Trajektni terminal - fire_hydrant: Hidrant fire_station: Vatrogasna stanica food_court: DvoriÅ¡te restorana fountain: Fontana fuel: Benzinska pumpa gambling: Kockanje grave_yard: Groblje - gym: Fitness centar - health_centre: Zdravstveni centar hospital: Bolnica hunting_stand: Lovačka čeka ice_cream: Sladoled kindergarten: Dječiji vrtić library: Biblioteka - market: Tržnica marketplace: Tržnica monastery: Manastir motorcycle_parking: Parking za motore nightclub: Noćni klub - nursery: Čuvanje djece nursing_home: Starački dom office: Kancelarija parking: Parking @@ -417,7 +410,6 @@ bs: prison: Zatvor pub: Pub public_building: Ustanova - reception_area: Recepcija recycling: Reciklažna stanica restaurant: Restoran retirement_home: Dom penzionera @@ -513,7 +505,6 @@ bs: trunk: Brza cesta trunk_link: Prilaz brzoj cesti unclassified: Neklasificirana cesta - unsurfaced: Neasfaltirana cesta "yes": Put historic: archaeological_site: ArheoloÅ¡ko nalaziÅ¡te @@ -574,7 +565,6 @@ bs: leisure: beach_resort: OdmaraliÅ¡te - plaža bird_hide: Posmatračnica ptica - club: Klub common: Općinsko zemljiÅ¡te dog_park: Park za pse fishing: Ribolovno područje @@ -653,7 +643,6 @@ bs: travel_agent: Putnička agencija "yes": Kancelarija place: - airport: Aerodrom city: Grad country: Država county: Kanton @@ -665,7 +654,6 @@ bs: islet: Ostrvce isolated_dwelling: Izolirano stanovanje locality: Lokalitet - moor: Močvarno tlo municipality: Općina postcode: PoÅ¡tanski broj region: Regija @@ -680,10 +668,8 @@ bs: abandoned: NapuÅ¡tena pruga construction: Pruga u izgradnji disused: NapuÅ¡tena pruga - disused_station: Željeznička stanica (nije u upotrebi) funicular: Uspinjača halt: Željeznička stanica - historic_station: Historijska željeznička stanica junction: Željeznički čvor level_crossing: Pružni prelaz light_rail: Lahka željeznica @@ -744,7 +730,6 @@ bs: hairdresser: Frizer hardware: Željezarija hifi: Hi-Fi - insurance: Osiguranje jewelry: Trgovina nakitom kiosk: Kiosk laundry: Praonica rublja @@ -760,9 +745,7 @@ bs: pet: Trgovina za kućne ljubimce pharmacy: Apoteka photo: Fotograf - salon: Salon shoes: Trgovina obućom - shopping_centre: Trgovački centar sports: Trgovina sportskom opremom stationery: Papirnica supermarket: Supermarket diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 59c0105bf..d6e5cfc59 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -247,7 +247,7 @@ ca: changeset_paging_nav: showing_page: Pàgina %{page} next: Endavant » - previous: « Enrere + previous: ← Anterior changeset: anonymous: Anònim no_edits: (sense edicions) @@ -468,33 +468,26 @@ ca: crematorium: Crematori dentist: Dentista doctors: Metges - dormitory: Residència Universitària drinking_water: Aigua potable driving_school: Autoescola embassy: Ambaixada - emergency_phone: Telèfon d'emergència fast_food: Menjar ràpid ferry_terminal: Terminal de Ferry - fire_hydrant: Boca d'incendi fire_station: Parc de bombers food_court: Àrea de restauració fountain: Font fuel: Benzinera gambling: Jocs d'atzar grave_yard: Cementiri - gym: Gimnàs - health_centre: Centre de Salut hospital: Hospital hunting_stand: Club de caça ice_cream: Gelat kindergarten: Jardí d'infància library: Biblioteca - market: Mercat marketplace: Mercat monastery: Monestir motorcycle_parking: Aparcament per a motos nightclub: Club nocturn - nursery: Infantil nursing_home: Llar d'Avis office: Oficina parking: Pàrquing @@ -508,7 +501,6 @@ ca: prison: Presó pub: Pub public_building: Edifici públic - reception_area: Àrea de recepció recycling: Punt de reciclatge restaurant: Restaurant retirement_home: Casa de Retirament @@ -563,6 +555,7 @@ ca: defibrillator: Desfibril·lador landing_site: Lloc d'aterratges d'emergència phone: Telèfon per a emergències + "yes": Emergència highway: abandoned: Carretera abandonada bridleway: Ferradura @@ -604,7 +597,6 @@ ca: trunk: Autovia de trunk_link: Autovia de unclassified: Sense classificar Road - unsurfaced: Pista sense asfaltar "yes": Carretera historic: archaeological_site: Lloc arqueològic @@ -632,6 +624,7 @@ ca: wayside_cross: Camí de la creu wayside_shrine: Santuari de carreteres wreck: Wreck + "yes": Lloc històric junction: "yes": Intersecció landuse: @@ -669,7 +662,6 @@ ca: leisure: beach_resort: Beach Resort bird_hide: Aguait - club: Club common: Terra comú dog_park: Parc caní fishing: Àrea de pesca @@ -696,8 +688,11 @@ ca: water_park: Parc aquàtic "yes": Esbarjo man_made: + breakwater: Escullera + bridge: Pont lighthouse: Far pipeline: Canonada + silo: Sitja tower: Torre works: Fàbrica "yes": Fet per l'home @@ -750,7 +745,9 @@ ca: accountant: Comptable administrative: Administració architect: Arquitecte + association: Associació company: Empresa + educational_institution: Institució educativa employment_agency: Agència d'ocupació estate_agent: Immobiliària government: Oficina governamental @@ -762,9 +759,8 @@ ca: "yes": Oficina place: allotments: Horts - block: Bloc - airport: Aeroport city: Ciutat + city_block: Illa de cases country: País county: Comtat farm: Granja @@ -775,7 +771,6 @@ ca: islet: Illot isolated_dwelling: Habitatge aïllat locality: Localitat - moor: Amarrador municipality: Municipi neighbourhood: Barri postcode: Codi postal @@ -792,10 +787,8 @@ ca: abandoned: Ferrocarril fora de Servei construction: Ferrocarril en Construcció disused: Ferrocarril en desús - disused_station: Estació de tren tancada funicular: Funicular Railway halt: Parada de tren - historic_station: Estació de tren antiga junction: Cruïlla de tren level_crossing: Pas a nivell light_rail: Tren lleuger @@ -859,7 +852,6 @@ ca: hairdresser: Perruqueria o barberia hardware: Botiga de maquinari hifi: Hi-Fi - insurance: Homes For Sale jewelry: Joieria kiosk: Quiosc botiga laundry: Bugaderia @@ -875,10 +867,8 @@ ca: pet: Botiga d'animals pharmacy: Farmàcia photo: Botiga de foto - salon: Sala d'estar second_hand: Botiga de segona mà shoes: Sabateria - shopping_centre: Centre comercial sports: Botiga d'esports stationery: Botiga de papereria supermarket: Supermercat @@ -1118,10 +1108,10 @@ ca: per eliminar dades protegides pels drets d'autor o empleneu aquest formulari en línia.. trademarks_title_html: Marques registrades - trademarks_1_html: OpenStreetMap i el logotip de la lupa són marques registrades - de la Fundació OpenStreetMap. Si teniu preguntes sobre l'ús de les marques, - si us plau envieu les vostres al Grup - de Treball de Llicències. + trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map» + són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes sobre + l’ús de les marques, consulteu la política + de marques registrades. welcome_page: title: Benvingut! introduction_html: Us donem la benvinguda a l'OpenStreetMap, el mapa lliure i diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f090caac3..aa0cb2fe8 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -7,6 +7,7 @@ # Author: DemonioCZ # Author: Dvorapa # Author: H4nek +# Author: Ilimanaq29 # Author: JAn Dudík # Author: Jezevec # Author: Jkjk @@ -17,6 +18,7 @@ # Author: Martin Urbanec # Author: Masox # Author: Matěj Grabovský +# Author: Matěj Suchánek # Author: Michaelbrabec # Author: Mkyral # Author: Mormegil @@ -428,12 +430,19 @@ cs: chair_lift: Sedačková lanovka drag_lift: Vlek gondola: Kabinková lanovka + platter: Talířový výtah + pylon: Pylon station: Stanice lanovky + t-bar: Výtah T-Bar aeroway: aerodrome: LetiÅ¡tě + airstrip: Startovací a přistávací dráha apron: Odbavovací plocha gate: LetiÅ¡tní brána + hangar: Hangár helipad: Heliport + holding_position: Držení pozice + parking_position: Parkovací slot runway: Dráha taxiway: Pojezdová dráha terminal: Terminál @@ -468,37 +477,32 @@ cs: crematorium: Krematorium dentist: Zubař doctors: Lékař - dormitory: Kolej drinking_water: Pitná voda driving_school: AutoÅ¡kola embassy: Velvyslanectví - emergency_phone: Nouzový telefon fast_food: Rychlé občerstvení ferry_terminal: PřístaviÅ¡tě přívozu - fire_hydrant: Požární hydrant fire_station: Hasičská stanice food_court: Občerstvení fountain: Fontána fuel: Čerpací stanice gambling: Hazardní hry grave_yard: Hřbitov - gym: Fitness centrum / tělocvična - health_centre: Zdravotní středisko + grit_bin: Zrnitý koÅ¡ hospital: Nemocnice hunting_stand: Posed ice_cream: Zmrzlinárna kindergarten: Mateřská Å¡kola library: Knihovna - market: TržiÅ¡tě marketplace: Tržnice monastery: Klášter motorcycle_parking: ParkoviÅ¡tě pro motocykly nightclub: Noční klub - nursery: Jesle nursing_home: Pečovatelský dům office: Úřad parking: ParkoviÅ¡tě parking_entrance: Vjezd na parkoviÅ¡tě + parking_space: ParkoviÅ¡tě pharmacy: Lékárna place_of_worship: Náboženský objekt police: Policie @@ -508,7 +512,6 @@ cs: prison: Věznice pub: Hospoda public_building: Veřejná budova - reception_area: Recepce recycling: Tříděný odpad restaurant: Restaurace retirement_home: Domov důchodců @@ -533,6 +536,7 @@ cs: village_hall: Společenský sál waste_basket: Odpadkový koÅ¡ waste_disposal: Popelnice + water_point: Bod vody youth_centre: Centrum pro mládež boundary: administrative: Administrativní hranice @@ -541,6 +545,7 @@ cs: protected_area: Chráněná oblast bridge: aqueduct: Akvadukt + boardwalk: Tabulová chůze suspension: Visutý most swing: Otočný most viaduct: Viadukt @@ -560,25 +565,31 @@ cs: "yes": Řemeslná dílna emergency: ambulance_station: StanoviÅ¡tě záchranné služby + assembly_point: Shromažďovací místo defibrillator: Defibrilátor landing_site: Přistávací plocha záchranky phone: Nouzový telefon + water_tank: Nouzová vodní nádrž + "yes": Nouze highway: abandoned: ZruÅ¡ená silnice bridleway: Koňská stezka bus_guideway: Autobusová dráha bus_stop: Autobusová zastávka construction: Silnice ve výstavbě + corridor: Koridor cycleway: Cyklostezka elevator: Výtah emergency_access_point: Nouzový lokalizační bod footway: Chodník ford: Brod + give_way: Značka cesty living_street: Obytná zóna milestone: Kilometrovník motorway: Dálnice motorway_junction: Dálniční křižovatka motorway_link: Dálnice + passing_place: Přechod path: Stezka pedestrian: Pěší zóna platform: NástupiÅ¡tě @@ -595,6 +606,7 @@ cs: services: Dálniční odpočívadlo speed_camera: Radar steps: Schody + stop: Značka Stop street_lamp: Pouliční lampa tertiary: Silnice třetí třídy tertiary_link: Silnice třetí třídy @@ -603,8 +615,8 @@ cs: trail: Stezka trunk: Významná silnice trunk_link: Významná silnice + turning_loop: Otočná smyčka unclassified: Silnice - unsurfaced: Nezpevněná cesta "yes": Cesta historic: archaeological_site: Archeologické naleziÅ¡tě @@ -623,6 +635,7 @@ cs: manor: Panství memorial: Památník mine: Důl + mine_shaft: Důlní Å¡achta monument: Pomník roman_road: Římská cesta ruins: Zřícenina @@ -632,6 +645,7 @@ cs: wayside_cross: Boží muka wayside_shrine: Boží muka wreck: Vrak + "yes": Historická stránka junction: "yes": Křižovatka landuse: @@ -669,9 +683,9 @@ cs: leisure: beach_resort: Pobřežní letovisko bird_hide: Ptačí pozorovatelna - club: Klub common: Obecní půda dog_park: Park pro psy + firepit: OhniÅ¡tě fishing: Rybářská oblast fitness_centre: Fitness centrum fitness_station: Fitness @@ -696,15 +710,46 @@ cs: water_park: Aquapark "yes": Volný čas man_made: + adit: Adit + beacon: Maják + beehive: Včelí úl + breakwater: Vlnolam + bridge: Most + bunker_silo: Bunkr + chimney: Komín + crane: Jeřáb + dolphin: Kotvící poÅ¡ta + dyke: Hráz + embankment: Nábřeží + flagpole: Vlajková tyč + gasometer: Plynoměr + groyne: Vlnolam + kiln: Pec lighthouse: Maják + mast: Stožár + mine: Mina + mineshaft: Důlní Å¡achta + monitoring_station: Stanice monitoringu + petroleum_well: Ropný důl + pier: Molo pipeline: Potrubí + silo: Silo + storage_tank: Skladovací nádrž + surveillance: Dohled tower: Věž + wastewater_plant: Rostlina na plýtvání vodou + watermill: Vodní mlýn + water_tower: Vodní věž + water_well: Studna + water_works: Vodárna + windmill: Větrný mlýn works: Továrna "yes": Lidský výtvor military: airfield: Vojenské letiÅ¡tě barracks: Kasárna bunker: Bunkr + "yes": Armáda mountain_pass: "yes": Průsmyk natural: @@ -750,11 +795,14 @@ cs: accountant: Účetní administrative: Správa architect: Architekt + association: Asociace company: Firma + educational_institution: Vzdělávací instituce employment_agency: Pracovní agentura estate_agent: Realitní kancelář government: Vládní úřad insurance: PojiÅ¡Å¥ovna + it: Počítačová kancelář lawyer: Právnická kancelář ngo: Úřad nevládní organizace telecommunication: Telekomunikační úřad @@ -762,9 +810,8 @@ cs: "yes": Kancelář place: allotments: Zahrádkářská kolonie - block: Blok - airport: LetiÅ¡tě city: Velkoměsto + city_block: Městský blok country: Stát county: Hrabství farm: Farma @@ -775,12 +822,13 @@ cs: islet: Ostrůvek isolated_dwelling: Samota locality: Oblast - moor: Bažina municipality: Obecní úřad neighbourhood: ČtvrÅ¥ postcode: PSČ + quarter: Čtvrt region: Region sea: Moře + square: Náměstí state: Stát subdivision: Parcely suburb: Městská část @@ -792,10 +840,8 @@ cs: abandoned: ZruÅ¡ená železniční traÅ¥ construction: Železnice ve výstavbě disused: Nepoužívaná železniční traÅ¥ - disused_station: ZruÅ¡ená železniční stanice funicular: Lanová dráha halt: Železniční zastávka - historic_station: Nádraží historické železnice junction: Kolejové rozvětvení level_crossing: Železniční přejezd light_rail: Rychlodráha @@ -821,6 +867,7 @@ cs: beauty: Salón krásy beverages: Prodej nápojů bicycle: Cykloobchod + bookmaker: Bookmaker books: Knihkupectví boutique: Butik butcher: Řeznictví @@ -859,12 +906,16 @@ cs: hairdresser: Kadeřnictví hardware: Železářství hifi: Prodej Hi-Fi elektroniky - insurance: PojiÅ¡Å¥ovna + houseware: Obchod s domácími potřebami + interior_decoration: Vnitřní dekorace jewelry: Klenotnictví kiosk: Kiosek + kitchen: Kuchyňský obchod laundry: Prádelna + lottery: Loterie mall: Nákupní centrum market: Trh + massage: Masáž mobile_phone: Prodej mobilních telefonů motorcycle: Prodej motocyklů music: Prodej hudby @@ -872,19 +923,25 @@ cs: optician: Oční optika organic: Prodej biopotravin outdoor: Outdoorový obchod + paint: Obchod s barvami + pawnbroker: Zastavárník pet: Prodejna pro chovatele pharmacy: Lékárna photo: Prodejna foto - salon: Salón + seafood: Mořské plody second_hand: Bazar shoes: Obuvnictví - shopping_centre: Nákupní centrum sports: Prodejna pro sportovce stationery: Papírnictví supermarket: Supermarket tailor: Krejčí + ticket: Obchod s lístky + tobacco: Trafika toys: Hračkářství travel_agency: Cestovní kancelář + tyres: Pneuservis + vacant: Volný obchod + variety_store: Jednotkový obchod video: Videopůjčovna, prodej DVD wine: Vinárna "yes": Obchod @@ -910,6 +967,7 @@ cs: viewpoint: Vyhlídka zoo: Zoo tunnel: + building_passage: Stavební průchod culvert: Propustek "yes": Tunel waterway: @@ -1091,9 +1149,9 @@ cs: pro odstranění nebo přímo podejte výzvu pomocí on-line formuláře. trademarks_title_html: Ochranné známky - trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map jsou zapsané - ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně vaÅ¡eho - používání těchto známek, zaÅ¡lete své dotazy pracovní + trademarks_1_html: OpenStreetMap, jeho logo s lupou a State of the Map jsou + zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně + vaÅ¡eho používání těchto známek, zaÅ¡lete své dotazy pracovní skupině pro licencování. welcome_page: title: Vítejte! @@ -1246,7 +1304,7 @@ cs: see_their_profile: Jeho/její profil si můžete prohlédnout na %{userurl}. befriend_them: Můžete si ho/ji také přidat jako přítele na %{befriendurl}. gpx_notification: - greeting: Ahoj, + greeting: Dobrý den, your_gpx_file: Vypadá to, že váš GPX soubor with_description: s popisem and_the_tags: 'a následujícími Å¡títky:' @@ -1273,13 +1331,13 @@ cs: email_confirm: subject: '[OpenStreetMap] Potvrzení vaší e-mailové adresy' email_confirm_plain: - greeting: Ahoj, + greeting: Dobrý den, hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url} na %{new_address}. click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz. email_confirm_html: - greeting: Ahoj, + greeting: Dobrý den, hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url} na %{new_address}. click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující @@ -1287,7 +1345,7 @@ cs: lost_password: subject: '[OpenStreetMap] Žádost o nové heslo' lost_password_plain: - greeting: Ahoj, + greeting: Dobrý den, hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele serveru openstreetmap.org s touto e-mailovou adresou. click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové @@ -1327,7 +1385,7 @@ cs: details: Podrobnosti k poznámce můžete najít na %{url}. changeset_comment_notification: hi: Dobrý den, uživateli %{to_user}, - greeting: Ahoj, + greeting: Dobrý den, commented: subject_own: '[OpenStreetMap] %{commenter} okomentoval jednu z vaÅ¡ich sad změn' @@ -1463,6 +1521,7 @@ cs: where_am_i: Kde je toto? where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače submit_text: Hledat + reverse_directions_text: Opačné směry key: table: entry: @@ -2380,8 +2439,16 @@ cs: instructions: continue_without_exit: Pokračujte na %{name} slight_right_without_exit: Mírně vpravo na %{name} - offramp_right_without_exit: Použijte nájezd vpravo na %{name} + offramp_right_without_exit: Použijte sjezd vpravo na %{name} + offramp_right_with_directions: Použijte sjezd vpravo směrem na %{directions} + offramp_right_with_name_and_directions: Použijte sjezd vpravo na %{name}, + směrem na %{directions} + offramp_right_without_directions: Použijte sjezd vpravo onramp_right_without_exit: Odbočte vpravo na nájezd na %{name} + onramp_right_with_directions: Odbočte vpravo na nájezd směrem na %{directions} + onramp_right_with_name_and_directions: Odbočte vpravo na nájezd na %{name}, + směrem na %{directions} + onramp_right_without_directions: Odbočte vpravo na nájezd endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name} merge_right_without_exit: Připojte se vpravo na %{name} fork_right_without_exit: Na rozcestí odbočte vpravo na %{name} @@ -2390,18 +2457,26 @@ cs: uturn_without_exit: Otočte se na %{name} sharp_left_without_exit: Ostře vlevo na %{name} turn_left_without_exit: Odbočte vlevo na %{name} - offramp_left_without_exit: Použijte nájezd vlevo na %{name} + offramp_left_without_exit: Použijte sjezd vlevo na %{name} + offramp_left_with_directions: Použijte sjezd vlevo směrem na %{directions} + offramp_left_with_name_and_directions: Použijte sjezd vlevo na %{name}, směrem + na %{directions} + offramp_left_without_directions: Použijte sjezd vlevo onramp_left_without_exit: Odbočte vlevo na nájezd na %{name} + onramp_left_with_directions: Odbočte vlevo na nájezd směrem na %{directions} + onramp_left_with_name_and_directions: Odbočte vlevo na nájezd na %{name}, + směrem na %{directions} + onramp_left_without_directions: Odbočte vlevo na nájezd endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name} merge_left_without_exit: Připojte se vlevo na %{name} fork_left_without_exit: Na rozcestí odbočte vlevo na %{name} slight_left_without_exit: Mírně vlevo na %{name} via_point_without_exit: (zastávka) follow_without_exit: Jeďte po %{name} - roundabout_without_exit: Na kruhovém objezdu použijte %{name} + roundabout_without_exit: Z kruhového objezdu vyjeďte na %{name} leave_roundabout_without_exit: Vyjeďte z kruhového objezdu – %{name} stay_roundabout_without_exit: Zůstaňte na kruhovém objezdu – %{name} - start_without_exit: Začněte na konci %{name} + start_without_exit: Začněte na %{name} destination_without_exit: Jste v cíli against_oneway_without_exit: Jeďte protisměrem na %{name} end_oneway_without_exit: Konec jednosměrky na %{name} diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 001178b8d..75d720bda 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -417,33 +417,26 @@ cy: crematorium: Amlosgfa dentist: Deintydd doctors: Meddygfa - dormitory: Noswylfa drinking_water: Dŵr Yfed driving_school: Ysgol Yrru embassy: Llysgenhadaeth - emergency_phone: Ffôn Argyfwng fast_food: Bwyd Parod ferry_terminal: Terfynell Fferi - fire_hydrant: Hydrant tân fire_station: Gorsaf Dân food_court: Cwrt Fwydydd fountain: Ffynnon fuel: Tanwydd gambling: Gamblo grave_yard: Mynwent - gym: Canolfan Ffitrwydd / Campfa - health_centre: Canolfan Iechyd hospital: Ysbyty hunting_stand: Llwyfan Hela ice_cream: Hufen Iâ kindergarten: Meithrinfa library: Llyfrgell - market: Marchnad marketplace: Marchnad monastery: Mynachdy motorcycle_parking: Man Parcio Beiciau Modur nightclub: Clwb Nôs - nursery: Meithrinfa nursing_home: Cartref Nyrsio office: Swyddfa parking: Parcio @@ -457,7 +450,6 @@ cy: prison: Carchar pub: Tafarn public_building: Adeilad Cyhoeddus - reception_area: Derbyniad recycling: Pwynt Ailgylchu restaurant: Bwyty retirement_home: Cartref Ymddeol @@ -553,7 +545,6 @@ cy: trunk: Cefnffordd trunk_link: Cefnffordd unclassified: Ffordd Diddosbarth - unsurfaced: Ffordd Heb Wyneb "yes": Ffordd historic: archaeological_site: Safle Archaeolegol @@ -618,7 +609,6 @@ cy: leisure: beach_resort: Ardal Wyliau bird_hide: Cuddle Adar - club: Clwb common: Tir Comin dog_park: Parc Cwn fishing: Man Pysgota @@ -711,8 +701,6 @@ cy: "yes": Swyddfa place: allotments: Rhandiroedd - block: Bloc - airport: Maes Awyr city: Dinas country: Gwlad county: Sir @@ -724,7 +712,6 @@ cy: islet: Ynysig isolated_dwelling: Annedd Unig locality: Ardal - moor: Gwaun municipality: Bwrdeistref neighbourhood: Cymdogaeth postcode: Cod Post @@ -741,10 +728,8 @@ cy: abandoned: Hen Reilffordd construction: Rheilffordd yn cael ei Osod disused: Rheilffordd Segur - disused_station: Gorsaf Drenau Segur funicular: Rheilffordd fynydd halt: Stop Trenau - historic_station: Hen Orsaf Trenau junction: Cyffordd Rheilffyrdd level_crossing: Croesfan Wastad light_rail: Rheilffordd Ysgafn @@ -808,7 +793,6 @@ cy: hairdresser: Siop Drin Gwallt hardware: Siop Nwyddau Metel hifi: Sain - insurance: Yswiriant jewelry: Siop Gemwaith kiosk: Siop Fechan laundry: Golchdy @@ -824,10 +808,8 @@ cy: pet: Siop Anifeiliaid Anwes pharmacy: Fferyllfa photo: Siop Luniau - salon: Salon Trin Gwallt second_hand: Siol Ail-law shoes: Siop Esgidiau - shopping_centre: Canolfan Siopa sports: Siop Chwaraeon stationery: Siop Offer Swyddfa supermarket: Archfarchnad diff --git a/config/locales/da.yml b/config/locales/da.yml index 4d8e80b9d..0e360e7e7 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -11,6 +11,7 @@ # Author: Hede2000 # Author: Hein0170 # Author: Hylle +# Author: IBDJ # Author: Jens Jensen # Author: Jhertel # Author: Joedalton @@ -364,7 +365,7 @@ da: map_image: Kort billede (viser standard lag) embeddable_html: HTML der kan indlejres licence: Licens - export_details: OpenStreetMaps data er licenseret under Open + export_details: OpenStreetMaps data er licenseret under Open Data Commons Open Database License (ODbL). too_large: advice: 'Hvis ovenstÃ¥ende eksport mislykkes, kan du overveje at bruge en af @@ -405,14 +406,14 @@ da: geocoder: search: title: - latlon: Resultater fra interne + latlon: Resultater fra interne uk_postcode: Resultater fra NPEMap / FreeThe Postcode - ca_postcode: Resultater fra Geocoder.CA - osm_nominatim: Resultater fra OpenStreetMap + ca_postcode: Resultater fra Geocoder.CA + osm_nominatim: Resultater fra OpenStreetMap Nominatim geonames: Resultater fra GeoNames - osm_nominatim_reverse: Resultater fra OpenStreetMap + osm_nominatim_reverse: Resultater fra OpenStreetMap Nominatim geonames_reverse: Resultater fra GeoNames search_osm_nominatim: @@ -422,12 +423,19 @@ da: chair_lift: Stolelift drag_lift: Træklift gondola: Gondolbane + platter: Tallerkenlift + pylon: Pylon station: Svævebanestation + t-bar: Ankerlift aeroway: aerodrome: Flyveplads + airstrip: Landingsbane apron: Forstykke gate: Gate + hangar: Hangar helipad: Helikopterplads + holding_position: Venteposition + parking_position: Parkeringsposition runway: Landingsbane taxiway: Rullevej terminal: Terminal @@ -462,37 +470,32 @@ da: crematorium: Krematorium dentist: Tandlæge doctors: Læger - dormitory: Kollegium drinking_water: Drikkevand driving_school: Køreskole embassy: Ambassade - emergency_phone: Nødtelefon fast_food: Fastfood ferry_terminal: Færgeterminal - fire_hydrant: Brandhane fire_station: Brandstation food_court: Food Court fountain: Springvand fuel: Benzinstation gambling: Spil grave_yard: KirkegÃ¥rd - gym: Træningscenter - health_centre: Sundhedscenter + grit_bin: Saltkasse hospital: Sygehus hunting_stand: Jagtplatform ice_cream: Is kindergarten: Børnehave library: Bibliotek - market: Marked marketplace: Markedsplads monastery: Kloster motorcycle_parking: Motorcykelparkering nightclub: Natklub - nursery: Førskole nursing_home: Plejehjem office: Kontor parking: Parkering parking_entrance: Parkeringsindkørsel + parking_space: Parkeringsplads pharmacy: Apotek place_of_worship: Sted for gudstjenester police: Politi @@ -502,7 +505,6 @@ da: prison: Fængsel pub: Pub public_building: Offentlig bygning - reception_area: ModtagelsesomrÃ¥de recycling: Genbrugsstation restaurant: Restaurant retirement_home: Plejehjem @@ -527,6 +529,7 @@ da: village_hall: Forsamlingshus waste_basket: Skraldespand waste_disposal: Skraldecontainer + water_point: Vandpunkt youth_centre: Ungdomscenter boundary: administrative: Administrativ grænse @@ -535,6 +538,7 @@ da: protected_area: Beskyttet omrÃ¥de bridge: aqueduct: Akvædukt + boardwalk: Strandbro suspension: Hængebro swing: Drejebro viaduct: Viadukt @@ -554,25 +558,31 @@ da: "yes": HÃ¥ndsværksbutik emergency: ambulance_station: Ambulancestation + assembly_point: Mødested defibrillator: Hjertestarter landing_site: Nødlandingsplads phone: Nødtelefon + water_tank: Nødvandtank + "yes": Nødsituation highway: abandoned: Forladt motorvej bridleway: Ridesti bus_guideway: Styret busspor bus_stop: Busstoppested construction: Vej under konstruktion + corridor: Korridor cycleway: Cykelsti elevator: Elevator emergency_access_point: Nødudgangspunkt footway: Gangsti ford: Vadested + give_way: Giv plads-skilt living_street: Vej med legende børn milestone: Milepæl motorway: Motorvej motorway_junction: Motorvejsafkørsel motorway_link: Af-/tilkørsel til motorvej + passing_place: Overgang path: Sti pedestrian: GÃ¥gade platform: Perron @@ -589,6 +599,7 @@ da: services: MotorvejsserviceomrÃ¥de speed_camera: Fartkamera steps: Trappe + stop: Stopskilt street_lamp: Gadelygte tertiary: Hovedvej tertiary_link: Hovedvej @@ -597,8 +608,8 @@ da: trail: Spor trunk: Motortrafikvej trunk_link: Motortrafikvej + turning_loop: Vendesløjfe unclassified: Anden vej - unsurfaced: Uasfalteret vej "yes": Vej historic: archaeological_site: Arkæologisk sted @@ -617,6 +628,7 @@ da: manor: HerregÃ¥rd memorial: Mindesmærke mine: Mine + mine_shaft: Mineskakt monument: Monument roman_road: Romersk vej ruins: Ruin @@ -626,6 +638,7 @@ da: wayside_cross: Vejkors wayside_shrine: Vejside helligdom wreck: Vrag + "yes": Historisk plads junction: "yes": Kryds landuse: @@ -663,9 +676,9 @@ da: leisure: beach_resort: Badestrand bird_hide: Fugleskjul - club: Klub common: Fælles arealer dog_park: Hundepark + firepit: Kogegrube fishing: FiskeomrÃ¥de fitness_centre: Motionscenter fitness_station: Udendørs fitness udstyr @@ -690,15 +703,46 @@ da: water_park: Vandland "yes": Fritid man_made: + adit: Stoll + beacon: Fyr + beehive: Bikube + breakwater: Mole + bridge: Bro + bunker_silo: Bunker + chimney: Skorsten + crane: Kran + dolphin: Fortøjningspæl + dyke: Grøft + embankment: Dige + flagpole: Flagstang + gasometer: Gasometer + groyne: Høfde + kiln: Kalkovn lighthouse: Fyr + mast: Mast + mine: Mine + mineshaft: Mineskakt + monitoring_station: OvervÃ¥gningsstation + petroleum_well: Oliebrønd + pier: Mole pipeline: Rørledning + silo: Silo + storage_tank: Lagertank + surveillance: OvervÃ¥gning tower: TÃ¥rn + wastewater_plant: Affaldsfabrik + watermill: Vandmølle + water_tower: VandtÃ¥rn + water_well: Brønd + water_works: Vandanlæg + windmill: Vindmølle works: Fabrik "yes": Menneskeskabt military: airfield: Militær flyveplads barracks: Kaserne bunker: Bunker + "yes": Militær mountain_pass: "yes": Bjergpas natural: @@ -744,11 +788,14 @@ da: accountant: Revisor administrative: Administration architect: Arkitekt + association: Forening company: Firma + educational_institution: Uddannelsesanstalt employment_agency: Arbejdsløshedskontor estate_agent: Ejendomsmægler government: Statligt kontor insurance: Forsikringskontor + it: IT-kontor lawyer: Advokat ngo: ikkestatsligt kontor (NGO) telecommunication: Telekommunikationskontor @@ -756,9 +803,8 @@ da: "yes": Kontor place: allotments: Kolonihaver - block: Blok - airport: Lufthavn city: Storby + city_block: Bykvarter country: Land county: Amt farm: GÃ¥rd @@ -769,12 +815,13 @@ da: islet: Holm isolated_dwelling: Enlig bolig locality: Sted - moor: Hede municipality: Kommune neighbourhood: Kvarter postcode: Postnummer + quarter: Kvarter region: Region sea: Hav + square: Plads state: Stat subdivision: Bydel suburb: Forstad @@ -786,10 +833,8 @@ da: abandoned: Nedlagt jernbane construction: Jernbane under konstruktion disused: Nedlagt jernbane - disused_station: Nedlagt jernbanestation funicular: Kabelbane halt: Togstoppested - historic_station: Historisk jernbanestation junction: Jernbaneovergang level_crossing: Jernbaneoverskæring light_rail: Bybane @@ -815,6 +860,7 @@ da: beauty: Skønhedssalon beverages: Drikkevareforretning bicycle: Cykelhandel + bookmaker: Boghandler books: Boghandel boutique: Boutique butcher: Slagter @@ -853,12 +899,16 @@ da: hairdresser: Frisør hardware: Byggemarked hifi: Hi-Fi - insurance: Forsikring + houseware: Køkkenudstyr + interior_decoration: Indretning jewelry: Guldsmed kiosk: Kiosk + kitchen: Køkkenbutik laundry: Vaskeri + lottery: Lotteri mall: Indkøbscenter market: Marked + massage: Massage mobile_phone: Mobiltelefonforretning motorcycle: Motorcykelbutik music: Musikforretning @@ -866,19 +916,25 @@ da: optician: Optiker organic: Økologisk fødevarebutik outdoor: Udendørs butik + paint: Malerbutik + pawnbroker: PantelÃ¥ner pet: Dyrehandel pharmacy: Apotek photo: Fotobutik - salon: Salon + seafood: Fisk og skaldyr second_hand: Genbrugsbutik shoes: Skobutik - shopping_centre: Indkøbscenter sports: Sportsforretning stationery: Papirvarehandel supermarket: Supermarked tailor: Skrædder + ticket: Billetbutik + tobacco: Tobaksbutik toys: Legetøjsbutik travel_agency: Rejsebureau + tyres: Dækbutik + vacant: Ledig butik + variety_store: Stormagasin video: Videoforretning wine: Vinforretning "yes": Forretning @@ -904,6 +960,7 @@ da: viewpoint: Udsigtspunkt zoo: Zoologisk have tunnel: + building_passage: Byggepassage culvert: Stenkiste "yes": Tunnel waterway: @@ -935,7 +992,7 @@ da: level10: Sognegrænse description: title: - osm_nominatim: Position fra OpenStreetMap + osm_nominatim: Position fra OpenStreetMap Nominatim geonames: Position fra GeoNames types: @@ -1010,23 +1067,23 @@ da: title_html: Ophavsret og licens intro_1_html: |- OpenStreetMap® er Ã¥bne data, licenseret under Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) af OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF). 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 + under den samme licens. Den\nfulde juridiske tekst\nforklarer dine rettigheder og pligter." intro_3_html: Kartografien i vores kort-fliser, samt vores dokumentation er - licenseret under Creative + licenseret under Creative Commons Navngivelse-DelPÃ¥SammeVilkÃ¥r 2.0 (CC BY-SA). credit_title_html: Kildeangivelse og OpenStreetMap 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 kartografien - er\n licenseret som CC BY-SA. Du kan gøre dette ved at linke til\ndenne + 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 som\n data, kan du navngive og oprette et hyperlink direkte til licenserne. I medier\n hvor hyperlinks ikke er mulige (f.eks. trykte værker), foreslÃ¥r @@ -1042,9 +1099,7 @@ da: more_title_html: Læs mere more_1_html: |- Læs mere om brug af vores data, og hvordan du krediterer os, pÃ¥ OSMF Licens-siden og i fællesskabets Juridiske - FAQ. + href="https://osmfoundation.org/Licence">OSMF Licens-siden. more_2_html: |- Selvom OpenStreetMap er Ã¥bne data, kan vi ikke levere et gratis kort-API til tredjeparter. @@ -1059,10 +1114,10 @@ da: og andre kilder, blandt dem: contributors_at_html: |- Østrig: Indeholder data fra - Stadt Wien (under - CC BY), - Delstaten Vorarlberg og - Delstaten Tyrol (under CC-BY AT med tilføjelser). + Stadt Wien (under + CC BY), + Delstaten Vorarlberg og + Delstaten Tyrol (under CC-BY AT med tilføjelser). contributors_ca_html: |- Canada: Indeholder data fra GeoBase®, GeoGratis (© Department of Natural @@ -1070,14 +1125,13 @@ da: Resources Canada) og StatCan (Geography Division, Statistics Canada). contributors_fi_html: 'Finland: Indeholder data fra National - Land Survey af Finlands topografiske database og andre datasæt under NLSFI - licensen.' + Land Survey af Finlands topografiske database og andre datasæt under NLSFI-licensen.' contributors_fr_html: |- Frankrig: Indeholder data fra Direction Générale des Impôts. contributors_nl_html: |- Holland: Indeholder © AND data, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: "New Zealand: Indeholder data fra \nLand Information New Zealand. Crown Copyright reserveret." contributors_si_html: |- @@ -1095,7 +1149,7 @@ da: 2010-12. 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. + href="https://wiki.openstreetmap.org/wiki/Contributors">siden med bidragsydere pÃ¥ OpenStreetMap Wiki. contributors_footer_2_html: |- Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige dataudbyder siger god for OpenStreetMap, giver nogen garanti eller @@ -1108,12 +1162,12 @@ da: infringement_2_html: |- Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er føjet til OpenStreetMap databasen eller dette websted, bedes du følge - vores procedure til fjernelse a materiale eller udfyld formular direkte pÃ¥ vores + vores procedure til fjernelse a materiale eller udfyld formular direkte pÃ¥ vores on-line side. trademarks_title_html: Varemærker trademarks_1_html: OpenStreetMap, forstørrelsesglas-logoet og "State of the Map" er registrerede varemærker til OpenStreetMap Foundation. Hvis du har - spørgsmÃ¥l om din brug af mærkerne, bedes du sende dine spørgsmÃ¥l til Licens-arbejdsgruppen. + spørgsmÃ¥l om din brug af mærkerne, sÃ¥ se Varemærkepolitikken. welcome_page: title: Velkommen! introduction_html: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort. @@ -1148,8 +1202,8 @@ da: paragraph_1_html: "OpenStreetMap har fÃ¥ formelle regler, men vi forventer, at alle deltagere vil samarbejde\nmed, og kommunikere med fællesskabet. Hvis du overvejer\nandre aktiviteter end manuel redigering af en side, skal du - læse og følge retningslinjerne pÃ¥ \nImport - og \nAutomatiserede + læse og følge retningslinjerne pÃ¥ \nImport + og \nAutomatiserede Redigeringer." questions: title: SpørgsmÃ¥l? @@ -1184,7 +1238,7 @@ da: explanation_html: |- Hvis du har bekymringer om, hvordan vores data bruges, eller om indholdet, kan du se vores side om ophavsret for flere juridiske oplysninger, eller kontakte den relevante - OSMF arbejdsgruppe. + OSMF arbejdsgruppe. help_page: title: FÃ¥ hjælp introduction: OpenStreetMap har flere ressourcer til at lære om projektet, stille @@ -1195,7 +1249,7 @@ da: title: Velkommen til OSM description: Start med denne hurtige guide der dækker det grundlæggende i OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Da:Beginners%27_guide title: Hjælp for nybegyndere description: Hjælp for nybegyndere, som vedligeholdes af fællesskabet. help: @@ -1219,7 +1273,7 @@ da: description: Hjælp til virksomheder og organisationer, der skifter til OpenStreetMap baserede kort og andre tjenester. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Gennemse wikien for dybdegÃ¥ende OSM dokumentation. about_page: @@ -1239,8 +1293,8 @@ da: 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\nOpenStreetMap-bloggen, - \nbrugerdagbøger,\nfællesskabsblogs, - og\n OSM Foundations hjemmeside." + \nbrugerdagbøger,\nfællesskabsblogs, + og\n OSM Foundations hjemmeside." open_data_title: Åbne Data open_data_html: |- OpenStreetMap er Ã¥bne data: du mÃ¥ bruge dem til ethvert formÃ¥l, @@ -1249,12 +1303,14 @@ da: den samme licens. Se siden om ophavsret og licens for detaljer. legal_title: Juridisk legal_html: "Dette websted og mange andre relaterede tjenester er formelt drevet - af \nOpenStreetMap Foundation (OSMF) + af \nOpenStreetMap Foundation (OSMF) pÃ¥ vegne af fællesskabet. Brug af alle OSMF-drevne tjenester er underlagt vores - Politikker - for acceptabel brug og vores Privatlivs-poltik.\n
- \nDu bedes kontakte OSMF \nhvis - du har spørgsmål om licenser, ophavsret eller andre juridiske spørgsmål og problemstillinger." + Politikker + for acceptabel brug og vores Privatlivs-poltik.\n
+ \nDu bedes kontakte OSMF \nhvis + du har spørgsmål om licenser, ophavsret eller andre juridiske spørgsmål og problemstillinger.\n
\nOpenStreetMap, + forstørrelsesglas-logoet og \"State of the Map\" er varemærker + registreret af OSMF." partners_title: Partnere notifier: diary_comment_notification: @@ -1464,15 +1520,16 @@ da: dette. Du kan gøre dine ændringer offentlige fra din %{user_page}. user_page_link: brugerside anon_edits_link_text: Find ud af hvorfor. - flash_player_required: Du har brug for en Flash afspiller for at bruge Potlatch, - OpenStreetMap Flash editoren. Du kan hente - Flash Player fra Adobe.com. Flere + flash_player_required: Du har brug for en Flashafspiller for at bruge Potlatch, + OpenStreetMap Flash-redigeringsprogrammet. Du kan hent + Flash Player fra Adobe.com. Flere andre indstillinger er også tilgængelige til redigering af OpenStreetMap. potlatch_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch skal du afmarkere den nuværende vej eller nuværende punkt hvis du retter i live-tilstand, eller klikke på gem-knappen hvis du har en). potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst - http://wiki.openstreetmap.org/wiki/The_Rails_Port + https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for yderligere + information potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch 2 skal du trykke på gem-knappen). id_not_configured: iD er ikke blevet konfigureret @@ -1490,6 +1547,7 @@ da: where_am_i: Hvor er dette? where_am_i_title: Beskriv den nuværende position ved hjælp af søgemaskinen submit_text: Søg + reverse_directions_text: Vend retningen om key: table: entry: @@ -1564,7 +1622,7 @@ da: edit: Redigér preview: Forhåndsvisning markdown_help: - title_html: Parset med Markdown + title_html: Fortolket med Markdown headings: Overskrifter heading: Overskrift subheading: Underoverskrift @@ -1671,9 +1729,8 @@ da: public_traces_from: Offentlige GPS-spor fra %{user} description: Gennemse de seneste GPS track uploads tagged_with: ' med egenskaberne %{tags}' - empty_html: Der er ingenting her endnu. Upload et nyt - spor eller lær mere om GPS sporing på wiki - siden. + empty_html: Der er ingenting her endnu. Overfør et + nyt spor eller lær mere om GPS-sporing på wikisiden. delete: scheduled_for_deletion: Spor planlagt til at blive slettet make_public: @@ -1882,13 +1939,13 @@ da: html: |-

I modsætning til andre kort, er OpenStreetMap helt lavet af folk som dig, og det er frit for alle at rette, opdatere, downloade og bruge.

Tilmeld dig for at komme i gang med at bidrage. Vi vil sende en e-mail for at bekræfte din konto.

- license_agreement: Når du bekræfter din konto, skal du acceptere vilkårene - for bidragsydere. + license_agreement: Når du bekræfter din konto, skal du acceptere vilkårene + for bidragydere. email address: 'E-mailadresse:' confirm email address: 'Bekræft e-mailadresse:' - not displayed publicly: Din adresse vises ikke offentligt; se vores privatlivspolitik - for mere information + not displayed publicly: Din adresse vises ikke offentligt; se vores href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" + title="OSMF privacy policy including section on email addresses">privatlivspolitik + for yderligere information display name: 'Vist navn:' display name description: Dit offentligt synlige brugernavn. Du kan ændre dette senere i indstillingerne. @@ -2008,12 +2065,12 @@ da: email never displayed publicly: (vises aldrig offentligt) external auth: 'Ekstern godkendelse:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: hvad er dette? public editing: heading: 'Offentlig redigering:' enabled: Aktiveret. Ikke anonym og kan ændre data. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: hvad er dette? disabled: Deaktiveret og kan ikke ændre data, alle tidligere ændringer er anonyme. @@ -2023,10 +2080,10 @@ da: text: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret og lade folk kontakte dig gennem siden. Siden 0.6 API blev sat i drift - kan kun offentlige brugere rette i kortdata. (se - hvorfor).
  • Din e-mailadresse bliver ikke afsløret ved at skifte - til offentlig.
  • Den handling kan ikke omgøres, og alle nye brugere - er nu offentlige som standard.
+ kan kun offentlige brugere rette i kortdata. (se + hvorfor).
  • Din e-postadresse bliver ikke afsløret ved at skrive + offentligt.
  • Den handling kan ikke omgøres, og alle nye brugere er + nu offentlige som standard.
contributor terms: heading: 'Vilkår for bidragsydere:' agreed: Du har accepteret de nye vilkår for bidragsydere. @@ -2406,7 +2463,15 @@ da: continue_without_exit: Fortsæt ad %{name} slight_right_without_exit: Svagt til højre ind på %{name} offramp_right_without_exit: Tag afkørslen til højre ud på %{name} + offramp_right_with_directions: Tag rampen til højre retning imod %{directions} + offramp_right_with_name_and_directions: Tag rampen til højre på %{name}, retning + imod %{directions} + offramp_right_without_directions: Tag rampen til højre onramp_right_without_exit: Hold til højre ud på %{name} + onramp_right_with_directions: Drej mod højre ind på rampen, retning imod %{directions} + onramp_right_with_name_and_directions: Drej mod højre ind på rampen på %{name}, + retning imod %{directions} + onramp_right_without_directions: Drej mod højre ind på rampen endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på %{name} merge_right_without_exit: Flet til højre ind på %{name} @@ -2417,7 +2482,16 @@ da: sharp_left_without_exit: Skarpt til venstre ind på %{name} turn_left_without_exit: Drej til venstre ind på %{name} offramp_left_without_exit: Tag afkørslen til venstre ud på %{name} + offramp_left_with_directions: Tag rampen til venstre, retning imod %{directions} + offramp_left_with_name_and_directions: Tag rampen til venstre på %{name}, + retning imod %{directions} + offramp_left_without_directions: Tag rampen til venstre onramp_left_without_exit: Hold til venstre ud på %{name} + onramp_left_with_directions: Drej mod venstre ind på rampen, retning imod + %{directions} + onramp_left_with_name_and_directions: Drej mod venstre ind på rampen på %{name}, + retning imod %{directions} + onramp_left_without_directions: Drej mod venstre ind på rampen endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på %{name} merge_left_without_exit: Flet til venstre ind på %{name} @@ -2425,10 +2499,10 @@ da: slight_left_without_exit: Svagt til venstre ind på %{name} via_point_without_exit: (via punkt) follow_without_exit: Følg %{name} - roundabout_without_exit: Ved rundkørslen, tag %{name} + roundabout_without_exit: Ved rundkørslen, tag afkørsel mod %{name} leave_roundabout_without_exit: Forlad rundkørslen - %{name} stay_roundabout_without_exit: Bliv i rundkørslen - %{name} - start_without_exit: Start ved slutningen af %{name} + start_without_exit: Start på %{name} destination_without_exit: Nå målet against_oneway_without_exit: Kør mod ensretningen på %{name} end_oneway_without_exit: Slutningen af ensretningen på %{name} diff --git a/config/locales/de.yml b/config/locales/de.yml index d45b5770e..6fe3cb5b1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -19,8 +19,10 @@ # Author: Geitost # Author: GerdP # Author: Grille chompa +# Author: Hikemaniac # Author: Holger # Author: HolgerJeromin +# Author: Hufkratzer # Author: Inkowik # Author: Jacobbraeutigam # Author: John07 @@ -449,12 +451,19 @@ de: chair_lift: Sessellift drag_lift: Schlepplift gondola: Gondelbahn + platter: Skilift + pylon: Mast station: Gondelstation + t-bar: Schlepplift aeroway: aerodrome: Flugplatz + airstrip: Startbahn apron: Flugvorfeld gate: Flugsteig + hangar: Flugzeughalle helipad: Hubschrauberlandeplatz + holding_position: Haltestelle + parking_position: Parkplatz runway: Start- und Landebahn taxiway: Rollbahn terminal: Terminal @@ -489,37 +498,32 @@ de: crematorium: Krematorium dentist: Zahnarzt doctors: Arzt - dormitory: Studentenwohnheim drinking_water: Trinkwasser driving_school: Fahrschule embassy: Botschaft - emergency_phone: Notrufsäule fast_food: Schnellimbiss ferry_terminal: Fähren-Anlaufstelle - fire_hydrant: Hydrant fire_station: Feuerwehr food_court: Food-Court fountain: Springbrunnen fuel: Tankstelle gambling: Glücksspiel grave_yard: Friedhof - gym: Fitnessstudio - health_centre: Gesundheitszentrum + grit_bin: Streugutbehälter hospital: Krankenhaus hunting_stand: Hochstand ice_cream: Eisdiele kindergarten: Kindergarten library: Bücherei - market: Markt marketplace: Marktplatz monastery: Kloster motorcycle_parking: Motorradparkplatz nightclub: Nachtklub - nursery: Kindertagesstätte nursing_home: Altersheim office: Büro parking: Parkplatz parking_entrance: Parkeinfahrt + parking_space: Stellplatz pharmacy: Apotheke place_of_worship: Andachtsstätte police: Polizei @@ -529,7 +533,6 @@ de: prison: Gefängnis pub: Kneipe public_building: Öffentliches Gebäude - reception_area: Empfangsbereich recycling: Recycling-Center restaurant: Restaurant retirement_home: Altersheim @@ -554,6 +557,7 @@ de: village_hall: Gemeindezentrum waste_basket: Mülleimer waste_disposal: Abfallentsorgung + water_point: Wasseranschluss youth_centre: Jugendzentrum boundary: administrative: Verwaltungsgrenze @@ -562,6 +566,7 @@ de: protected_area: Schutzgebiet bridge: aqueduct: Aquädukt + boardwalk: Strandpromenade suspension: Hängebrücke swing: Drehbrücke viaduct: Viadukt @@ -581,25 +586,31 @@ de: "yes": Handwerksgeschäft emergency: ambulance_station: Rettungswache + assembly_point: Sammelplatz defibrillator: Defibrillator landing_site: Notlandeplatz phone: Notrufsäule + water_tank: Notwasserbehälter + "yes": Notfall highway: abandoned: Aufgegebene Straße bridleway: Reitweg bus_guideway: Busspur bus_stop: Bushaltestelle construction: Straße im Bau + corridor: Flur cycleway: Radweg elevator: Lift emergency_access_point: Notrufpunkt footway: Fußweg ford: Furt + give_way: Vorfahrt-beachten-Schild living_street: Spiel-/Wohnstraße milestone: Kilometerstein motorway: Autobahn motorway_junction: Autobahnausfahrt/-kreuz motorway_link: Autobahnauffahrt + passing_place: Ausweichstelle path: Pfad (Wanderweg) pedestrian: Fußgängerzone platform: Bahnsteig @@ -616,6 +627,7 @@ de: services: Autobahnraststätte speed_camera: Blitzer steps: Treppe + stop: Stoppschild street_lamp: Straßenlaterne tertiary: Hauptstraße tertiary_link: Hauptstraße-Auffahrt @@ -624,12 +636,12 @@ de: trail: Pfad trunk: Schnellstraße trunk_link: Schnellstraßenauffahrt + turning_loop: Wendeschleife unclassified: Straße - unsurfaced: Nichtasphaltierte Straße "yes": Straße historic: archaeological_site: Ausgrabungsstätte - battlefield: Kampfgebiet + battlefield: Schlachtfeld boundary_stone: Grenzstein building: Historisches Gebäude bunker: Bunker @@ -644,6 +656,7 @@ de: manor: Gutshaus memorial: Denkmal mine: Mine + mine_shaft: Grubenschacht monument: Monument roman_road: Römerstraße ruins: Ruine @@ -653,6 +666,7 @@ de: wayside_cross: Wegkreuz wayside_shrine: Bildstock wreck: Schiffswrack + "yes": Historischer Ort junction: "yes": Kreuzung landuse: @@ -690,9 +704,9 @@ de: leisure: beach_resort: Strandbad bird_hide: Vogelbeobachtungshütte - club: Verein common: öffentliche Grünfläche (brit.) dog_park: Hundepark + firepit: Feuerstelle fishing: Fischereigrund fitness_centre: Fitnessstudio fitness_station: Freiluft-Fitnesseinrichtung @@ -704,7 +718,7 @@ de: miniature_golf: Minigolf nature_reserve: Naturschutzgebiet park: Park - pitch: Sportplatz + pitch: Spielfeld playground: Spielplatz recreation_ground: Erholungsgebiet resort: Ferienort @@ -717,15 +731,46 @@ de: water_park: Wasserpark "yes": Freizeit man_made: + adit: Stollen + beacon: Leuchtturm + beehive: Bienenstock + breakwater: Hafendamm + bridge: Brücke + bunker_silo: Bunker + chimney: Schornstein + crane: Kran + dolphin: Dalben + dyke: Deich + embankment: Böschung + flagpole: Fahnenmast + gasometer: Gasometer + groyne: Buhne + kiln: Brennofen lighthouse: Leuchtturm + mast: Mast + mine: Bergwerk + mineshaft: Grubenschacht + monitoring_station: Beobachtungsstation + petroleum_well: Erdölquelle + pier: Pfeiler pipeline: Rohrleitung + silo: Speicher + storage_tank: Lagertank + surveillance: Überwachung tower: Turm + wastewater_plant: Kläranlage + watermill: Wassermühle + water_tower: Wasserturm + water_well: Brunnen + water_works: Wasserwerk + windmill: Windmühle works: Fabrik "yes": menschgemacht military: airfield: Militärflugplatz barracks: Kaserne bunker: Bunker + "yes": Militär mountain_pass: "yes": Gebirgspass natural: @@ -771,11 +816,14 @@ de: accountant: Buchhaltungsbüro administrative: Verwaltung architect: Architekt + association: Gesellschaft company: Unternehmen + educational_institution: Bildungseinrichtung employment_agency: Arbeitsamt estate_agent: Immobilienhändler government: Amt insurance: Versicherungsbüro + it: IT-Büro lawyer: Rechtsanwalt ngo: NGO telecommunication: Telekommunikationsbüro @@ -783,9 +831,8 @@ de: "yes": Büro place: allotments: Schrebergärten - block: Block - airport: Flughafen city: Stadt + city_block: Häuserblock country: Staat county: Bezirk farm: Bauernhof @@ -796,12 +843,13 @@ de: islet: Eiland isolated_dwelling: Einzelgehöft locality: Flur - moor: Moor municipality: Gemeinde neighbourhood: Wohngegend postcode: Postleitzahl + quarter: Stadtviertel region: Region sea: Meer + square: Platz state: Bundesland/-staat subdivision: Vorort suburb: Stadtteil @@ -813,10 +861,8 @@ de: abandoned: Aufgegebene Bahnstrecke construction: Bahnstrecke im Bau disused: Aufgelassene Bahnstrecke - disused_station: Aufgelassener Bahnhof funicular: Standseilbahn halt: Haltestelle - historic_station: Historischer Bahnhof junction: Bahnknoten level_crossing: Eisenbahnkreuzung light_rail: Stadtbahn @@ -842,6 +888,7 @@ de: beauty: Schönheitssalon beverages: Getränkemarkt bicycle: Fahrradgeschäft + bookmaker: Buchmacher books: Buchgeschäft boutique: Boutique butcher: Metzgerei @@ -880,12 +927,16 @@ de: hairdresser: Frisör hardware: Eisenwarenhändler hifi: Elektroshop - insurance: Versicherungsbüro + houseware: Hauswarenladen + interior_decoration: Innenausstattung jewelry: Juwelier kiosk: Kiosk + kitchen: Küchengeschäft laundry: Wäscherei + lottery: Lottoannahmestelle mall: Einkaufszentrum market: Markt + massage: Masseur mobile_phone: Handygeschäft motorcycle: Motorradgeschäft music: Musikladen @@ -893,19 +944,25 @@ de: optician: Optiker organic: Bio-Laden outdoor: Outdoor-Ausrüster + paint: Lackiererei + pawnbroker: Pfandleiher pet: Tierhandlung pharmacy: Apotheke photo: Fotoladen - salon: Salon + seafood: Meeresfrüchte second_hand: Second-Hand-Geschäft shoes: Schuhgeschäft - shopping_centre: Einkaufszentrum sports: Sportgeschäft stationery: Schreibwarenladen supermarket: Supermarkt tailor: Schneiderei + ticket: Ticketladen + tobacco: Tabakladen toys: Spielwarengeschäft travel_agency: Reisebüro + tyres: Reifenhändler + vacant: Leerstehendes Geschäft + variety_store: Billigladen video: Videothek wine: Vinothek "yes": Geschäft @@ -931,6 +988,7 @@ de: viewpoint: Aussichtspunkt zoo: Zoo tunnel: + building_passage: Gebäudedurchgang culvert: Durchlass "yes": Tunnel waterway: @@ -1141,7 +1199,7 @@ de: trademarks_title_html: Markenzeichen trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen über - deine Verwendung der Marken hast, sende deine Fragen bitte an die Lizenz-Arbeitsgruppe. + deine Verwendung der Marken hast, lies bitte unsere Markenrichtlinie. welcome_page: title: Willkommen! introduction_html: |- @@ -1265,7 +1323,7 @@ de: OpenStreetMap legt Wert auf lokales Wissen. Autoren benutzen Luftbilder, GPS-Geräte und Feldkarten zur Verifizierung, sodass OSM korrekt und aktuell ist. - community_driven_title: Community Driven + community_driven_title: Gemeinschaftsbetrieben community_driven_html: |- Die OpenStreetMap-Gemeinschaft ist vielfältig, leidenschaftlich und wächst täglich. Unsere Mitwirkenden sind begeisterte Mapper, GIS-Profis, Ingenieure, die die OSM-Server @@ -1284,7 +1342,7 @@ de: Urheberrechts- und Lizenzseite für Einzelheiten. legal_title: Rechtliche Hinweise legal_html: |- - Diese Website und viele damit in Zusammenhang stehende Dienste werden + Diese Website und viele damit in Zusammenhang stehenden Dienste werden von der OpenStreetMap Foundation (OSMF) für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste ist Thema unserer @@ -1292,7 +1350,9 @@ de: und unserer Datenschutzrichtlinie.
Bitte kontaktiere die OSMF, - falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast. + falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen hast. +
+ OpenStreetMap, das Lupenlogo und „State of the Map“ sind eingetragene Warenzeichen der OSMF. partners_title: Partner notifier: diary_comment_notification: @@ -1538,6 +1598,7 @@ de: where_am_i: Wo ist das? where_am_i_title: Die momentane Position mit der Suchmaschine anzeigen submit_text: Los + reverse_directions_text: Richtungen umkehren key: table: entry: @@ -2481,7 +2542,17 @@ de: continue_without_exit: Weiter auf %{name} slight_right_without_exit: Leicht rechts auf %{name} offramp_right_without_exit: Die rechte Auffahrt auf %{name} nehmen + offramp_right_with_directions: Die rechte Auffahrt Richtung %{directions} + nehmen + offramp_right_with_name_and_directions: Die rechte Auffahrt auf %{name} Richtung + %{directions} nehmen + offramp_right_without_directions: Die rechte Auffahrt nehmen onramp_right_without_exit: Bei der Auffahrt rechts abbiegen auf %{name} + onramp_right_with_directions: Rechts auf die Auffahrt Richtung %{directions} + abbiegen + onramp_right_with_name_and_directions: Rechts auf die Auffahrt auf %{name} + Richtung %{directions} abbiegen + onramp_right_without_directions: Rechts auf die Auffahrt abbiegen endofroad_right_without_exit: Am Straßenende rechts abbiegen auf %{name} merge_right_without_exit: Rechts einfädeln in %{name} fork_right_without_exit: Bei der Gabelung rechts abbiegen auf %{name} @@ -2491,17 +2562,26 @@ de: sharp_left_without_exit: Scharf links auf %{name} turn_left_without_exit: Links abbiegen auf %{name} offramp_left_without_exit: Die linke Auffahrt auf %{name} nehmen + offramp_left_with_directions: Die linke Auffahrt Richtung %{directions} nehmen + offramp_left_with_name_and_directions: Die linke Auffahrt auf %{name} Richtung + %{directions} nehmen + offramp_left_without_directions: Die linke Auffahrt nehmen onramp_left_without_exit: Bei der Auffahrt links abbiegen auf %{name} + onramp_left_with_directions: Links auf die Auffahrt Richtung %{directions} + abbiegen + onramp_left_with_name_and_directions: Links auf die Auffahrt auf %{name} Richtung + %{directions} abbiegen + onramp_left_without_directions: Links auf die Auffahrt abbiegen endofroad_left_without_exit: Am Straßenende links abbiegen auf %{name} merge_left_without_exit: Links einfädeln in %{name} fork_left_without_exit: Bei der Gabelung links abbiegen auf %{name} slight_left_without_exit: Leicht links auf %{name} via_point_without_exit: (über Punkt) follow_without_exit: '%{name} folgen' - roundabout_without_exit: Im Kreisverkehr nimm %{name} + roundabout_without_exit: Im Kreisverkehr Ausfahrt auf %{name} nehmen leave_roundabout_without_exit: Kreisverkehr verlassen – %{name} stay_roundabout_without_exit: Auf Kreisverkehr bleiben – %{name} - start_without_exit: Starten beim Ende von %{name} + start_without_exit: Starten bei %{name} destination_without_exit: Ziel erreicht against_oneway_without_exit: Gegen die Einbahnstraße gehen auf %{name} end_oneway_without_exit: Ende der Einbahnstraße auf %{name} diff --git a/config/locales/diq.yml b/config/locales/diq.yml index 9059083e2..8ed4ffe78 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -207,7 +207,7 @@ diq: title_nearby: Nezdıra vurriyayışê setê karberi load_more: Dehana vêşi rss: - full: Vaten pêro + full: Heme werênayış diary_entry: new: publish_button: Vıla ke @@ -242,7 +242,7 @@ diq: newer_comments: Tewr Vatışê Newey older_comments: Vatışo Tewr Kehan export: - title: Teber de + title: Teberdayış start: area_to_export: Cayo ke cıra bıvciyo manually_select: Be desti ra yew cayo bin weçıne @@ -269,7 +269,7 @@ diq: latitude: 'Verıniye:' longitude: 'Derganiye:' output: Vıcyaen - export_button: Teber de + export_button: Teberdayış geocoder: search: title: @@ -324,33 +324,26 @@ diq: crematorium: Krematoryum dentist: Dındandar doctors: Dıxtori - dormitory: Ware drinking_water: Awa Şımıtışi driving_school: Kursa Ramenan embassy: Sefirey - emergency_phone: Vistren Telefon fast_food: Fast Food ferry_terminal: Terminala Feriboter - fire_hydrant: Mıslıxa Şewati fire_station: Itfaiye food_court: Kerwanseray fountain: Fıskiye fuel: Petrol gambling: Kumarxane grave_yard: Mezla ser - gym: Merkeza Fitnessi / Salona Spori - health_centre: Merkeza Weşiney hospital: Nêweşxane hunting_stand: Standê Seydwanan ice_cream: Dondırme kindergarten: Kreş library: Kıtıbxane - market: Market marketplace: Heruna bazari monastery: Manastır motorcycle_parking: Motorpiskilet park kerdış nightclub: Kluba Şewer - nursery: Kreş nursing_home: Rehatxane office: Ofis parking: Otopark @@ -364,7 +357,6 @@ diq: prison: Hepısxane pub: Biraxane public_building: Binaya Şaran - reception_area: Heruna Resepsiyoni recycling: Heruna peyd amayışi restaurant: Restaurant retirement_home: Weynexane @@ -460,7 +452,6 @@ diq: trunk: Letebıyayi ser ray trunk_link: Lwtebıyayi ser ray unclassified: Nêrêzbıyayi ray - unsurfaced: Raya xam "yes": Ray historic: archaeological_site: Arkeolojik Ca @@ -523,7 +514,6 @@ diq: leisure: beach_resort: Dewa plajın bird_hide: Cay mıriçık weynayışi - club: Klüb common: Umumi erd dog_park: Parka kutıkan fishing: Heruna masan @@ -616,8 +606,6 @@ diq: "yes": Ofis place: allotments: Bostan - block: Blok - airport: Meydanê hewayi city: Suk country: Dewlete county: Welat @@ -628,7 +616,6 @@ diq: island: Ada islet: Adeqeq locality: Wereyin - moor: Lıncane municipality: Belediya neighbourhood: Mehla postcode: Kodê posteyi @@ -675,7 +662,7 @@ diq: gallery: Galeri garden_centre: Merkeza Hêgay gift: Çiyo Hediye - salon: Kuafor + "yes": Dukan tourism: gallery: Galeriye hostel: Hostel @@ -688,6 +675,7 @@ diq: canal: Kenal dam: Berac lock: Ä°skele + river: Ro description: types: cities: Suki @@ -699,7 +687,7 @@ diq: sign_up: qeyd be edit: Bıvırne history: Tarix - export: Tebergroten + export: Teberdayış data: Melumati help: Peşti copyright: Heqa telıfi @@ -1111,6 +1099,8 @@ diq: notes: show: comment: Mışewre + directions: + time: Zeman redaction: edit: description: Şınasnayış diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 1a605354d..a3eb231af 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -413,30 +413,23 @@ dsb: crematorium: Krematorium dentist: Zubny gójc doctors: Gójce - dormitory: Internat drinking_water: Pitna wóda driving_school: Jězdna Å¡ula embassy: Wjelikopósłaństwo - emergency_phone: Telefon za nuzowe zawołanje fast_food: Pójědankarnja ferry_terminal: Pśewózny pśistaw - fire_hydrant: Hydrant fire_station: Wognjarnja food_court: Food Court fountain: Studnja fuel: Tankownja grave_yard: Kjarchob - gym: Fitnesowy centrum - health_centre: Strowotniski centrum hospital: Chórownja hunting_stand: Góntwarske sedło ice_cream: Lod kindergarten: Źiśownja library: Knigłownja - market: Wiki marketplace: Wikowanišćo nightclub: Nocny klub - nursery: Źiśownja nursing_home: Wótwardowarnja office: Běrow parking: Parkowanišćo @@ -449,7 +442,6 @@ dsb: prison: Popajźeństwo pub: Kjarcma public_building: Zjawne twarjenje - reception_area: Wobcerk pśidostaśa recycling: Zběranišćo starowinow restaurant: Gósćeńc retirement_home: Starcownja @@ -527,7 +519,6 @@ dsb: trunk: Dalokowobchadowa droga trunk_link: Dalokowobchadowa droga unclassified: Njezarědowana droga - unsurfaced: Njewobtwarźona droga historic: archaeological_site: Archeologiske wukopowanišćo battlefield: Bitwišćo @@ -659,7 +650,6 @@ dsb: travel_agent: Drogowański běrow "yes": Běrow place: - airport: Lětanišćo city: Wjelike město country: Kraj county: Wokrejs @@ -671,7 +661,6 @@ dsb: islet: Mała kupa isolated_dwelling: Jadnotliwe bydło locality: Sedlišćo - moor: Bagno municipality: Gmejna neighbourhood: Bydleński wobcerk postcode: Postowa licba @@ -687,10 +676,8 @@ dsb: abandoned: Spušćona zeleznicowa cera construction: Zeleznicowa cera se twari disused: Njewužywana zeleznicowa cera - disused_station: Njewužywane dwórnišćo funicular: Powrjozowa zeleznica halt: Zeleznicowe zastanišćo - historic_station: Historiske dwórnišćo junction: Zeleznicowe kśicnišćo level_crossing: Zeleznicowy pśechod light_rail: Měsćańska zeleznica @@ -754,7 +741,6 @@ dsb: hairdresser: Frizerski salon hardware: Twarski mark hifi: Technika hi-fi - insurance: Zawěsćarnja jewelry: PyÅ¡notkowy wobchod kiosk: Kiosk laundry: Pałkarnja @@ -770,10 +756,8 @@ dsb: pet: Coologiska pśedawarnja pharmacy: Aptejka photo: Fotograf - salon: Salon second_hand: Nakupowarnja shoes: Wobchod za crjeje - shopping_centre: Kupowański centrum sports: Sportowy wobchod stationery: Pśedawarnja za pisańskich wórow supermarket: Supermark diff --git a/config/locales/el.yml b/config/locales/el.yml index dde07f96f..7f8a768eb 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -22,6 +22,7 @@ # Author: SkarmoutsosV # Author: Stam.nikos # Author: SucreRouge +# Author: Tgkarounos # Author: Zserdx # Author: Ανώνυμος Βικιπαιδιστής # Author: 아라 @@ -159,6 +160,8 @@ el: title_comment: Ομάδα αλλαγών %{id} - %{comment} join_discussion: Συνδεθείτε για να μπείτε στη συζήτηση discussion: Συζήτηση + still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει + μόλις ολοκληρωθεί η ομάδα αλλαγών. node: title: 'Κόμβος: %{name}' history_title: 'Ιστορικό κόμβου: %{name}' @@ -377,7 +380,7 @@ el: embeddable_html: Ενσωματούμενη HTML licence: Άδεια export_details: Τα δεδομένα του OpenStreetMap είναι αδειοδοτημένα υπό την Open Data Commons Open + href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License (ODbL). too_large: advice: 'Αν η εξαγωγή αποτυγχάνει, παρακαλώ δοκιμάστε μία από τις πηγές που @@ -418,15 +421,15 @@ el: geocoder: search: title: - latlon: Αποτελέσματα από την εσωτερική + latlon: Αποτελέσματα από την εσωτερική βάση δεδομένων uk_postcode: Αποτελέσματα από NPEMap / FreeThe Postcode - ca_postcode: Αποτελέσματα από Geocoder.CA - osm_nominatim: Αποτελέσματα από το OpenStreetMap + ca_postcode: Αποτελέσματα από Geocoder.CA + osm_nominatim: Αποτελέσματα από το OpenStreetMap Nominatim geonames: Αποτελέσματα από το GeoNames - osm_nominatim_reverse: Αποτελέσματα από το OpenStreetMap + osm_nominatim_reverse: Αποτελέσματα από το OpenStreetMap Nominatim geonames_reverse: Αποτελέσματα από το GeoNames search_osm_nominatim: @@ -437,12 +440,19 @@ el: chair_lift: Αναβατήρας με κάθισμα drag_lift: Συρόμενος αναβατήρας gondola: Τελεφερίκ-Γόνδολα + platter: Πιατέλα ανύψωσης + pylon: Πυλώνας station: Σταθμός εναέριου δρόμου + t-bar: T-Bar Ασανσέρ aeroway: aerodrome: Αεροδρόμιο + airstrip: Διάδρομος προσγειώσεως apron: Χώρος ελιγμών gate: Πύλη + hangar: Υπόστεγο για αεροπλάνα helipad: Ελικοδρόμιο + holding_position: κράτηση θέσης + parking_position: Θέση στάθμευσης runway: Διάδρομος taxiway: Τροχιόδρομος terminal: Τερματικός σταθμός @@ -477,37 +487,32 @@ el: crematorium: Κρεματόριο dentist: Οδοντίατρος doctors: Ιατροί - dormitory: Κοιτώνας drinking_water: Πόσιμο νερό driving_school: Σχολή οδηγών embassy: Πρεσβεία - emergency_phone: Τηλέφωνο έκτακτης ανάγκης fast_food: Ταχυφαγείο ferry_terminal: Σταθμός πορθμείων - fire_hydrant: Κρουνός πυροσβεστικής fire_station: Πυροσβεστικός σταθμός food_court: Προαύλιο φαγητού fountain: Συντριβάνι fuel: Καύσιμα gambling: Τυχερά παιχνίδια grave_yard: Νεκροταφείο - gym: Γυμναστήριο - health_centre: Κέντρο υγείας + grit_bin: Κάδος Χαλικιού hospital: Νοσοκομείο hunting_stand: Κυνηγητικό κιόσκι ice_cream: Παγωτό kindergarten: Νηπιαγωγείο library: Βιβλιοθήκη - market: Αγορά marketplace: Αγορά monastery: Μοναστήρι motorcycle_parking: Χώρος στάθμευσης μοτοσικλετών nightclub: Νυχτερινό κέντρο - nursery: Παιδικός σταθμός nursing_home: Οίκος ευγηρίας office: Γραφείο parking: Χώρος στάθμευσης parking_entrance: Είσοδος χώρου στάθμευσης + parking_space: Χώρος στάθμευσης pharmacy: Φαρμακείο place_of_worship: Τόπος λατρείας police: Αστυνομία @@ -517,7 +522,6 @@ el: prison: Φυλακή pub: Παμπ public_building: Δημόσιο κτίριο - reception_area: Χώρος υποδοχής recycling: Σημείο ανακύκλωσης restaurant: Εστιατόριο retirement_home: Γηροκομείο @@ -542,6 +546,7 @@ el: village_hall: Αίθουσα χωριού waste_basket: Καλάθι απορριμμάτων waste_disposal: Διάθεση αποβλήτων + water_point: Σημείο ανεφοδιασμού νερού youth_centre: Κέντρο νεολαίας boundary: administrative: Διοικητικό όριο @@ -550,6 +555,7 @@ el: protected_area: Προστατευόμενη περιοχή bridge: aqueduct: Υδραγωγείο + boardwalk: πεζοδρόμιο suspension: Κρεμαστή Γέφυρα swing: Αιωρούμενη Γέφυρα viaduct: Κοιλαδογέφυρα @@ -569,25 +575,31 @@ el: "yes": Κατάστημα τεχνών emergency: ambulance_station: Σταθμός ασθενοφόρων + assembly_point: σημείο συγκέντρωσης defibrillator: Απινιδωτής landing_site: Τοποθεσία έκτακτης προσγείωσης phone: Τηλέφωνο έκτακτης ανάγκης + water_tank: Δεξαμενή νερού έκτακτης ανάγκης + "yes": επείγον περιστατικό highway: abandoned: Εγκαταλελειμμένος αυτοκινητόδρομος bridleway: Μονοπάτι για άλογα bus_guideway: Καθορισμένη λωρίδα λεωφορείου bus_stop: Στάση λεωφορείου construction: Δρόμος υπό κατασκευή + corridor: Διάδρομος cycleway: Ποδηλατόδρομος elevator: Ανελκυστήρας emergency_access_point: Σημείο πρόσβασης έκτακτης ανάγκης footway: Μονοπάτι ford: Κοιτόστρωση + give_way: Δώστε το σήμα living_street: Μεικτός δρόμος milestone: Ορόσημο motorway: Αυτοκινητόδρομος motorway_junction: Διασταύρωση αυτοκινητόδρομου motorway_link: Αυτοκινητόδρομος + passing_place: Πέρασμα path: Διαδρομή pedestrian: Πεζόδρομος platform: Πλατφόρμα @@ -604,6 +616,7 @@ el: services: Υπηρεσίες αυτοκινητοδρόμου speed_camera: Κάμερα ταχύτητας steps: Σκαλοπάτια + stop: Σήμα στάσης street_lamp: Λάμπα δρόμου tertiary: Τριτεύων δρόμος tertiary_link: Τριτεύων δρόμος @@ -612,8 +625,8 @@ el: trail: Μονοπάτι trunk: Εθνική οδός trunk_link: Εθνική οδός + turning_loop: Κυκλικός Κόμβος unclassified: Αταξινόμητη οδός - unsurfaced: Δρόμος χωρίς επίστρωση "yes": Δρόμος historic: archaeological_site: Αρχαιολογικός χώρος @@ -632,6 +645,7 @@ el: manor: Έπαυλη memorial: Μνημείο mine: Ορυχείο + mine_shaft: Φρεάτιο ορυχείου monument: Μνημείο roman_road: Ρωμαϊκός δρόμος ruins: Ερείπιο @@ -641,6 +655,7 @@ el: wayside_cross: Σταυρός στην άκρη του δρόμου wayside_shrine: Εικονοστάσιο στην άκρη του δρόμου wreck: Ναυάγιο + "yes": Ιστορικός Χώρος junction: "yes": Διασταύρωση landuse: @@ -678,9 +693,9 @@ el: leisure: beach_resort: Παραθαλάσσιο θέρετρο bird_hide: Καταφύγιο πουλιών - club: Κλαμπ common: Κοινόχρηστη γη dog_park: Πάρκο σκύλων + firepit: Λάκκος Φωτιάς fishing: Αλιευτική περιοχή fitness_centre: Κέντρο αδυνατίσματος fitness_station: Γυμναστήριο @@ -705,15 +720,46 @@ el: water_park: Υδάτινο πάρκο "yes": Ψυχαγωγία man_made: + adit: Οριζόντια είσοδος σε ορυχείο + beacon: φάρος + beehive: Κυψέλη + breakwater: Κυματοθραύστης + bridge: Γέφυρα + bunker_silo: Οχυρό + chimney: Καμινάδα + crane: Γερανός + dolphin: Δέστρα + dyke: Ανάχωμα + embankment: Ανάχωμα + flagpole: Ιστός σημαίας + gasometer: Αεριόμετρο + groyne: Φράγμα + kiln: Καμίνι lighthouse: Φάρος + mast: Κατάρτι + mine: Ορυχείο + mineshaft: Φρεάτιο ορυχείου + monitoring_station: Σταθμός παρακολούθησης + petroleum_well: Γεώτρηση Πετρελαίου + pier: Αποβάθρα pipeline: Αγωγός + silo: Σιλό + storage_tank: Δεξαμενή αποθήκευσης + surveillance: Επιτήρηση tower: Πύργος + wastewater_plant: Μονάδα επεξεργασίας λυμάτων + watermill: Νερόμυλος + water_tower: Πύργος νερού + water_well: Πηγάδι + water_works: Έργα Υδάτων + windmill: Αερόμυλος works: Εργοστάσιο "yes": Τεχνητό military: airfield: Στρατιωτικό αεροδρόμιο barracks: Στρατώνας bunker: Οχυρό + "yes": Στρατός mountain_pass: "yes": Ορεινό πέρασμα natural: @@ -759,11 +805,14 @@ el: accountant: Λογιστής administrative: Διαχείριση architect: Αρχιτέκτονας + association: Σύλλογος company: Εταιρεία + educational_institution: Εκπαιδευτικό ίδρυμα employment_agency: Οργανισμός απασχόλησης estate_agent: Κτηματομεσιτικό γραφείο government: Κυβερνητικό γραφείο insurance: Ασφαλιστικό γραφείο + it: Γραφείο πληροφορικής lawyer: Δικηγόρος ngo: Γραφείο ΜΚΟ telecommunication: Γραφείο τηλεπικοινωνιών @@ -771,9 +820,8 @@ el: "yes": Γραφείο place: allotments: Λαχανόκηποι - block: Φραγή - airport: Αεροδρόμιο city: Πόλη + city_block: Οικοδομικό τετράγωνο πόλης country: Χώρα county: Κομητεία farm: Αγρόκτημα @@ -784,12 +832,13 @@ el: islet: Νησίδα isolated_dwelling: Απομονωμένη κατοικία locality: Τοποθεσία - moor: Δέστρα municipality: Δήμος neighbourhood: Γειτονιά postcode: Ταχυδρομικός κώδικας + quarter: Συνοικία region: Περιοχή sea: Θάλασσα + square: Πλατεία state: Πολιτεία subdivision: Υποδιαίρεση suburb: Προάστιο @@ -801,10 +850,8 @@ el: abandoned: Εγκαταλελειμμένος σιδηρόδρομος construction: Σιδηρόδρομος υπό κατασκευή disused: Σιδηρόδρομος εκτός χρήσης - disused_station: Σιδηροδρομικός σταθμός εκτός χρήσης funicular: Τελεφερίκ σε ράγες halt: Σταθμός τραίνου - historic_station: Ιστορικός σιδηροδρομικός σταθμός junction: Σιδηροδρομικός κόμβος level_crossing: Ισόπεδη διάβαση light_rail: Ελαφρύ τρένο @@ -830,6 +877,7 @@ el: beauty: Σαλόνι ομορφιάς beverages: Κατάστημα ποτών bicycle: Κατάστημα ποδηλάτων + bookmaker: Σελιδοδείκτης books: Βιβλιοπωλείο boutique: Μπουτίκ butcher: Κρεοπωλείο @@ -868,12 +916,16 @@ el: hairdresser: Κομμωτήριο hardware: Κατάστημα με χρώματα-σιδηρικά hifi: Hi-Fi - insurance: Ασφαλιστική + houseware: Μαγαζί με οικιακά είδη + interior_decoration: Διακόσμηση εσωτερικού χώρου jewelry: Κοσμηματοπωλείο kiosk: Περίπτερο + kitchen: Μαγαζί κουζινών laundry: Πλυντήριο + lottery: Λοταρία mall: Εμπορικό κέντρο market: Αγορά + massage: Μασάζ mobile_phone: Κατάστημα κινητής τηλεφωνίας motorcycle: Κατάστημα μοτοσικλετών music: Κατάστημα μουσικής @@ -881,19 +933,25 @@ el: optician: Οπτικός organic: Κατάστημα οργανικών τροφίμων outdoor: Υπαίθριο κατάστημα + paint: Μαγαζί ειδών βαφής + pawnbroker: Ενεχυροδανειστής pet: Κατάστημα κατοικίδιων pharmacy: Φαρμακείο photo: Φωτογραφείο - salon: Σαλόνι + seafood: Θαλασσινό φαγητό second_hand: Κατάστημα μεταχειρισμένων shoes: Κατάστημα υποδημάτων - shopping_centre: Εμπορικό κέντρο sports: Κατάστημα αθλητικών stationery: Κατάστημα χαρτικών/ειδών γραφείου supermarket: Σουπερμάρκετ tailor: Ράφτης + ticket: Μαγαζί εισιτηρίων + tobacco: Μαγαζί προϊόντων καπνού toys: Κατάστημα παιχνιδιών travel_agency: Ταξιδιωτικό πρακτορείο + tyres: Κατάστημα ελαστικών + vacant: Κενό κατάστημα + variety_store: Κατάστημα ποικιλιών video: Κατάστημα βίντεο wine: Ψιλικατζίδικο "yes": Κατάστημα @@ -950,7 +1008,7 @@ el: level10: Σύνορο προαστίου description: title: - osm_nominatim: Τοποθεσία από το OpenStreetMap + osm_nominatim: Τοποθεσία από το OpenStreetMap Nominatim geonames: Τοποθεσία από το GeoNames types: @@ -1028,23 +1086,23 @@ el: legal_babble: title_html: Πνευματικά δικαιώματα και άδεια χρήσης intro_1_html: |- - Το OpenStreetMap® είναι βάση ανοικτών δεδομένων αδειοδοτημένα υπό την Open Data Commons Open Database License (ODbL) από το Ίδρυμα OpenStreetMap (OSMF). + Το OpenStreetMap® είναι βάση ανοικτών δεδομένων αδειοδοτημένα υπό την Open Data Commons Open Database License (ODbL) από το Ίδρυμα OpenStreetMap (OSMF). intro_2_html: Είστε ελεύθεροι να αντιγράψετε, να διανείμετε, μεταδώσετε και προσαρμόσετε τα δεδομένα μας εφόσον κάνετε αναφορά στο OpenStreetMap και στους συνεισφέροντές του. Εάν τροποποιήσετε ή αξιοποιήσετε τα δεδομένα μας, μπορείτε - να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης νομικός + να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης νομικός κώδικας εξηγεί τα δικαιώματα και τις υποχρεώσεις. intro_3_html: |- - Η χαρτογράφηση στα πλακίδια χάρτη, και η τεκμηρίωση μας, είναι αδειοδοτημένες υπο την άδεια Creative - Commons Attribution-ShareAlike 2.0 (CC-BY-SA). + Η χαρτογράφηση στα πλακίδια χάρτη, και η τεκμηρίωση μας, είναι αδειοδοτημένες υπο την άδεια Creative + Commons Attribution-ShareAlike 2.0 (CC BY-SA). credit_title_html: Πως να κάνετε αναφορά στο OpenStreetMap credit_1_html: |- Απαιτείται να χρησιμοποιείτε την αναφορά στο “© Συνεισφέροντες του OpenStreetMap”. credit_2_html: |- Επίσης πρέπει να κάνετε σαφές ότι τα δεδομένα διατίθενται υπό την άδεια Open - Database License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε αυτήν τη σελίδα δικαιωμάτων. + Database License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε αυτήν τη σελίδα δικαιωμάτων. Εναλλακτικά, και σαν προαπαιτούμενο εάν διαμοιράζετε δεδομένα OSM, μπορείτε να δώσετε απευθείας σύνδεσμο προς τις άδειες. Σε μέσα στα οποία οι σύνδεσμοι δεν είναι εφικτοί (π.χ. εκτυπώσεις), προτείνουμε να κατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας το «OpenStreetMap» σε αυτήν τη πλήρη διεύθυνση), προς opendatacommons.org, και αναλόγως στο creativecommons.org. credit_3_html: |- Για έναν ηλεκτρονικά εμφανιζόμενο χάρτη, η αναφορά θα πρέπει να εμφανίζεται στη γωνία του χάρτη. @@ -1055,7 +1113,7 @@ el: more_title_html: Μαθαίνοντας περισσότερα more_1_html: |- Διαβάστε περισσότερα σχετικά με τη χρήση των δεδομένων μας, και πώς να μας μνημονεύσετε στην - σελίδα Άδειας OSMF. + σελίδα Άδειας OSMF. more_2_html: |- Παρόλο που το OpenStreetMap αποτελείται από ανοικτά δεδομένα, δεν μπορούμε να προσφέρουμε ένα δωρεάν API χαρτών για τρίτους προγραμματιστές. @@ -1068,9 +1126,9 @@ el: και άλλες πηγές, μεταξύ αυτών:' contributors_at_html: |- Αυστρία: Περιέχει δεδομένα από τα - Stadt Wien (υπό CC BY), - Land Vorarlberg και - Land Tirol (υπό CC BY AT με τροποποιήσεις). + Stadt Wien (υπό CC BY), + Land Vorarlberg και + Land Tirol (υπό CC BY AT με τροποποιήσεις). contributors_ca_html: |- Καναδάς: Περιέχει δεδομένα από τα GeoBase®, GeoGratis (© Τμήμα Φυσικών @@ -1079,12 +1137,12 @@ el: Στατιστική Υπηρεσία Καναδά). contributors_fi_html: "Φινλανδία: Περιέχει δεδομένα από το National Land Survey of Finland's Topographic Database\nκαι άλλα datasets, - υπό την \nNLSFI + υπό την \nNLSFI Άδεια." contributors_fr_html: 'Γαλλία: Περιέχει δεδομένα που προέρχονται από το Direction Générale des Impôts.' contributors_nl_html: 'Ολλανδία: Περιέχει δεδομένα που προέρχονται - από το AND © 2007 (www.and.com)' + από το AND © 2007 (www.and.com)' contributors_nz_html: 'Νέα Ζηλανδία: Περιέχει δεδομένα που πηγάζουν από την Υπηρεσία Πληροφοριών Γης Νέας Ζηλανδίας. Τα Πνευματικά Δικαιώματα Crown είναι κατωχυρωμένα.' @@ -1102,7 +1160,7 @@ el: 2010-12. contributors_footer_1_html: |- Για περισσότερες λεπτομέρειες σχετικά με αυτές, και άλλες πηγές που χρησιμοποιήθηκαν - για να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα Συνεισφέροντες στο OpenStreetMap Wiki. + για να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα Συνεισφέροντες στο OpenStreetMap Wiki. contributors_footer_2_html: Η συμπερίληψη δεδομένων στο OpenStreetMap δεν συνεπάγεται ότι ο αρχικός πάροχος δεδομένων εγκρίνει το OpenStreetMap, παρέχει οποιαδήποτε εγγύηση ή αποδέχεται καμία ευθύνη. @@ -1112,14 +1170,14 @@ el: χωρίς την προηγούμενη άδεια από τους ιδιοκτήτες των δικαιωμάτων. infringement_2_html: Εάν πιστεύετε ότι προστέθηκε παράνομα υλικό που προστατεύεται από πνευματικά δικαιώματα στη βάση δεδομένων του OpenStreetMap ή σε αυτόν - τον ιστότοπο, παρακαλούμε απευθυνθείτε στη + τον ιστότοπο, παρακαλούμε απευθυνθείτε στη διαδικασία απομάκρυνσης ή καταθέστε άμεσα μια αίτηση στην on-line σελίδα αιτήσεων. trademarks_title_html: Εμπορικά σήματα trademarks_1_html: Το OpenStreetMap, το λογότυπο με το μεγεθυντικό φακό και το «State of the Map» είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap. Αν έχετε ερωτήσεις σχετικά με τη χρήση των σημάτων, στείλτε τις ερωτήσεις - σας στην Ομάδα + σας στην Ομάδα Εργασίας Αδειών Χρήσης. welcome_page: title: Καλώς ήρθατε! @@ -1154,8 +1212,8 @@ el: paragraph_1_html: Το OpenStreetMap έχει λίγους επίσημους κανόνες, αλλά αναμένουμε από όλους τους συμμετέχοντες να συνεργαστούν και να επικοινωνούν με την κοινότητα. Αν σκέφτεστε άλλες δραστηριότητες εκτός από την επεξεργασία με το χέρι, παρακαλούμε - διαβάστε και ακολουθήστε τις οδηγίες στις Εισαγωγές - και στις Αυτόματες + διαβάστε και ακολουθήστε τις οδηγίες στις Εισαγωγές + και στις Αυτόματες Επεξεργασίες. questions: title: Ερωτήσεις; @@ -1192,7 +1250,7 @@ el: explanation_html: Αν ανησυχείτε για το πώς χρησιμοποιούνται τα δεδομένα μας ή σχετικά με τα περιεχόμενα, παρακαλούμε συμβουλευτείτε τη σελίδα πνευματικών δικαιωμάτων μας για περισσότερες νομικές πληροφορίες ή επικοινωνήστε - με την κατάλληλη ομάδα + με την κατάλληλη ομάδα εργασίας του OSMF. help_page: title: Βοήθεια @@ -1205,7 +1263,7 @@ el: description: Ξεκινήστε με αυτές τις σύντομες οδηγίες που καλύπτουν τα βασικά του OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/El:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/El:Beginners%27_guide title: Οδηγός Αρχαρίων description: Οδηγός αρχαρίων διατηρούμενος από την κοινότητα. help: @@ -1230,7 +1288,7 @@ el: description: Βοήθεια για εταιρείες και οργανισμούς για μετάβαση σε χάρτες που βασίζονται στο OpenStreetMap και άλλες υπηρεσίες. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Περιηγηθείτε το wiki για επιμελής τεκμηρίωση του OSM. about_page: @@ -1252,8 +1310,8 @@ el: που τρέχουν τους εξυπηρετητές OSM, ανθρωπιστές που χαρτογραφούν κατεστραμμένες-πληγείσες περιοχές, και πολλούς περισσότερους. Για να μάθετε περισσότερα για την κοινότητα, ανατρέξτε στα ημερολόγια χρηστών, τα - ιστολόγια της κοινότηταςκαι - την ιστοσελίδα του Ιδρύματος OSM. + ιστολόγια της κοινότηταςκαι + την ιστοσελίδα του Ιδρύματος OSM. open_data_title: Ανοικτά Δεδομένα open_data_html: 'Το OpenStreetMap είναι βάση ανοικτών δεδομένων: είστε ελεύθεροι να την χρησιμοποιήστε για οποιονδήποτε σκοπό, εφόσον μνημονεύετε το @@ -1263,9 +1321,9 @@ el: Δικαιώματα και Άδεια Χρήσης για λεπτομέρειες.' legal_title: Νομικό legal_html: |- - Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το Ίδρυμα OpenStreetMap (OSMF) εκ μέρους της κοινότητας. Η χρήση όλων των υπηρεσιών του OSMF υπόκειται στην Πολιτική Αποδεκτής Χρήσης μας και στην Πολιτική Απορρήτου μας. + Αυτός ο ιστότοπος και πολλές άλλες σχετικές υπηρεσίες λειτουργούν επίσημα από το Ίδρυμα OpenStreetMap (OSMF) εκ μέρους της κοινότητας. Η χρήση όλων των υπηρεσιών του OSMF υπόκειται στην Πολιτική Αποδεκτής Χρήσης μας και στην Πολιτική Απορρήτου μας.
- Παρακαλούμε επικοινωνήστε με το OSMF αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα. + Παρακαλούμε επικοινωνήστε με το OSMF αν έχετε ερωτήματα για άδειες χρήσης, πνευματικά δικαιώματα ή άλλα νομικά θέματα. partners_title: Συνεργάτες notifier: diary_comment_notification: @@ -1487,14 +1545,14 @@ el: user_page_link: σελίδα σας χρήστη anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό. flash_player_required: Χρειάζεστε Flash player για να χρησιμοποιήσετε το Potlatch, - το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να κάνετε - λήψη του Flash Player από την τοποθεσία Adobe.com. Πολλές + το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να κάνετε + λήψη του Flash Player από την τοποθεσία Adobe.com. Πολλές άλλες επιλογές είναι επίσης διαθέσιμες για επεξεργασία στο OpenStreetMap. potlatch_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε στο Potlatch, πρέπει να αποεπιλέξτε οποιαδήποτε διαδρομή ή κόμβο, αν επεξεργάζεστε σε ζωντανή λειτουργία, ή απλά πατήστε «Αποθήκευση» εάν έχετε κουμπί αποθήκευσης.) potlatch2_not_configured: Το Potlatch 2 δεν έχει ρυθμιστεί - παρακαλούμε δείτε - http://wiki.openstreetmap.org/wiki/The_Rails_Port + https://wiki.openstreetmap.org/wiki/The_Rails_Port potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».) id_not_configured: Ο iD δεν έχει ρυθμιστεί @@ -1586,7 +1644,7 @@ el: edit: Επεξεργασία preview: Προεπισκόπηση markdown_help: - title_html: Αναλύεται με το Markdown + title_html: Αναλύεται με το Markdown headings: Επικεφαλίδες heading: Επικεφαλίδα subheading: Υποκεφαλίδα @@ -1698,7 +1756,7 @@ el: description: Προβολή πρόσφατων μεταφορτώσεων ιχνών GPS tagged_with: χαρακτηρίστηκαν με %{tags} empty_html: Τίποτα ακόμα εδώ. Ανεβάστε ένα νέο ίχνος - ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη σελίδα + ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη σελίδα wiki. delete: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή @@ -1916,12 +1974,12 @@ el: και είναι ανοικτός στον καθένα να τον διορθώσει, αναβαθμίσει, κατεβάσει και χρησιμοποιήσει.

Εγγραφείτε για να αρχίσετε να συνεισφέρετε. Θα σας στείλουμε ένα email για να επιβεβαιώσουμε τον λογαριασμό σας.

license_agreement: Όταν επιβεβαιώσετε το λογαριασμό σας, θα πρέπει να συμφωνήσετε - με τους όρους + με τους όρους συνεισφοράς. email address: 'Διεύθυνση Ηλ. Ταχυδρομείου:' confirm email address: 'Επιβεβαίωση Διεύθυνσης Ηλ. Ταχυδρομείου:' not displayed publicly: Η διεύθυνση σου δεν εμφανίζεται δημόσια (βλέπετε την - πολιτική απορρήτου για περισσότερες πληροφορίες) display name: 'Εμφανιζόμενο όνομα:' @@ -2045,13 +2103,13 @@ el: email never displayed publicly: (όχι δημόσια εμφάνιση) external auth: 'Εξωτερικός Έλεγχος Ταυτότητας:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: τι είναι αυτό; public editing: heading: 'Δημόσια επεξεργασία:' enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε δεδομένα. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: τι είναι αυτό; disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες οι προηγούμενες επεξεργασίες είναι ανώνυμες. @@ -2063,7 +2121,7 @@ el: επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω του ιστοχώρου, πατήστε το κουμπί από κάτω. Μετά την αλλαγή σε API 0.6, μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.. - (μάθετε γιατί). + (μάθετε γιατί).
  • Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
  • Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες είναι επώνυμοι εξ' αρχής.
@@ -2203,7 +2261,7 @@ el: χρήστη `%{name}'? confirm: Επιβεβαίωση fail: Δεν μπόρεσε να εξουσιοδοτήσει τον χρήστη % {όνομα}. Παρακαλώ ελέγξετε - ότι ο χρήστης και ο ρόλος είναι και οι δύο έγκυροι. + ότι ο χρήστης και ο ρόλος είναι και οι δύο έγκυροι revoke: title: Επιβεβαίωση ανάκλησης ρόλου heading: Επιβεβαίωση ανάκλησης ρόλου @@ -2475,7 +2533,7 @@ el: slight_left_without_exit: Ελαφριά αριστερά στην %{name} via_point_without_exit: (μέσω σημείου) follow_without_exit: Ακολουθήστε την %{name} - roundabout_without_exit: Στον κυκλικό κόμβο πάρτε την %{name} + roundabout_without_exit: Στον κυκλικό κόμβο βγείτε στο %{name} leave_roundabout_without_exit: Βγείτε από τον κυκλικό κόμβο - %{name} stay_roundabout_without_exit: Μείνετε στον κυκλικό κόμβο - %{name} start_without_exit: Ξεκινήστε στο τέλος του %{name} diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index eb998536f..ee1b21fe3 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -12,6 +12,7 @@ # Author: Eduard Popov # Author: IknowJoseph # Author: Jagwar +# Author: Jguthrie100 # Author: Kosovastar # Author: Macofe # Author: Meno25 @@ -456,33 +457,26 @@ en-GB: crematorium: Crematorium dentist: Dentist doctors: Doctors - dormitory: Dormitory drinking_water: Drinking Water driving_school: Driving School embassy: Embassy - emergency_phone: Emergency Phone fast_food: Fast Food ferry_terminal: Ferry Terminal - fire_hydrant: Fire Hydrant fire_station: Fire Station food_court: Food Court fountain: Fountain fuel: Fuel gambling: Gambling grave_yard: Graveyard - gym: Fitness Centre/Gym - health_centre: Health Centre hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream kindergarten: Nursery School library: Library - market: Market marketplace: Marketplace monastery: Monastery motorcycle_parking: Motorcycle Parking nightclub: Night Club - nursery: Nursery School nursing_home: Nursing Home office: Office parking: Parking @@ -496,7 +490,6 @@ en-GB: prison: Prison pub: Pub public_building: Public Building - reception_area: Reception Area recycling: Recycling Point restaurant: Restaurant retirement_home: Retirement Home @@ -529,6 +522,7 @@ en-GB: protected_area: Protected Area bridge: aqueduct: Aqueduct + boardwalk: Promenade suspension: Suspension Bridge swing: Swing Bridge viaduct: Viaduct @@ -592,7 +586,6 @@ en-GB: trunk: Trunk Road trunk_link: Trunk Road unclassified: Unclassified Road - unsurfaced: Unsurfaced Road "yes": Road historic: archaeological_site: Archaeological Site @@ -657,7 +650,6 @@ en-GB: leisure: beach_resort: Beach Resort bird_hide: Bird Hide - club: Club common: Common Land dog_park: Dog Park fishing: Fishing Area @@ -685,6 +677,7 @@ en-GB: "yes": Leisure man_made: lighthouse: Lighthouse + petroleum_well: Oil Well pipeline: Pipeline tower: Tower works: Factory @@ -750,8 +743,6 @@ en-GB: "yes": Office place: allotments: Allotments - block: Block - airport: Airport city: City country: Country county: County @@ -763,7 +754,6 @@ en-GB: islet: Islet isolated_dwelling: Isolated Dwelling locality: Locality - moor: Moor municipality: Municipality neighbourhood: Neighbourhood postcode: Postcode @@ -780,10 +770,8 @@ en-GB: abandoned: Abandoned Railway construction: Railway under construction disused: Disused Railway - disused_station: Disused Railway Station funicular: Funicular Railway halt: Train Stop - historic_station: Historic Railway Station junction: Railway Junction level_crossing: Level Crossing light_rail: Light Rail @@ -847,7 +835,6 @@ en-GB: hairdresser: Hairdresser hardware: Hardware Store hifi: Hi-Fi - insurance: Insurance jewelry: Jewellers kiosk: Kiosk Shop laundry: Laundry @@ -863,10 +850,8 @@ en-GB: pet: Pet Shop pharmacy: Pharmacy photo: Photo Shop - salon: Salon second_hand: Second-hand Shop shoes: Shoe Shop - shopping_centre: Shopping Centre sports: Sports Shop stationery: Stationers supermarket: Supermarket @@ -1480,6 +1465,7 @@ en-GB: where_am_i: Where am I? where_am_i_title: Describe the current location using the search engine submit_text: Go + reverse_directions_text: Reverse Directions key: table: entry: @@ -2368,6 +2354,8 @@ en-GB: can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.) + advice: Your note is public and may be used to update the map, so don't enter + personal information or information from copyrighted maps or directory listings. add: Add Note show: anonymous_warning: This note includes comments from anonymous users which @@ -2399,7 +2387,15 @@ en-GB: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} offramp_right_without_exit: Take the sliproad on the right onto %{name} + offramp_right_with_directions: Take the sliproad on the right towards %{directions} + offramp_right_with_name_and_directions: Take the sliproad on the right onto + %{name}, towards %{directions} + offramp_right_without_directions: Take the sliproad on the right onramp_right_without_exit: Turn right on the sliproad onto %{name} + onramp_right_with_directions: Turn right onto the sliproad towards %{directions} + onramp_right_with_name_and_directions: Turn right on the sliproad onto %{name}, + towards %{directions} + onramp_right_without_directions: Turn right onto the sliproad endofroad_right_without_exit: At the end of the road turn right onto %{name} merge_right_without_exit: Merge right onto %{name} fork_right_without_exit: At the fork turn right onto %{name} @@ -2409,7 +2405,15 @@ en-GB: sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} offramp_left_without_exit: Take the sliproad on the left onto %{name} + offramp_left_with_directions: Take the sliproad on the left towards %{directions} + offramp_left_with_name_and_directions: Take the sliproad on the left onto + %{name}, towards %{directions} + offramp_left_without_directions: Take the sliproad on the left onramp_left_without_exit: Turn left on the sliproad onto %{name} + onramp_left_with_directions: Turn left onto the sliproad towards %{directions} + onramp_left_with_name_and_directions: Turn left on the sliproad onto %{name}, + towards %{directions} + onramp_left_without_directions: Turn left onto the sliproad endofroad_left_without_exit: At the end of the road turn left onto %{name} merge_left_without_exit: Merge left onto %{name} fork_left_without_exit: At the fork turn left onto %{name} @@ -2419,7 +2423,7 @@ en-GB: roundabout_without_exit: At roundabout take %{name} leave_roundabout_without_exit: Leave roundabout - %{name} stay_roundabout_without_exit: Stay on roundabout - %{name} - start_without_exit: Start at end of %{name} + start_without_exit: Start on %{name} destination_without_exit: Reach destination against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} diff --git a/config/locales/en.yml b/config/locales/en.yml index 40237b63b..a40f15719 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -385,12 +385,19 @@ en: chair_lift: "Chair Lift" drag_lift: "Drag Lift" gondola: "Gondola Lift" + platter: "Platter Lift" + pylon: "Pylon" station: "Aerialway Station" + t-bar: "T-Bar Lift" aeroway: aerodrome: "Aerodrome" + airstrip: "Airstrip" apron: "Apron" gate: "Gate" + hangar: "Hangar" helipad: "Helipad" + holding_position: "Holding Position" + parking_position: "Parking Position" runway: "Runway" taxiway: "Taxiway" terminal: "Terminal" @@ -425,37 +432,32 @@ en: crematorium: "Crematorium" dentist: "Dentist" doctors: "Doctors" - dormitory: "Dormitory" drinking_water: "Drinking Water" driving_school: "Driving School" embassy: "Embassy" - emergency_phone: "Emergency Phone" fast_food: "Fast Food" ferry_terminal: "Ferry Terminal" - fire_hydrant: "Fire Hydrant" fire_station: "Fire Station" food_court: "Food Court" fountain: "Fountain" fuel: "Fuel" gambling: "Gambling" grave_yard: "Grave Yard" - gym: "Fitness Centre / Gym" - health_centre: "Health Centre" + grit_bin: "Grit Bin" hospital: "Hospital" hunting_stand: "Hunting Stand" ice_cream: "Ice Cream" kindergarten: "Kindergarten" library: "Library" - market: "Market" marketplace: "Marketplace" monastery: "Monastery" motorcycle_parking: "Motorcycle Parking" nightclub: "Night Club" - nursery: "Nursery" nursing_home: "Nursing Home" office: "Office" parking: "Parking" parking_entrance: "Parking Entrance" + parking_space: "Parking Space" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" @@ -465,7 +467,6 @@ en: prison: "Prison" pub: "Pub" public_building: "Public Building" - reception_area: "Reception Area" recycling: "Recycling Point" restaurant: "Restaurant" retirement_home: "Retirement Home" @@ -490,6 +491,7 @@ en: village_hall: "Village Hall" waste_basket: "Waste Basket" waste_disposal: "Waste Disposal" + water_point: "Water Point" youth_centre: "Youth Centre" boundary: administrative: "Administrative Boundary" @@ -498,6 +500,7 @@ en: protected_area : "Protected Area" bridge: aqueduct: "Aqueduct" + boardwalk: "Boardwalk" suspension: "Suspension Bridge" swing: "Swing Bridge" viaduct: "Viaduct" @@ -517,25 +520,31 @@ en: "yes": "Craft Shop" emergency: ambulance_station: "Ambulance Station" + assembly_point: "Assembly Point" defibrillator: "Defibrillator" landing_site: "Emergency Landing Site" phone: "Emergency Phone" + water_tank: "Emergency Water Tank" + "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" bus_stop: "Bus Stop" construction: "Highway under Construction" + corridor: "Corridor" cycleway: "Cycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" footway: "Footpath" ford: "Ford" + give_way: "Give Way Sign" living_street: "Living Street" milestone: "Milestone" motorway: "Motorway" motorway_junction: "Motorway Junction" motorway_link: "Motorway Road" + passing_place: "Passing Place" path: "Path" pedestrian: "Pedestrian Way" platform: "Platform" @@ -552,6 +561,7 @@ en: services: "Motorway Services" speed_camera: "Speed Camera" steps: "Steps" + stop: "Stop Sign" street_lamp: "Street Lamp" tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" @@ -560,8 +570,8 @@ en: trail: "Trail" trunk: "Trunk Road" trunk_link: "Trunk Road" + turning_loop: "Turning Loop" unclassified: "Unclassified Road" - unsurfaced: "Unsurfaced Road" "yes" : "Road" historic: archaeological_site: "Archaeological Site" @@ -580,6 +590,7 @@ en: manor: "Manor" memorial: "Memorial" mine: "Mine" + mine_shaft: "Mine Shaft" monument: "Monument" roman_road: "Roman Road" ruins: "Ruins" @@ -589,6 +600,7 @@ en: wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" wreck: "Wreck" + "yes": "Historic Site" junction: "yes": "Junction" landuse: @@ -626,9 +638,9 @@ en: leisure: beach_resort: "Beach Resort" bird_hide: "Bird Hide" - club: "Club" common: "Common Land" dog_park: "Dog Park" + firepit: "Fire Pit" fishing: "Fishing Area" fitness_centre: "Fitness Centre" fitness_station: "Fitness Station" @@ -653,15 +665,46 @@ en: water_park: "Water Park" "yes": "Leisure" man_made: + adit: "Adit" + beacon: "Beacon" + beehive: "Bee Hive" + breakwater: "Breakwater" + bridge: "Bridge" + bunker_silo: "Bunker" + chimney: "Chimney" + crane: "Crane" + dolphin: "Mooring Post" + dyke: "Dyke" + embankment: "Embankment" + flagpole: "Flagpole" + gasometer: "Gasometer" + groyne: "Groyne" + kiln: "Kiln" lighthouse: "Lighthouse" + mast: "Mast" + mine: "Mine" + mineshaft: "Mine Shaft" + monitoring_station: "Monitoring Station" + petroleum_well: "Petroleum Well" + pier: "Pier" pipeline: "Pipeline" + silo: "Silo" + storage_tank: "Storage Tank" + surveillance: "Surveillance" tower: "Tower" + wastewater_plant: "Wastewater Plant" + watermill: "Water Mill" + water_tower: "Water Tower" + water_well: "Well" + water_works: "Water Works" + windmill: "Wind Mill" works: "Factory" "yes": "Man-made" military: airfield: "Military Airfield" barracks: "Barracks" bunker: "Bunker" + "yes": "Military" mountain_pass: "yes" : "Mountain Pass" natural: @@ -707,11 +750,14 @@ en: accountant: "Accountant" administrative: "Administration" architect: "Architect" + association: "Association" company: "Company" + educational_institution: "Educational Institution" employment_agency: "Employment Agency" estate_agent: "Estate Agent" government: "Governmental Office" insurance: "Insurance Office" + it: "IT Office" lawyer: "Lawyer" ngo: "NGO Office" telecommunication: "Telecommunication Office" @@ -719,9 +765,8 @@ en: "yes": "Office" place: allotments: "Allotments" - block: "Block" - airport: "Airport" city: "City" + city_block: "City Block" country: "Country" county: "County" farm: "Farm" @@ -732,12 +777,13 @@ en: islet: "Islet" isolated_dwelling: "Isolated Dwelling" locality: "Locality" - moor: "Moor" municipality: "Municipality" neighbourhood: "Neighbourhood" postcode: "Postcode" + quarter: "Quarter" region: "Region" sea: "Sea" + square: "Square" state: "State" subdivision: "Subdivision" suburb: "Suburb" @@ -749,10 +795,8 @@ en: abandoned: "Abandoned Railway" construction: "Railway under Construction" disused: "Disused Railway" - disused_station: "Disused Railway Station" funicular: "Funicular Railway" halt: "Train Stop" - historic_station: "Historic Railway Station" junction: "Railway Junction" level_crossing: "Level Crossing" light_rail: "Light Rail" @@ -778,6 +822,7 @@ en: beauty: "Beauty Shop" beverages: "Beverages Shop" bicycle: "Bicycle Shop" + bookmaker: "Bookmaker" books: "Book Shop" boutique: "Boutique" butcher: "Butcher" @@ -816,12 +861,16 @@ en: hairdresser: "Hairdresser" hardware: "Hardware Store" hifi: "Hi-Fi" - insurance: "Insurance" + houseware: "Houseware Shop" + interior_decoration: "Interior Decoration" jewelry: "Jewelry Shop" kiosk: "Kiosk Shop" + kitchen: "Kitchen Shop" laundry: "Laundry" + lottery: "Lottery" mall: "Mall" market: "Market" + massage: "Massage" mobile_phone: "Mobile Phone Shop" motorcycle: "Motorcycle Shop" music: "Music Shop" @@ -829,21 +878,27 @@ en: optician: "Optician" organic: "Organic Food Shop" outdoor: "Outdoor Shop" + paint: "Paint Shop" + pawnbroker: "Pawnbroker" pet: "Pet Shop" pharmacy: "Pharmacy" photo: "Photo Shop" - salon: "Salon" + seafood: "Sea Food" second_hand: "Second-hand Shop" shoes: "Shoe Shop" - shopping_centre: "Shopping Centre" sports: "Sports Shop" stationery: "Stationery Shop" supermarket: "Supermarket" tailor: "Tailor" + ticket: "Ticket Shop" + tobacco: "Tobacco Shop" toys: "Toy Shop" travel_agency: "Travel Agency" + tyres: "Tyre Shop" + vacant: "Vacant Shop" + variety_store: "Variety Store" video: "Video Shop" - wine: "Off License" + wine: "Wine Store" "yes": "Shop" tourism: alpine_hut: "Alpine Hut" @@ -867,6 +922,7 @@ en: viewpoint: "Viewpoint" zoo: "Zoo" tunnel: + building_passage: "Building Passage" culvert: "Culvert" "yes": "Tunnel" waterway: @@ -1183,7 +1239,7 @@ en: on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: | - OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. + OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. welcome_page: title: Welcome! introduction_html: | @@ -1334,6 +1390,8 @@ en:
Please contact the OSMF if you have licensing, copyright or other legal questions and issues. +
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. partners_title: Partners notifier: diary_comment_notification: @@ -1529,6 +1587,7 @@ en: where_am_i: "Where is this?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" + reverse_directions_text: "Reverse Directions" key: table: entry: @@ -2379,7 +2438,13 @@ en: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} offramp_right_without_exit: Take the ramp on the right onto %{name} + offramp_right_with_directions: Take the ramp on the right towards %{directions} + offramp_right_with_name_and_directions: Take the ramp on the right onto %{name}, towards %{directions} + offramp_right_without_directions: Take the ramp on the right onramp_right_without_exit: Turn right on the ramp onto %{name} + onramp_right_with_directions: Turn right onto the ramp towards %{directions} + onramp_right_with_name_and_directions: Turn right on the ramp onto %{name}, towards %{directions} + onramp_right_without_directions: Turn right onto the ramp endofroad_right_without_exit: At the end of the road turn right onto %{name} merge_right_without_exit: Merge right onto %{name} fork_right_without_exit: At the fork turn right onto %{name} @@ -2389,17 +2454,23 @@ en: sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} offramp_left_without_exit: Take the ramp on the left onto %{name} + offramp_left_with_directions: Take the ramp on the left towards %{directions} + offramp_left_with_name_and_directions: Take the ramp on the left onto %{name}, towards %{directions} + offramp_left_without_directions: Take the ramp on the left onramp_left_without_exit: Turn left on the ramp onto %{name} + onramp_left_with_directions: Turn left onto the ramp towards %{directions} + onramp_left_with_name_and_directions: Turn left on the ramp onto %{name}, towards %{directions} + onramp_left_without_directions: Turn left onto the ramp endofroad_left_without_exit: At the end of the road turn left onto %{name} merge_left_without_exit: Merge left onto %{name} fork_left_without_exit: At the fork turn left onto %{name} slight_left_without_exit: Slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name} - roundabout_without_exit: At roundabout take %{name} + roundabout_without_exit: At roundabout take exit onto %{name} leave_roundabout_without_exit: Leave roundabout - %{name} stay_roundabout_without_exit: Stay on roundabout - %{name} - start_without_exit: Start at end of %{name} + start_without_exit: Start on %{name} destination_without_exit: Reach destination against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 030d383a6..0612e148a 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -353,7 +353,7 @@ eo: embeddable_html: Enkorpigebla HTML licence: Permesilo export_details: OpenStreetMap-datumoj estas disponeblaj laÅ­ la permesilo Open Data Commons Open + href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License (ODbL). too_large: advice: 'Se la elportado malsukcesis, bonvolu uzi unu el jenaj fontoj:' @@ -391,14 +391,14 @@ eo: geocoder: search: title: - latlon: Rezultoj el Internal + latlon: Rezultoj el nia retejo uk_postcode: Rezultoj el NPEMap / FreeThe Postcode - ca_postcode: Rezultoj el Geocoder.CA - osm_nominatim: Rezultoj el OpenStreetMap + ca_postcode: Rezultoj el Geocoder.CA + osm_nominatim: Rezultoj el OpenStreetMap Nominatim geonames: Rezultoj el GeoNames - osm_nominatim_reverse: Rezultoj el OpenStreetMap + osm_nominatim_reverse: Rezultoj el OpenStreetMap Nominatim geonames_reverse: Rezultoj el GeoNames search_osm_nominatim: @@ -408,12 +408,19 @@ eo: chair_lift: Telfero seĝa drag_lift: Skitelfero gondola: Telfero plur-vagoneta + platter: Skitelfero unupersona + pylon: Fosto station: Kablovoja stacio + t-bar: Skitelfero dupersona aeroway: aerodrome: Aerodromo + airstrip: Provizora aerodromo apron: Aviadil-parkumejo gate: Pordego + hangar: Hangaro helipad: Surteriĝejo helikoptera + holding_position: Haltejo antaÅ­ aÅ­tokur-strato + parking_position: Aviadil-parkumejo (pozicio) runway: Avia dromo taxiway: AÅ­tokur-strato terminal: Flugstacio @@ -448,37 +455,32 @@ eo: crematorium: Kadavro-bruligejo dentist: Dentistejo doctors: Kabineto de kuracisto - dormitory: Studenthejmo drinking_water: Trinkakvejo driving_school: Stirlernejo embassy: Ambasadejo - emergency_phone: Alarma telefono fast_food: Rapidmanĝejo ferry_terminal: Pramstacio - fire_hydrant: Hidranto fire_station: Fajrobribadejo food_court: Manĝobazaro fountain: Fontano fuel: Benzinejo gambling: Hazardludejo grave_yard: Tombejo ĉirkaÅ­preĝeja - gym: Ripoz-gimnastika centro - health_centre: Medicina centro + grit_bin: Ujo kun sablo kaj salo hospital: Malsanulejo hunting_stand: Altembusko ĉasada ice_cream: Glaciaĵejo kindergarten: Infanĝardeno library: Biblioteko - market: Bazaro marketplace: Bazaro monastery: MonaÄ¥ejo motorcycle_parking: Parkumejo motorcikla nightclub: Noktoklubejo - nursery: Infanejo nursing_home: Domo de permanenta zorgado office: Oficejo parking: Parkumejo parking_entrance: Enveturejo al parkumejo + parking_space: Parkumeja pozicio pharmacy: Apoteko place_of_worship: Preĝejo police: Policejo @@ -488,7 +490,6 @@ eo: prison: Malliberejo pub: Taverno public_building: Konstruaĵo publika - reception_area: Atendejo recycling: Recikligejo restaurant: Restoracio retirement_home: Maljunulejo @@ -513,6 +514,7 @@ eo: village_hall: Komunuma centro (vilaĝo) waste_basket: Rubujo waste_disposal: Rubujego + water_point: Trinkejo youth_centre: Junulara centro boundary: administrative: Administra limo @@ -521,6 +523,7 @@ eo: protected_area: Naturprotektejo bridge: aqueduct: Akvedukto + boardwalk: Ligna trotuaro suspension: Pendoponto swing: Ponto turnebla viaduct: Viadukto @@ -540,25 +543,31 @@ eo: "yes": Metiejo emergency: ambulance_station: Ambulanca stacio + assembly_point: Vivsava renkontiĝejo defibrillator: Defibrililo landing_site: Surteriĝejo en urĝo phone: Alarma telefono + water_tank: KontraÅ­brulega akvujo + "yes": Je danĝero highway: abandoned: Forlasita vojo bridleway: Ĉevalvojo bus_guideway: AÅ­tobus-trako bus_stop: Haltejo aÅ­tobusa construction: Vojo konstruata + corridor: Koridoro cycleway: Bicikovojo elevator: Lifto emergency_access_point: Vivsava rekonebla signo footway: Piedvojeto ford: Travadejo + give_way: Trafiksigno ‘cedi traveturon’ living_street: Ĉedoma strato milestone: Mejloŝtono motorway: AÅ­tovojo motorway_junction: Elveturejo el aÅ­tovojo motorway_link: Ligilo al aÅ­tovojo + passing_place: Preterpasejo path: Vojeto pedestrian: Piedirada strato platform: Haltejo @@ -575,6 +584,7 @@ eo: services: Servejo de vojaĝantoj speed_camera: Rapid-kontrolilo steps: Ŝtuparo + stop: Trafiksigno STOP street_lamp: Stratlampo tertiary: Vojo tria-ranga tertiary_link: Ligilo al vojo tria-ranga @@ -583,8 +593,8 @@ eo: trail: Kurso trunk: Vojo ekspresa trunk_link: Ligilo al vojo ekspresa + turning_loop: Ejo por ĝirado U-forma unclassified: Vojo kvara-ranga - unsurfaced: Ligilo al vojo kvara-ranga "yes": Vojo historic: archaeological_site: ArÄ¥eologia ejo @@ -603,6 +613,7 @@ eo: manor: Palaceto historia memorial: Memorigaĵo mine: Minejo + mine_shaft: Ŝakto monument: Monumento roman_road: Romia ŝoseo ruins: Ruinoj historiaj @@ -612,6 +623,7 @@ eo: wayside_cross: Krucifikso apudvoja wayside_shrine: Adorejo apudvoja wreck: Ruinoj de ŝipo + "yes": Historia ejo junction: "yes": Vojkruciĝo landuse: @@ -649,9 +661,9 @@ eo: leisure: beach_resort: Apudmara ripoz-centro bird_hide: Bird-observejo - club: Klubejo common: Publika ripoza tereno dog_park: Hund-parko + firepit: Lignofajrejo fishing: Fiŝkaptadejo fitness_centre: Ripoz-gimnastika centro fitness_station: Ekzerco-parko @@ -676,15 +688,46 @@ eo: water_park: Akvoparko "yes": Ripozejo man_made: + adit: Minejo horizontala + beacon: Buo fiksa + beehive: Abulejo + breakwater: Ond-rompilo + bridge: Ponto + bunker_silo: Bunkro armea + chimney: Fumtubo + crane: Gruo + dolphin: Dukdalbo + dyke: Digo + embankment: Surŝutaĵo + flagpole: Flago + gasometer: Gasujo + groyne: Ond-rompileto + kiln: Forno industria lighthouse: Lumturo + mast: Masto + mine: Minejo + mineshaft: Ŝakto + monitoring_station: Observada stacio + petroleum_well: Naftoŝakto + pier: Marponto pipeline: Tubolinio + silo: Tur-stokejo + storage_tank: Rezervujo + surveillance: Supergardo tower: Turo + wastewater_plant: Akvopurigejo + watermill: Muelejo akva + water_tower: Akvoturo + water_well: Puto + water_works: Akvotrinkebligejo + windmill: Muelejo venta works: Fabriko "yes": Artefarita objekto military: airfield: Aerbazo armea barracks: Soldatejo bunker: Bunkro armea + "yes": Armeo mountain_pass: "yes": Montpasejo natural: @@ -730,11 +773,14 @@ eo: accountant: Oficejo de kontisto administrative: Administra oficejo architect: Oficejo de arÄ¥itekturisto + association: Oficejo de asocio company: Oficejo de firmao + educational_institution: Oficejo de edukada institucio employment_agency: Dungoficejo estate_agent: Oficejo de nemoveblaĵisto government: Registara oficejo insurance: Asekurkompaniejo + it: Oficejo de informteÄ¥nika firmao lawyer: Oficejo de leĝisto ngo: Oficejo de ne-registara organizaĵo telecommunication: Telekomunikada oficejo @@ -742,9 +788,8 @@ eo: "yes": Oficejo place: allotments: Familiaj ĝardenoj - block: Bloko - airport: Flughaveno city: Urbego + city_block: Dombloko country: Lando county: Distrikto farm: Farmobieno @@ -755,12 +800,13 @@ eo: islet: Insuleto isolated_dwelling: Solstaranta domo locality: Ejo - moor: Arbustetaro municipality: Municipo neighbourhood: Najbaraĵo postcode: Poŝtkodo + quarter: Kvartalo region: Regiono sea: Maro + square: Placo state: Provinco subdivision: Kvartalo suburb: Suburbo @@ -772,10 +818,8 @@ eo: abandoned: Eksa fervojlinio construction: Fervojlinio konstruata disused: Forlasita fervojlinio - disused_station: Forlasita stacio fervoja funicular: Funikularo halt: Haltejo fervoja - historic_station: Fervoja stacidomo historia junction: Fervojnodo level_crossing: Traknivela pasejo (vojo) light_rail: Fervojo malpeza @@ -801,6 +845,7 @@ eo: beauty: Beligejo beverages: Trinkaĵ-vendejo bicycle: Bicikl-vendejo + bookmaker: Vetperisto books: Libro-vendejo boutique: Mod-butiko butcher: Viand-vendejo @@ -839,12 +884,16 @@ eo: hairdresser: Frizejo hardware: Laboril-vendejo hifi: Altfidel-son-vendejo - insurance: Asekurkompaniejo + houseware: Mastrum-aparata vendejo + interior_decoration: Ensembl-vendejo jewelry: Juvel-vendejo kiosk: Gazetbudo + kitchen: Kuirej-mebla vendejo laundry: Vestaĵ-lavejo (akvo) + lottery: Loteri-vendejo mall: Vendejaro market: Bazaro + massage: Kabineto de masaĝo mobile_phone: Poŝtelefon-vendejo motorcycle: Motorcikl-vendejo music: Muzik-vendejo @@ -852,21 +901,27 @@ eo: optician: Optikbutiko organic: Ekologi-manĝaĵa vendejo outdoor: Vojaĝil-vendejo + paint: Farb-vendejo + pawnbroker: Lombardejo pet: Dombest-vendejo pharmacy: Apoteko photo: Fotovendejo - salon: Beligejo + seafood: Marfrukt-vendejo second_hand: Brokantejo shoes: Ŝuo-vendejo - shopping_centre: Vendejaro sports: Sportovendejo stationery: Papervaro-vendejo supermarket: Superbazaro tailor: Tajlorejo + ticket: Bilet-vendejo + tobacco: Tabak-vendejo toys: Ludil-vendejo travel_agency: Vojaĝ-oficejo + tyres: PneÅ­-vendejo + vacant: Forlasita vendejo + variety_store: Diversaĵ-vendejo video: Filmovendejo - wine: Alkohol-vendejo + wine: Vin-vendejo "yes": Vendejo tourism: alpine_hut: Montara kabano @@ -890,6 +945,7 @@ eo: viewpoint: Belvidejo zoo: Bestoĝardeno tunnel: + building_passage: Trakonstruaĵa tunelo culvert: Subvoja konduktilo "yes": Tunelo waterway: @@ -921,7 +977,7 @@ eo: level10: Limo de subkvartalo (niv.10) description: title: - osm_nominatim: Loko el OpenStreetMap + osm_nominatim: Loko el OpenStreetMap Nominatim geonames: Loko el GeoNames types: @@ -995,14 +1051,14 @@ eo: legal_babble: title_html: Kopirajto kaj permesilo intro_1_html: |- - OpenStreetMap® estas projekto de malfermaj datumoj eldonita sub la permesilo Open Data + OpenStreetMap® estas projekto de malfermaj datumoj eldonita laÅ­ la permesilo Open Data Commons Open Database License (ODbL) de la OpenStreetMap Fondaĵo (OSMF). + href="http://osmfoundation.org/">Fondaĵo OpenStreetMap (OSMF). intro_2_html: Vi rajtas kopii, disdoni, transdoni kaj modifi niajn datumojn, nur se vi atribuos aÅ­torecon al OpenStreetMap kaj ĝiaj kontribuintoj. Se vi modifos aÅ­ uzos niajn datumojn, vi povos distribui la verkon laÅ­ la sama permesilo. - La plena interkonsento + La plena interkonsento de uzado klarigas viajn rajtojn kaj devojn. intro_3_html: La kartografio de niaj map-kaheloj kaj nia dokumentaro estas disponeblaj laÅ­ la permesilo Krea @@ -1011,8 +1067,8 @@ eo: credit_1_html: 'Ni postulas, ke vi markos: “© Kontribuintoj de OpenStreetMap”.' credit_2_html: Vi ankaÅ­ devas klarigi, ke datumoj estas disponeblaj laÅ­ la permesilo Open Database License, kaj kartografio de map-kaheloj laÅ­ la permesilo CC - BY-SA. Vi povas indiki tion per fari ligilon al ĉi - tiu paĝo pri permesilo. Alimaniere, se vi distribuas OSM en datuma formo, + BY-SA. Vi povas indiki tion per fari ligilon al tiu + ĉi paĝo pri permesilo. Alimaniere, se vi distribuas OSM en datuma formo, vi povas mencii nomo(j)n kaj ligilo(j)n al la permesilo(j). Se ne estas eble meti ligilojn (ekz. en paperaj mapoj), ni sugestas direkti viajn legantojn al openstreetmap.org (eble meti plenan retadreson), al opendatacommons.org @@ -1026,7 +1082,7 @@ eo: more_title_html: Sciiĝi pli more_1_html: |- Sciigu pli pri uzado de niaj datumoj kaj kiel atribui aÅ­torecon ĉe la retpaĝo pri permesilo OSMF. + href="https://osmfoundation.org/Licence">retpaĝo pri permesilo OSMF. more_2_html: Kvankam la datumoj de OpenStreetMap estas liberaj, ni ne povas liveri senpagan API-on por eksteraj programistoj. Legu nian politikon pri uzado de API, politikon @@ -1037,9 +1093,9 @@ eo: inkludas datumoj laÅ­ malferma permesilo el landaj kartografiaj organizaĵoj kaj el aliaj fontoj, inter ili:' contributors_at_html: |- - AÅ­strujo: enhavas datumojn el Stadt Wien (laÅ­ CC BY), - Land Vorarlberg kaj - Land Tirol (sub CC BY AT kun postaj ŝanĝoj). + AÅ­strujo: enhavas datumojn el Stadt Wien (laÅ­ CC BY), + Land Vorarlberg kaj + Land Tirol (laÅ­ CC BY AT kun postaj ŝanĝoj). contributors_ca_html: |- Kanado: enhavas datumojn el GeoBase®, GeoGratis (© Department of Natural @@ -1048,12 +1104,12 @@ eo: Statistics Canada). contributors_fi_html: |- Suomujo: enhavas datumojn el - National Land Survey of Finland's Topographic Database kaj aliaj fontoj, laÅ­ la NLSFI permesilo. + National Land Survey of Finland's Topographic Database kaj aliaj fontoj, laÅ­ la permesilo NLSFI. contributors_fr_html: 'Francujo: enhavas datumojn ricevitajn el ''Direction Générale des Impôts''.' contributors_nl_html: |- Nederlando: enhavas datumojn el © AND, 2007 - (www.and.com). + (www.and.com). contributors_nz_html: 'Nov-Zelando: enhavas datumojn ricevitajn el ''Land Information New Zealand''. Crown Copyright reserved.' contributors_si_html: |- @@ -1068,8 +1124,8 @@ eo: Survey' © Crown copyright and database right 2010-12. contributors_footer_1_html: |- - Por pli da detaloj pri ĉi tiuj kaj aliaj fontoj uzitaj por plibonigi OpenStreetMap, bonvolu viziti la paĝon pri kontribuintoj en la OpenStreetMap-vikio. + Por pli da detaloj pri tiuj ĉi kaj aliaj fontoj uzitaj por plibonigi OpenStreetMap, bonvolu viziti la paĝon pri kontribuintoj en la OpenStreetMap-vikio. contributors_footer_2_html: Inkludo de datumoj en OpenStreetMap ne indikas, ke la provizanto de datumoj apogas OpenStreetMap, garantias por iu aÅ­ respondumas por iu. @@ -1078,16 +1134,15 @@ eo: el iuj ajn fontoj protektataj de kopirajto (ekz. Google Maps aÅ­ paperaj mapoj) sen klara permeso de posedanto de kopirajtoj. infringement_2_html: Se ve pensas, ke datumoj protektataj per kopirajto estas - misaldonitaj al OpenStreetMap-datumbazo aÅ­ al ĉi tiu retejo, bonvolu legi - pri proceduro + misaldonitaj al OpenStreetMap-datumbazo aÅ­ al tiu ĉi retejo, bonvolu legi + pri proceduro de forigado de datumoj aÅ­ plenigi la enretan formularon. trademarks_title_html: Registritaj markoj - trademarks_1_html: OpenStreetMap, la piktogramo de grandiga lenso kaj 'State - of the Map' estas registritaj markoj de OpenStreetMap Fondaĵo. Se vi havas - iujn demandojn pri uzado de niaj markoj, bonvolu sendi viajn demandojn al - la grupo - de laboro pri permesilo. + trademarks_1_html: OpenStreetMap, la piktogramo de grandiga lenso kaj “State + of the Map” estas registritaj markoj de la Fondaĵo OpenStreetMap. Se vi havas + iujn demandojn pri uzado de niaj markoj, bonvolu sciigi kun nia politiko + pri varmarkoj. welcome_page: title: Bonvenon! introduction_html: Bonvenon al OpenStreetMap, la libera kaj redaktebla mapo de @@ -1119,8 +1174,8 @@ eo: paragraph_1_html: "OpenStreetMap havas malmultajn formalajn regulojn, tamen ni esperas, ke ĉiuj kunlaboros kaj interparolos en la komunumo. Se vi planas iujn agadojn aliajn ol permanajn redaktojn, bonvolu legi la sekvajn rekomendojn - pri enportadoj - kaj \naÅ­tomataj + pri enportoj + kaj \naÅ­tomataj redaktoj." questions: title: Iaj demandoj? @@ -1129,7 +1184,7 @@ eo: por ricevi helpon. start_mapping: Ekigi mapigadon add_a_note: - title: Ĉu mankas al vi tempo por ridaktado? Aldonu rimarkon! + title: Ĉu mankas al vi tempo por redakti? Aldonu rimarkon! paragraph_1_html: Se vi volas nur korekti iun etan kaj vi ne havas tempon por registriĝi kaj lerni redaktadon, vi povas facile aldoni rimarkon. paragraph_2_html: Simple iru al la mapo kaj alklaku @@ -1153,7 +1208,7 @@ eo: title: Aliaj aferoj explanation_html: Se vi havas demandojn pri kial niaj datumoj aÅ­ enhavo estas uzataj, bonvolu ekkoni paĝon pri kopirajto por pliaj - leĝaj informoj, aÅ­ kontaktu la OSMF-laborgrupon. + leĝaj informoj, aÅ­ kontaktu la OSMF-laborgrupon. help_page: title: Akiri helpon introduction: OpenStreetMap havas kelkajn ejojn por lerni pri la projekto, por @@ -1163,7 +1218,7 @@ eo: title: Bonvenon al OSM description: Komencu ekde ĉi tiu manlibreto ampleksanta fundamentojn de OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Manlibro por komencantoj description: Manlibro por komencantoj kreata de la komunumo (en la angla). help: @@ -1203,8 +1258,8 @@ eo: kaj ĝisdatigaj. community_driven_title: Kondukata de komunumo community_driven_html: |- - La komunumo de OpenStreetMap estas diversa, pasia kaj kreskas tagon post tago. Inter niaj kontribuantoj estas ŝatantoj de mapoj, profesiuloj de GIS, inĝenieroj prizorgantaj OSM-servilojn, helpistoj kiuj mapas areojn tuŝitajn de katastrofoj kaj multaj aliaj. Por sciigi pli pri la komunumo, vidu taglibron OpenStreetMap, taglibrojn de uzantoj, - komunumajn taglibrojn kaj la retpaĝon de OSM Fondaĵo. + La komunumo de OpenStreetMap estas diversa, pasia kaj kreskas tagon post tago. Inter niaj kontribuantoj estas ŝatantoj de mapoj, profesiuloj de GIS, inĝenieroj prizorgantaj OSM-servilojn, helpistoj kiuj mapigas areojn tuŝitajn de katastrofoj kaj multaj aliaj. Por sciigi pli pri la komunumo, vidu taglibron OpenStreetMap, taglibrojn de uzantoj, + komunumajn taglibrojn kaj la retpaĝon de la Fondaĵo OSM. open_data_title: Malfermaj datumoj open_data_html: 'OpenStreetMap estas malfermaj datumoj: vi povas uzi ĝin kiamaniere vi volas sub la kondiĉo de vi atribuos aÅ­torecon al OpenStreetMap @@ -1212,12 +1267,10 @@ eo: la verkon nur laÅ­ la sama permesilo. Vidu la paĝon pri kopirajto kaj permesilo por pli da detaloj.' legal_title: Leĝaj demandoj - legal_html: Ĉi tiu retejo kaj aliaj servoj estas formale administrataj de la OpenStreetMap Fondaĵo (OSMF) komisie de - la komunumo. Uzado de ĉiuj OSMF-servoj estas regulata per Politiko - de uzado kaj nia Politiko - de privateco. Bonvolu kontakti - kun OSMF, se vi havas iun demandon pri permesilo, kopirajto aÅ­ leĝo. + legal_html: |- + Tiu ĉi retejo kaj aliaj servoj estas formale administrataj de la Fondaĵo OpenStreetMap (OSMF) komisie de la komunumo. Uzado de ĉiuj OSMF-servoj estas regulata per nia politiko de uzado kaj nia politiko de privateco. Bonvolu kontakti kun OSMF, se vi havas iun demandon pri permesilo, kopirajto aÅ­ leĝo. +
+ OpenStreetMap, la piktogramo de lupeo kaj “State of the Map” estas registritaj varmarkoj de OSMF. partners_title: Kunlaborantoj notifier: diary_comment_notification: @@ -1418,14 +1471,14 @@ eo: kiel publikan ĉe via %{user_page}. user_page_link: uzantpaĝo anon_edits_link_text: Tie ĉi vi sciiĝis kiel. - flash_player_required: Por uzi laOpenStreetMap-redaktilon 'Potlatch', vi bezonas - la kromprogramon Flash. Vi povas elŝuti - Flash Player el Adobe.com retpaĝo. Kelkaj + flash_player_required: Por uzi la OpenStreetMap-redaktilon 'Potlatch', vi bezonas + la kromprogramon Flash. Vi povas elŝuti + Flash Player el retpaĝo de Adobe.com. Kelkaj aliaj redaktiloj estas disponeblaj por redakti OpenStreetMap. potlatch_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ŝanĝojn en Potlatch, malelektu nune elektitan linion aŭ punkton se vi redaktas en 'rekta reĝimo', aŭ alklaku butonon 'konservi', se ĝi videblas.) - potlatch2_not_configured: Potlatch 2 ne estas agordita - vidu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_not_configured: Potlatch 2 ne estas agordita - legu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 por pli da informoj potlatch2_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ilin en Potlatch 2, alklaku 'konservi'.) @@ -1444,6 +1497,7 @@ eo: where_am_i: Kie estas tio ĉi? where_am_i_title: Trovas la nunan pozicion per la foliumilo submit_text: Ek + reverse_directions_text: Inversigi direkton key: table: entry: @@ -1518,7 +1572,7 @@ eo: edit: Redakti preview: Antaŭvidi markdown_help: - title_html: Sintakse analizita per Markdown + title_html: Sintakse analizita per Markdown headings: Titoloj heading: Titolo subheading: Subtitolo @@ -1625,8 +1679,8 @@ eo: public_traces_from: Publikaj GPS-spuroj de %{user} description: Montri lastajn GPS-spurojn tagged_with: etikedita kun %{tags} - empty_html: Ankoraŭ neniu estas tie ĉi.. Alŝutu novan - spuron aŭ lernu pli pri GPS-spurado ĉe la viki-paĝo. + empty_html: Ankoraŭ nenio estas tie ĉi. Alŝutu novan + spuron aŭ sciigu pli pri GPS-spurado ĉe la viki-paĝo. delete: scheduled_for_deletion: Spuro forviŝota make_public: @@ -1833,11 +1887,11 @@ eo: html:

Kontraste kun aliaj mapoj, OpenStreetMap estas tute kreata de homoj kiel vi, kaj iu ajn povas korekti, ĝisdatigi, elŝuti kaj uzi ĝin.

Registriĝu por komenci kontribuadon. Ni sendos al vi retleteron por konfirmi vian konton.

- license_agreement: Kiam vi konfirmos vian konton, vi devos akcepti la interkonsenton + license_agreement: Kiam vi konfirmos vian konton, vi devos akcepti la interkonsenton pri kontribuado. email address: 'Retpoŝtadreso:' confirm email address: 'Konfirmi retpoŝtadreson:' - not displayed publicly: Via adreso ne estos montrata publike, vidu nian politikon pri privateco por pli da informoj. display name: 'Montrata nomo:' @@ -1958,12 +2012,12 @@ eo: email never displayed publicly: (neniam publike montrita) external auth: 'Ekstera aŭtentigo:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: kio estas tio? public editing: heading: 'Publika redaktado:' enabled: Ebligita. Ne anonima kaj rajtas redakti. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Kio estas tio ? disabled: Malebligita kaj ne rajtas redakti, ĉiuj antaŭaj redaktoj naŭ estas publikaj. @@ -1973,9 +2027,9 @@ eo: text: Nuntempe viaj redaktoj estas anonimaj kaj aliuloj ne povas sendi mesaĝojn al vi kaj vidi vian lokon. Por montri kion vi redaktis kaj ebligi al aliuloj kontakti vin per la retejo, alklaku la butonon sube. Ekde la versio 0.6 - de API, nur publikaj uzantoj povas redakti map-datumojn. (sciiĝi - kial). + de API, nur publikaj uzantoj povas redakti map-datumojn. (sciiĝi + kial). contributor terms: heading: 'Interkonsento pri kontribuado:' agreed: Vi konsentis la novan interkonsenton pri kontribuado. @@ -2302,7 +2356,7 @@ eo: createnote_disabled_tooltip: Pligrandigu por aldoni rimarkon al la mapo map_notes_zoom_in_tooltip: Pligrandigu por vidi map-rimarkoj map_data_zoom_in_tooltip: Pligrandigu por vidi map-datumoj - queryfeature_tooltip: Montri informoj pri objekto + queryfeature_tooltip: Montri informojn pri objekto queryfeature_disabled_tooltip: Pligrandigu por montri informojn pri objektoj changesets: show: @@ -2334,7 +2388,7 @@ eo: ascend: Supreniro engines: graphhopper_bicycle: Bicikle (GraphHopper) - graphhopper_car: Aŭto (GraphHopper) + graphhopper_car: Aŭte (GraphHopper) graphhopper_foot: Piede (GraphHopper) mapquest_bicycle: Bicikle (MapQuest) mapquest_car: Aŭte (MapQuest) @@ -2350,7 +2404,16 @@ eo: continue_without_exit: Antaŭen al %{name} slight_right_without_exit: Ete dekstren al %{name} offramp_right_without_exit: Veturu la elveturejon dekstre al %{name} + offramp_right_with_directions: Direktiĝu al enveturejo dekstre direkte al + %{directions} + offramp_right_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe + dekstre direkte al %{directions} + offramp_right_without_directions: Direktiĝu al enveturejo ĉe dekstre onramp_right_without_exit: Turniĝu dekstren al la elveturejo al %{name} + onramp_right_with_directions: Dekstren al enveturejo direkte al %{directions} + onramp_right_with_name_and_directions: Dekstren al enveturejo %{name} direkte + al %{directions} + onramp_right_without_directions: Dekstren al enveturejo endofroad_right_without_exit: Ĉe la fino de la vojo turniĝu dekstren al %{name} merge_right_without_exit: Turniĝu dekstren al %{name} fork_right_without_exit: Ĉe la vojforko turniĝu dekstren al %{name} @@ -2360,7 +2423,16 @@ eo: sharp_left_without_exit: Ege maldekstren al %{name} turn_left_without_exit: Turniĝu maldekstren al %{name} offramp_left_without_exit: Veturu la elveturejon maldekstre al %{name} + offramp_left_with_directions: Direktiĝu al enveturejo maldekstre direkte al + %{directions} + offramp_left_with_name_and_directions: Direktiĝu al enveturejo %{name}ĉe maldekstre + direkte al %{directions} + offramp_left_without_directions: Direktiĝu al enveturejo ĉe maldekstre onramp_left_without_exit: Turniĝu maldekstren al la elveturejo al %{name} + onramp_left_with_directions: Maldekstren al enveturejo direkte al %{directions} + onramp_left_with_name_and_directions: Maldekstren al enveturejo %{name} direkte + al %{directions} + onramp_left_without_directions: Maldekstren al enveturejo endofroad_left_without_exit: Ĉe la fino de la vojo turniĝu maldekstren al %{name} merge_left_without_exit: Turniĝu maldekstren al %{name} @@ -2368,10 +2440,10 @@ eo: slight_left_without_exit: Ete maldekstren al %{name} via_point_without_exit: (tra punkto) follow_without_exit: Sekvu %{name} - roundabout_without_exit: Ĉe trafikcirklo al %{name} + roundabout_without_exit: Ĉe trafikcirklo al elveturejo %{name} leave_roundabout_without_exit: Elveturu el trafikcirklo - %{name} stay_roundabout_without_exit: Sekvu la trafikcirklon - %{name} - start_without_exit: Komencu ĉe la fino de %{name} + start_without_exit: Komencu ĉe %{name} destination_without_exit: Celo atingita against_oneway_without_exit: Iru kontraŭ-direkte al %{name} end_oneway_without_exit: Fino de unuflanka vojo ĉe %{name} diff --git a/config/locales/es.yml b/config/locales/es.yml index e45af6361..533fe886a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -26,6 +26,7 @@ # Author: Locos epraix # Author: Luzcaru # Author: Macofe +# Author: MarcoAurelio # Author: McDutchie # Author: Mor # Author: Nemo bis @@ -441,11 +442,14 @@ es: chair_lift: Telesilla drag_lift: Telearrastre gondola: Telecabina + platter: Telesquí station: Estación de remonte aeroway: aerodrome: Aeródromo + airstrip: Aeródromo apron: Pista gate: Puerta + hangar: Hangar helipad: Helipuerto runway: Pista taxiway: Calle de rodaje @@ -481,37 +485,31 @@ es: crematorium: Crematorio dentist: Dentista doctors: Consultorio médico - dormitory: Residencia de estudiantes drinking_water: Agua potable driving_school: Autoescuela embassy: Embajada - emergency_phone: Teléfono de emergencia fast_food: Comida rápida ferry_terminal: Terminal de ferrys - fire_hydrant: Hidrante fire_station: Parque de bomberos food_court: Zona de restaurantes fountain: Fuente fuel: Gasolinera gambling: Juegos de azar grave_yard: Cementerio - gym: Gimnasio - health_centre: Centro de salud hospital: Hospital hunting_stand: Apostadero de caza ice_cream: Heladería kindergarten: Escuela infantil/guardería library: Biblioteca - market: Mercado marketplace: Mercado monastery: Monasterio motorcycle_parking: Estacionamiento para motocicletas nightclub: Club nocturno - nursery: Enfermería nursing_home: Residencia para la tercera edad office: Oficina parking: Aparcamiento parking_entrance: Entrada de estacionamiento + parking_space: Estacionamiento pharmacy: Farmacia place_of_worship: Templo police: Policía @@ -521,7 +519,6 @@ es: prison: Prisión pub: Pub public_building: Edificio público - reception_area: Área de recepción recycling: Punto de reciclaje restaurant: Restaurante retirement_home: Residencia de jubilados @@ -573,20 +570,25 @@ es: "yes": Tienda de artesanía emergency: ambulance_station: Base de ambulancias + assembly_point: Punto de reunión defibrillator: Desfibrilador landing_site: Lugar de aterrizaje de emergencia phone: Teléfono de emergencia + water_tank: Tanque de agua de emergencia + "yes": Emergencia highway: abandoned: Calle o carretera abandonada bridleway: Camino prioritario para peatones y caballos bus_guideway: Canal guiado de autobuses bus_stop: Parada de autobuses construction: Calle o carretera en construcción + corridor: Corredor cycleway: Bicisenda elevator: Ascensor emergency_access_point: Acceso de emergencia footway: Sendero ford: Vado + give_way: Señal de ceda el paso living_street: Calle residencial milestone: Hito motorway: Autovía @@ -608,6 +610,7 @@ es: services: Vía de servicio speed_camera: Radar steps: Escaleras + stop: Señal de alto street_lamp: Farola tertiary: Carretera terciaria tertiary_link: Carretera terciaria @@ -617,7 +620,6 @@ es: trunk: Vía rápida trunk_link: Enlace de vía rápida unclassified: Carretera sin clasificar - unsurfaced: Vía no pavimentada "yes": Camino historic: archaeological_site: Yacimiento arqueológico @@ -636,6 +638,7 @@ es: manor: Casa señorial memorial: Memorial mine: Mina + mine_shaft: Pozo minero monument: Monumento roman_road: Calzada romana ruins: Ruinas @@ -645,6 +648,7 @@ es: wayside_cross: Crucero wayside_shrine: Sepulcro wreck: Pecio + "yes": Sitio histórico junction: "yes": Intersección landuse: @@ -682,7 +686,6 @@ es: leisure: beach_resort: Complejo en la playa bird_hide: Observatorio de aves - club: Club common: Terreno común dog_park: Parque canino fishing: Área de pesca @@ -709,15 +712,35 @@ es: water_park: Parque acuático "yes": Ocio man_made: + beehive: Colmena + breakwater: Rompeolas + bridge: Puente + bunker_silo: Búnker + chimney: Chimenea + dyke: Dique + embankment: Terraplén + gasometer: Depósito de gas + groyne: Espigón lighthouse: Faro + mine: Mina + mineshaft: Pozo minero + petroleum_well: Pozo petrolífero + pier: Muelle pipeline: Tubería + silo: Silo + surveillance: Vigilancia tower: Torre + wastewater_plant: Planta de tratamiento de aguas + watermill: Molino hidráulico + water_well: Pozo + windmill: Molino de viento works: Fábrica "yes": Artificial military: airfield: Aeródromo militar barracks: Barracas bunker: Búnker + "yes": Ejército mountain_pass: "yes": Paso de montaña natural: @@ -763,7 +786,9 @@ es: accountant: Contable administrative: Administración architect: Arquitecto + association: Asociación company: Empresa + educational_institution: Institución educativa employment_agency: Agencia de empleo estate_agent: Inmobiliaria government: Oficina gubernamental @@ -775,9 +800,8 @@ es: "yes": Oficina place: allotments: Parcelas - block: Bloque - airport: Aeropuerto city: Ciudad + city_block: Manzana country: País county: Condado farm: Granja @@ -788,12 +812,12 @@ es: islet: Islote isolated_dwelling: Vivienda aislada locality: Paraje - moor: Páramo municipality: Municipio neighbourhood: Barrio postcode: Código postal region: Región sea: Mar + square: Plaza state: Estado o provincia subdivision: Subdivisión suburb: Suburbio @@ -805,10 +829,8 @@ es: abandoned: Ferrocarril abandonado construction: Vía ferroviaria en construcción disused: Ferrocarril en desuso - disused_station: Estación de tren en desuso funicular: Vía de funicular halt: Apeadero - historic_station: Estación de tren histórica junction: Encrucijada de vías ferroviarias level_crossing: Paso a nivel light_rail: Metro ligero @@ -834,6 +856,7 @@ es: beauty: Salón de belleza beverages: Tienda de bebidas bicycle: Tienda de bicicletas + bookmaker: Casa de apuestas books: Librería boutique: Boutique butcher: Carnicería @@ -872,12 +895,14 @@ es: hairdresser: Peluquería hardware: Ferretería hifi: Hi-Fi - insurance: Aseguradora + interior_decoration: Decoración de interiores jewelry: Joyería kiosk: Quiosco laundry: Lavandería + lottery: Lotería mall: Centro comercial market: Mercado + massage: Masaje mobile_phone: Tienda de telefonía motorcycle: Tienda de motocicletas music: Tienda de música @@ -885,21 +910,22 @@ es: optician: Óptica organic: Tienda de alimentos orgánicos outdoor: Tienda de deportes de aventura + pawnbroker: Casa de empeños pet: Tienda de mascotas pharmacy: Farmacia photo: Tienda de fotografía - salon: Salón de belleza + seafood: Mariscos second_hand: Tienda de segunda mano shoes: Zapatería - shopping_centre: Centro comercial sports: Tienda de deportes stationery: Papelería supermarket: Supermercado tailor: Sastre + tobacco: Tabaquería toys: Juguetería travel_agency: Agencia de viajes video: Videoclub - wine: Vinoteca + wine: Vinatería "yes": Tienda tourism: alpine_hut: Refugio de montaña @@ -1113,10 +1139,10 @@ es: de descolgado o preséntelo directamente en nuestra página de presentación en línea. trademarks_title_html: Marcas registradas - trademarks_1_html: OpenStreetMap, el logotipo de la lupa y el estado del mapa + trademarks_1_html: OpenStreetMap, el logotipo de la lupa y «State of the Map» son marcas registradas de la Fundación OpenStreetMap. Si tienes preguntas - sobre su uso, envíalas al grupo - de trabajo sobre licencias. + sobre su uso, consulta nuestra normativa + de marcas registradas. welcome_page: title: ¡Bienvenido! introduction_html: Bienvenido a OpenStreetMap, el mapa libre y editable del mundo. @@ -1254,13 +1280,15 @@ es: página sobre Derechos de autor y Licencia para obtener más detalles.' legal_title: Legal legal_html: "Este sitio y muchos otros servicios relacionados son gestionados - por la \nFundación OpenStreetMap (OSMF) - \nen nombre de la comunidad. El uso de todos los servicios gestionados por la - OSMF está sujeto \na nuestra \nnormativa - de uso aceptable y nuestra normativa - de privacidad\n
\nContacta - con la OSMF \nsi tienes preguntas o problemas sobre licencias, derechos - de autor u otro tema legal." + formalmente por la \nFundación OpenStreetMap + (OSMF) \nen nombre de la comunidad. El uso de todos los servicios gestionados + por la OSMF está sujeto \na nuestra \nnormativa + de uso aceptable y nuestra normativa + de privacidad\n
\nPonte en + contacto con la OSMF \nsi tienes preguntas sobre licencias, derechos de + autor u otra cuestión legal.\n
\nOpenStreetMap, el logotipo de la lupa y + «State of the Map» son marcas + registradas de la OSMF." partners_title: Socios notifier: diary_comment_notification: @@ -2453,10 +2481,10 @@ es: slight_left_without_exit: Gire un poco a la izquierda hacia %{name} via_point_without_exit: (punto intermedio) follow_without_exit: Siga %{name} - roundabout_without_exit: En la rotonda, tomar %{name} + roundabout_without_exit: En la rotonda, tomar salida hacia %{name} leave_roundabout_without_exit: Salir de la rotonda - %{name} stay_roundabout_without_exit: Permanecer en la rotonda - %{name} - start_without_exit: Iniciar al final de %{name} + start_without_exit: Comenzar en %{name} destination_without_exit: Llegue a su destino against_oneway_without_exit: Ir en contra de una vía de un solo sentido en %{name} diff --git a/config/locales/et.yml b/config/locales/et.yml index c5f87037c..ff0157747 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -428,25 +428,20 @@ et: crematorium: Krematoorium dentist: Hambaarst doctors: Arstid - dormitory: Ühiselamu drinking_water: Joogivesi driving_school: Autokool embassy: Saatkond - emergency_phone: Hädaabi telefon fast_food: Kiirtoit ferry_terminal: Praamiterminal - fire_hydrant: Tuletõrjehüdrant fire_station: Tuletõrjedepoo fountain: Purskkaev fuel: Kütus grave_yard: Surnuaed - health_centre: Tervisekeskus hospital: Haigla hunting_stand: Jahikantsel ice_cream: Jäätis kindergarten: Lasteaed library: Raamatukogu - market: Turg marketplace: Turg monastery: Klooster nightclub: Ööklubi @@ -462,7 +457,6 @@ et: prison: Vangla pub: Pubi public_building: Ühiskondlik hoone - reception_area: Vastuvõtt recycling: Jäätmekäitluspunkt restaurant: Restoran retirement_home: Vanadekodu @@ -530,7 +524,6 @@ et: street_lamp: Tänavavalgusti tertiary: Kohalik maantee traffic_signals: Valgusfoor - unsurfaced: Katteta tee "yes": Tee historic: battlefield: Lahinguväli @@ -574,7 +567,6 @@ et: vineyard: Viinamarjaistandus "yes": Maakasutus leisure: - club: Klubi dog_park: Koerapark fishing: Kalapüügipiirkond garden: Aed @@ -646,7 +638,6 @@ et: travel_agent: Reisibüroo place: allotments: Suvilad - airport: Lennujaam city: Linn country: Riik county: Maakond @@ -655,7 +646,6 @@ et: houses: Majad island: Saar islet: Saareke - moor: Raba municipality: Vald postcode: Sihtnumber sea: meri @@ -667,10 +657,8 @@ et: abandoned: Ülesvõetud raudtee construction: Ehitusjärgus raudtee disused: Mahajäetud raudtee - disused_station: Mahajäetud raudteejaam funicular: Köisraudtee halt: Rongipeatus - historic_station: Ajalooline raudteejaam junction: Raudtee ülekäigukoht level_crossing: Raudtee ülesõidukoht light_rail: Kergraudtee @@ -725,7 +713,6 @@ et: grocery: Toidupood hairdresser: Juuksur hardware: Rauakauplus - insurance: Kindlustus jewelry: Juveelipood kiosk: Kiosk laundry: Pesumaja @@ -740,9 +727,7 @@ et: pet: Lemmikloomapood pharmacy: Apteek photo: Fotopood - salon: Ilusalong shoes: Kingapood - shopping_centre: Kaubanduskeskus sports: Spordipood stationery: Kirjatarvete kauplus supermarket: Supermarket diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 1d1677e89..339d1fd3d 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -453,33 +453,26 @@ eu: crematorium: Erraustegia dentist: Dentista doctors: Medikuak - dormitory: Ikasle egoitza drinking_water: Edateko ura driving_school: Autoeskola embassy: Enbaxada - emergency_phone: Larrialdi Telefonoa fast_food: Janari Azkarra ferry_terminal: Ferry Terminala - fire_hydrant: Suteetako ur-hartunea fire_station: Suhiltzaile Egoitza food_court: Jatetxe-eremua fountain: Iturria fuel: Gasolindegia gambling: Jokoak grave_yard: Hilerria - gym: Fitness Zentroa / Gimnasioa - health_centre: Osasun Zentroa hospital: Ospitalea hunting_stand: Ehiza postua ice_cream: Izozkiak kindergarten: Haurtzaindegia library: Liburutegia - market: Merkatu marketplace: Merkatua monastery: Monastegia motorcycle_parking: Motorrentzako aparkalekua nightclub: Gau-kluba - nursery: Haurtzaindegia nursing_home: Zaharren egoitza office: Bulegoa parking: Aparkalekua @@ -493,7 +486,6 @@ eu: prison: Espetxea pub: Pub-a public_building: Eraikin publiko - reception_area: Harrera lekua recycling: Birziklatze gune restaurant: Jatetxea retirement_home: Nagusien etxea @@ -589,7 +581,6 @@ eu: trunk: Errepide nagusia trunk_link: Errepide nagusia unclassified: Sailkatu gabeko errepidea - unsurfaced: Asfaltatu gabeko errepidea "yes": Errepidea historic: archaeological_site: Aztarnategi arkeologikoa @@ -654,7 +645,6 @@ eu: leisure: beach_resort: Hondartza Konplexua bird_hide: Hegazti Aterpea - club: Kluba common: Lur Komunak dog_park: Txakurrentzako Parkea fishing: Arrantza Lekua @@ -747,8 +737,6 @@ eu: "yes": Bulegoa place: allotments: Alokatutako baratzeak - block: Blokea - airport: Aireportua city: Hiria country: Herrialdea county: Konderria @@ -760,7 +748,6 @@ eu: islet: Uhartea isolated_dwelling: Etxebizitza isolatua locality: Lokalitatea - moor: Mortua municipality: Udalerria neighbourhood: Auzoa postcode: Posta-kodea @@ -777,10 +764,8 @@ eu: abandoned: Abandonatutako Trenbidea construction: Eraikitze-lanetan dagoen trenbidea disused: Erabili gabeko trenbidea - disused_station: Erabili gabeko tren geltokia funicular: Funikularra halt: Tren Geralekua - historic_station: Tren Geltoki Historikoa junction: Trenbide lotunea level_crossing: Trenbide-pasagunea light_rail: Tren arina @@ -844,7 +829,6 @@ eu: hairdresser: Ileapaindegia hardware: Hardware-denda hifi: Hi-Fi - insurance: Aseguruak jewelry: Bitxi-denda kiosk: Kioskoa laundry: Garbitegia @@ -860,10 +844,8 @@ eu: pet: Animalia-denda pharmacy: Farmazia photo: Argazki-denda - salon: Apaindegia second_hand: Bigarren eskuko denda shoes: Zapatadenda - shopping_centre: Merkataritza-gunea sports: Kirol denda stationery: Paper-denda supermarket: Supermerkatua diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 8239f58d1..5d1dc3ec3 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -460,33 +460,26 @@ fa: crematorium: کوره dentist: دندانپزشکی doctors: پزشکان - dormitory: خوابگاه drinking_water: آب آشامیدنی driving_school: آموزشگاه رانندگی embassy: سفارت - emergency_phone: تلفن اضطراری fast_food: غذای آماده ferry_terminal: پایانه کشتی - fire_hydrant: شیر آتش‌نشانی fire_station: آتش‌نشانی food_court: پذيرايي fountain: چشمه fuel: پمپ بنزین gambling: قمار grave_yard: محوطهٔ گورستان - gym: مرکز تناسب اندام / ورزشگاه - health_centre: مركز بهداشت hospital: بیمارستان hunting_stand: شکارگاه ice_cream: بستنی فروشی kindergarten: کودکستان library: کتابخانه - market: بازار marketplace: بازار monastery: صومعه motorcycle_parking: پارکینگ موتور سیکلت nightclub: باشگاه شبانه - nursery: شیر خوارگاه nursing_home: خانه سالمندان office: دفتر parking: پارکینگ @@ -500,7 +493,6 @@ fa: prison: زندان pub: میخانه public_building: ساختمان عمومی - reception_area: محوطه پذیرش recycling: نقطه بازیافت restaurant: رستوران retirement_home: خانه ی بازنشستگی @@ -596,7 +588,6 @@ fa: trunk: بزرگراه trunk_link: بزرگراه unclassified: جادهٔ طبقه‌بندی‌نشده - unsurfaced: جاده ظاهر نشده "yes": جاده historic: archaeological_site: پایگاه باستان‌شناسی @@ -661,7 +652,6 @@ fa: leisure: beach_resort: تفریحگاه ساحلی bird_hide: محل مشاهده ی پرندگان - club: کلوپ common: سرزمین مشترک dog_park: پارک سگ fishing: منطقهٔ ماهی‌گیری @@ -754,8 +744,6 @@ fa: "yes": دفتر place: allotments: سهم - block: بستن - airport: فرودگاه city: شهر بزرگ country: کشور county: شهرستان @@ -767,7 +755,6 @@ fa: islet: جزیره کوچک isolated_dwelling: خانه پیش ساخته locality: محل - moor: دشت municipality: شهرداری neighbourhood: محله postcode: کدپستی @@ -784,10 +771,8 @@ fa: abandoned: راه‌آهن رهاشده construction: راه‌آهن در دست ساخت disused: راه‌آهن منسوخ - disused_station: ایستگاه منسوخ راه‌آهن funicular: راه‌آهن کابلی halt: ایستگاه قطار - historic_station: ایستگاه تاریخی راه‌آهن junction: اتصال راه‌آهن level_crossing: محل تقاطع دو خط راه‌آهن light_rail: ریل سبک @@ -851,7 +836,6 @@ fa: hairdresser: سلمانی hardware: فروشگاه سخت افزار hifi: Hi-Fi - insurance: بیمه jewelry: فروشگاه طلا و جواهر kiosk: فروشگاه کیوسک laundry: خشکشویی @@ -867,10 +851,8 @@ fa: pet: فروشگاه حیوانات خانگی pharmacy: داروخانه photo: فروشگاه عکس - salon: سالن زیبایی second_hand: سمساری shoes: فروشگاه کفش - shopping_centre: مرکز خرید sports: فروشگاه ورزشی stationery: فروشگاه لوازم التحریر supermarket: سوپرمارکت diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 9398545c7..c9026357a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -19,6 +19,7 @@ # Author: Nemo bis # Author: Nike # Author: Olli +# Author: Pahkiqaz # Author: Pyscowicz # Author: Ramilehti # Author: Ruila @@ -431,12 +432,17 @@ fi: chair_lift: Tuolihissi drag_lift: Vetohissi gondola: Gondolihissi + platter: Hiihtohissi station: Ilmarata-asema + t-bar: Ankkurihissi aeroway: aerodrome: Lentokenttä + airstrip: Kiitorata apron: Asemataso gate: Portti + hangar: Hangaari helipad: Helikopterikenttä + parking_position: Parkkialue runway: Kiitorata taxiway: Rullaustie terminal: Terminaali @@ -471,37 +477,31 @@ fi: crematorium: Krematorio dentist: Hammaslääkäri doctors: Lääkäreitä - dormitory: Asuntola drinking_water: Juomavesi driving_school: Autokoulu embassy: Lähetystö - emergency_phone: Hätäpuhelin fast_food: Pikaruokaravintola ferry_terminal: Lauttaterminaali - fire_hydrant: Paloposti fire_station: Paloasema food_court: Elintarviketori fountain: Lähde fuel: Polttoaine gambling: Uhkapelaus grave_yard: Hautausmaa - gym: Liikuntakeskus / kuntosali - health_centre: Terveyskeskus hospital: Sairaala hunting_stand: Metsästyslava ice_cream: Jäätelö kindergarten: Päiväkoti library: Kirjasto - market: Tori marketplace: Tori monastery: Luostari motorcycle_parking: Moottoripyöräpysäköinti nightclub: Yökerho - nursery: Päiväkoti nursing_home: Hoitokoti office: Toimisto parking: Parkkipaikka parking_entrance: Pysäköintialueen sisäänkäynti + parking_space: Parkkipaikka pharmacy: Apteekki place_of_worship: Kirkko, temppeli, pyhä paikka police: Poliisi @@ -511,7 +511,6 @@ fi: prison: Vankila pub: Pubi public_building: Julkinen rakennus - reception_area: Vastaanottoalue recycling: Kierrätyspaikka restaurant: Ravintola retirement_home: Vanhainkoti @@ -536,6 +535,7 @@ fi: village_hall: Kyläkoti waste_basket: Roskakori waste_disposal: Jätehuolto + water_point: vesipiste youth_centre: Nuorisokeskus boundary: administrative: Hallinnollinen raja @@ -563,25 +563,31 @@ fi: "yes": Käsityömyymälä emergency: ambulance_station: Ensihoitoasema + assembly_point: kohtaamispaikka defibrillator: Defibrillaattori landing_site: Hätälaskualue phone: Hätäpuhelin + water_tank: hätävesitankki + "yes": Hätä highway: abandoned: Hylätty valtatie bridleway: Ratsastustie bus_guideway: Ohjattu linja-autokaista bus_stop: Bussipysäkki construction: Rakenteilla oleva tie + corridor: käytävä cycleway: Pyörätie elevator: Hissi emergency_access_point: Hätätilapaikka footway: Polku ford: Kahluupaikka + give_way: kärkikolmio living_street: Asuinkatu milestone: Virstanpylväs motorway: Moottoritie motorway_junction: Moottoritien liittymä motorway_link: Moottoritie + passing_place: ohituspaikka path: Polku pedestrian: Jalkakäytävä platform: Asemalaituri @@ -598,6 +604,7 @@ fi: services: Moottoritiepalvelut speed_camera: Nopeuskamera steps: Portaat + stop: Stopmerkki street_lamp: Katuvalaisin tertiary: Yhdystie tertiary_link: Yhdystie @@ -607,7 +614,6 @@ fi: trunk: Valtatie trunk_link: Valtatie unclassified: Luokittelematon tie - unsurfaced: Päällystämätön tie "yes": Tie historic: archaeological_site: Arkeologinen kohde @@ -626,6 +632,7 @@ fi: manor: Kartano memorial: Muistomerkki mine: Kaivos + mine_shaft: kaivostunneli monument: Muistomerkki roman_road: Roomalainen tie ruins: Rauniot @@ -635,6 +642,7 @@ fi: wayside_cross: Tieristi wayside_shrine: Tienvarsialttari wreck: Hylky + "yes": historiallinen paikka junction: "yes": Risteys landuse: @@ -672,7 +680,6 @@ fi: leisure: beach_resort: Rantakohde bird_hide: Linnunpesä - club: Klubi common: Yhteinen maa dog_park: Koirapuisto fishing: Kalastusalue @@ -699,15 +706,32 @@ fi: water_park: Vesipuisto "yes": Vapaa-aika man_made: + beehive: ampiaispesä + bridge: Silta + bunker_silo: Bunkkeri + chimney: piippu + crane: Nosturi + dyke: Pato + flagpole: Lipputanko + gasometer: Kaasusäiliö lighthouse: Majakka + mast: Masto + mine: Kaivos + mineshaft: kaivostunneli + pier: Laituri pipeline: Putkisto + silo: Siilo + surveillance: vartiointi tower: Torni + water_tower: Vesitorni + water_well: Kaivo works: Tehdas "yes": ihmisen tekemä military: airfield: Sotilaskenttä barracks: Kasarmi bunker: Bunkkeri + "yes": armeija mountain_pass: "yes": Vuoristosola natural: @@ -758,6 +782,7 @@ fi: estate_agent: Kiinteistönvälittäjä government: Virasto insurance: Vakuutusyhtiö + it: IT toimisto lawyer: Asianajotoimisto ngo: Kansalaisjärjestö telecommunication: Tietoliikenneyritys @@ -765,9 +790,8 @@ fi: "yes": Toimisto place: allotments: Siirtolapuutarha - block: Este - airport: Lentokenttä city: Kaupunki + city_block: kortteli country: Maa county: Piirikunta farm: Maatila @@ -778,12 +802,12 @@ fi: islet: Saareke isolated_dwelling: Erakkomaja locality: Paikkakunta - moor: Nummi municipality: Kunta neighbourhood: Naapurusto postcode: Postinumero region: Alue sea: Meri + square: Neliö state: Osavaltio subdivision: Naapurusto suburb: Lähiö @@ -795,10 +819,8 @@ fi: abandoned: Hylätty rautatie construction: Rakenteilla oleva rautatie disused: Käyttämätön rautatie - disused_station: Käytöstä poistunut rautatieasema funicular: Funikulaari halt: Seisake - historic_station: Historiallinen juna-asema junction: Rautatien risteys level_crossing: Tasoristeys light_rail: Pikaraitiotie @@ -824,6 +846,7 @@ fi: beauty: Kosmetiikkakauppa beverages: Juomakauppa bicycle: Polkupyöräkauppa + bookmaker: kirjanmerkki books: Kirjakauppa boutique: Puoti butcher: Lihakauppa @@ -862,12 +885,12 @@ fi: hairdresser: Kampaamo hardware: Rautakauppa hifi: Elektroniikkakauppa - insurance: Vakuutus jewelry: Korukauppa kiosk: Kioski laundry: Pesula mall: Ostoskeskus market: Tori + massage: hieronta mobile_phone: Matkapuhelinkauppa motorcycle: Moottoripyöräkauppa music: Musiikkikauppa @@ -875,21 +898,22 @@ fi: optician: Optikko organic: Luomukauppa outdoor: Ulkoiluvälinekauppa + paint: Maalikauppa pet: Eläinkauppa pharmacy: Apteekki photo: Valokuvausliike - salon: Salonki second_hand: Osto- ja myyntiliike shoes: Kenkäkauppa - shopping_centre: Ostoskeskus sports: Urheilukauppa stationery: Paperikauppa supermarket: Supermarketti tailor: Räätäli + tobacco: Tupakkakauppa toys: Lelukauppa travel_agency: Matkatoimisto + tyres: Rengaskauppa video: Videokauppa - wine: Alkoholikauppa + wine: Viinikauppa "yes": Kauppa tourism: alpine_hut: Alppimaja @@ -959,9 +983,9 @@ fi: alt_text: OpenStreetMap-logo home: Siirry kotipaikkaan logout: Kirjaudu ulos - log_in: kirjaudu sisään + log_in: Kirjaudu sisään log_in_tooltip: Kirjaudu sisään tunnuksellasi - sign_up: rekisteröidy + sign_up: Rekisteröidy start_mapping: Liity mukaan sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta edit: Muokkaa @@ -1106,8 +1130,7 @@ fi: tai ilmoittaa suoraan. trademarks_title_html: Tavaramerkit trademarks_1_html: OpenStreetMap, suurennuslasilogo ja maailmankartta ovat OpenStreetMap-säätiön - rekisteröityjä tavaramerkkejä. Lisensointiryhmämme - (englanniksi) vastaa mielellään kysymyksiin tavaramerkkien käytöstä. + rekisteröityjä tavaramerkkejä. Jos sinulla on kysyttävää tutustu tavaramerkkisivuun. welcome_page: title: Tervetuloa! introduction_html: 'Tervetuloa OpenStreetMapiin: ilmaiseen ja vapaasti muokattavaan @@ -1238,10 +1261,12 @@ fi: legal_title: Lakitekninen jako legal_html: "Tämä ja monet muut OSM-sivustot ovat muodollisesti OpenStreetMap-säätiön (OSMF) hallinnoimia OSM-yhteisön puolesta. Kaikkien näiden sivustojen käyttöön - sovelletaan \nhyväksytyn + sovelletaan \nsallitun käytön käytäntöjä ja tietosuojakäytäntöä (molemmat sisällöt saatavilla vain englanniksi).\n
\nOta - yhteys OSMF:ään lisensointi-, tekijänoikeus- ja muissa lakiteknisissä kysymyksissä." + yhteys OSMF:ään lisensointi-, tekijänoikeus- ja muissa lakiteknisissä kysymyksissä.\n
\nNimi + OpenStreetMap, suurennuslasilogo ja slogan State of the Map ovat säätiön + rekisteröimiä tavaramerkkejä." partners_title: Kumppanit notifier: diary_comment_notification: @@ -1468,9 +1493,10 @@ fi: get_directions_title: Hae reittiohjeet kahden paikan välille from: Lähtöpaikka to: Määränpää - where_am_i: Missä tämä on? + where_am_i: Mikä tämä paikka on? where_am_i_title: Määrittää nykyisen sijainnin hakukoneella submit_text: Hae + reverse_directions_text: Vastakkainen suunta key: table: entry: @@ -1785,7 +1811,7 @@ fi: email or username: 'Sähköpostiosoite tai käyttäjätunnus:' password: 'Salasana:' openid: '%{logo} OpenID:' - remember: Muista minut + remember: Pidä minut sisäänkirjautuneena lost password link: Unohditko salasanasi? login_button: Kirjaudu sisään register now: Rekisteröidy @@ -1875,7 +1901,7 @@ fi: external auth: 'Kolmannen osapuolen todennus:' password: 'Salasana:' confirm password: 'Salasana uudelleen:' - use external auth: 'Voit myös kirjautua jonkun muun palvelun tunnuksilla:' + use external auth: Voit myös kirjautua jonkun muun palvelun tunnuksilla auth no password: Mikäli kirjaudut sisään kolmannen osapuolen palveluiden avulla, sinun ei tarvitse luoda itsellesi salasanaa, mutta jotkin ylimääräiset työkalut tai palvelimet voivat silti vaatia sitä. @@ -1927,7 +1953,7 @@ fi: notes: Karttailmoitukset remove as friend: Poista kavereista add as friend: Lisää kaveriksi - mapper since: 'Liittyi palveluun:' + mapper since: 'Rekisteröitymispäivämäärä:' ago: (%{time_in_words_ago} sitten) ct status: 'Osallistumisehdot:' ct undecided: Ei valittu @@ -2345,9 +2371,9 @@ fi: intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille, jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita selite ongelmasta. - advice: Merkintäsi on julkinen ja sitä voidaan käyttää kartan päivittämiseen, - joten älä kirjoita henkilökohtaisia tietoja tai tietoja tekijänoikeuksin - suojatuista karttoista tai hakemistotiedoista. + advice: Merkintä näkyy julkisesti kaikille, älä kirjoita henkilökohtaisia + tietoja. Aineistoa kehitetään palautteen perusteella, minkä takia älä käytä + lähteenä muita karttoja tai hakemistoja. add: Lähetä ilmoitus show: anonymous_warning: Tässä karttailmoituksessa on kommentteja tunnistautumattomilta @@ -2389,6 +2415,7 @@ fi: turn_left_without_exit: Käänny vasemmalle tielle %{name} offramp_left_without_exit: Poistu vasemmalle liittymään tielle %{name} onramp_left_without_exit: Käänny vasemmalle liittymään tielle %{name} + onramp_left_without_directions: Käänny vasemmalle rampille endofroad_left_without_exit: Tienpäässä käänny vasemmalle tielle %{name} merge_left_without_exit: Liity vasemmalle tielle %{name} fork_left_without_exit: Liittymässä ryhmity vasemmalle suuntaan %{name} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index dcb2e8959..6da57c1c6 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -461,12 +461,19 @@ fr: chair_lift: Télésiège drag_lift: Téléski gondola: Télécabine + platter: Monte-plat + pylon: Pylône station: Gare de télécabine + t-bar: Monte-barre en T aeroway: aerodrome: Aérodrome + airstrip: Piste d’atterrissage apron: Aire de stationnement gate: Porte + hangar: Hangar helipad: Héliport + holding_position: Position d’attente + parking_position: Place de parking runway: Piste taxiway: Piste de circulation d’un aéroport terminal: Terminal @@ -501,37 +508,32 @@ fr: crematorium: Crématorium dentist: Dentiste doctors: Docteurs - dormitory: Dortoir drinking_water: Eau potable driving_school: École de conduite embassy: Ambassade - emergency_phone: Borne d’appel d’urgence fast_food: Restauration rapide ferry_terminal: Terminal de ferry - fire_hydrant: Bouche d’incendie fire_station: Caserne des pompiers food_court: Aire de restauration fountain: Fontaine fuel: Carburant gambling: Jeu d’argent grave_yard: Cimetière - gym: Fitness / gymnastique - health_centre: Centre de santé / dispensaire + grit_bin: Bac à sel hospital: Hôpital hunting_stand: Stand de tir ice_cream: Glacier kindergarten: Jardin d’enfant library: Bibliothèque - market: Marché marketplace: Place de marché monastery: Monastère motorcycle_parking: Parking à motos nightclub: Boîte de nuit - nursery: Nurserie nursing_home: Maison de retraite médicalisée office: Bureau parking: Parking parking_entrance: Entrée d’un parking + parking_space: Place de parking pharmacy: Pharmacie place_of_worship: Lieu de culte police: Police @@ -541,7 +543,6 @@ fr: prison: Prison pub: Pub public_building: Bâtiment public - reception_area: Zone de livraison recycling: Point de recyclage restaurant: Restaurant retirement_home: Maison de retraite @@ -566,6 +567,7 @@ fr: village_hall: Salle municipale waste_basket: Poubelle waste_disposal: Élimination des déchets + water_point: Point d’eau youth_centre: Centre pour la jeunesse boundary: administrative: Limite administrative @@ -574,6 +576,7 @@ fr: protected_area: Zone protégée bridge: aqueduct: Aqueduc + boardwalk: Promenade suspension: Pont suspendu swing: Pont tournant viaduct: Viaduc @@ -593,25 +596,31 @@ fr: "yes": Boutique d’artisanat emergency: ambulance_station: Dépôt d’ambulances + assembly_point: Point de rassemblement defibrillator: Défibrillateur landing_site: Terrain d’atterrissage d’urgence phone: Borne d’appel d’urgence + water_tank: Citerne d’eau d’urgence + "yes": Urgence highway: abandoned: Autoroute abandonnée bridleway: Chemin pour cavaliers bus_guideway: Voie de bus guidé / trolley bus_stop: Arrêt de bus construction: Route en construction + corridor: Couloir cycleway: Piste cyclable elevator: Ascenseur emergency_access_point: Point d’accès d’urgence footway: Chemin piéton ford: Gué + give_way: Panneau cédez le passage living_street: Rue en zone de rencontre milestone: Borne kilométrique motorway: Autoroute motorway_junction: Sortie / Échangeur motorway_link: Bretelle d’autoroute + passing_place: Endroit de passage path: Chemin pedestrian: Rue piétonne platform: Plateforme @@ -628,6 +637,7 @@ fr: services: Services autoroutiers speed_camera: Radar de vitesse steps: Escalier + stop: Signe d'arrêt street_lamp: Lampadaire tertiary: Route tertiaire tertiary_link: Route tertiaire @@ -636,8 +646,8 @@ fr: trail: Sentier trunk: Voie express trunk_link: Voie express + turning_loop: Virage en boucle unclassified: Route mineure - unsurfaced: Route non revêtue "yes": Route historic: archaeological_site: Site archéologique @@ -656,6 +666,7 @@ fr: manor: Manoir memorial: Mémorial mine: Mine + mine_shaft: Puits de mine monument: Monument roman_road: Voie romaine ruins: Ruines @@ -665,6 +676,7 @@ fr: wayside_cross: Calvaire wayside_shrine: Oratoire wreck: Épave + "yes": Site historique junction: "yes": Intersection / carrefour landuse: @@ -702,9 +714,9 @@ fr: leisure: beach_resort: Station balnéaire bird_hide: Observatoire ornithologique - club: Club common: Terrains communaux dog_park: Parc à chiens + firepit: Foyer fishing: Zone de pêche fitness_centre: Centre de fitness fitness_station: Atelier de parcours de santé @@ -729,15 +741,46 @@ fr: water_park: Parc aquatique "yes": Loisirs man_made: + adit: Galerie d’accès + beacon: Phare + beehive: Ruche + breakwater: Brise-lames + bridge: Pont + bunker_silo: Bunker + chimney: Cheminée + crane: Grue + dolphin: Poste d’amarrage + dyke: Digue + embankment: Talus + flagpole: Mât + gasometer: Gazomètre + groyne: Épi de plage + kiln: Four à poterie lighthouse: Phare + mast: Pylône + mine: Mine + mineshaft: Puits de mine + monitoring_station: Station de surveillance + petroleum_well: Puits de pétrole + pier: Jetée pipeline: Pipeline + silo: Silo + storage_tank: Citerne de stockage + surveillance: Surveillance tower: Tour + wastewater_plant: Station de traitement des eaux usées + watermill: Moulin à eau + water_tower: Château d’eau + water_well: Puits + water_works: Système hydraulique + windmill: Moulin à vent works: Usine "yes": Créé par l’homme military: airfield: Terrain d’aviation militaire barracks: Caserne bunker: Bunker + "yes": Militaire mountain_pass: "yes": Col de montagne natural: @@ -783,11 +826,14 @@ fr: accountant: Comptable administrative: Administration architect: Architecte + association: Association company: Entreprise + educational_institution: Institution éducative employment_agency: Agence pour l’emploi estate_agent: Agent immobilier government: Administration publique insurance: Agence d’assurance + it: Bureau informatique lawyer: Avocat ngo: Agence d’une ONG telecommunication: Agence de télécommunication @@ -795,9 +841,8 @@ fr: "yes": Bureau place: allotments: Jardins familiaux - block: Bloc - airport: Aéroport city: Ville + city_block: Bloc urbain country: Pays county: Comté farm: Ferme @@ -808,12 +853,13 @@ fr: islet: Îlot isolated_dwelling: Lieu-dit habité locality: Lieu-dit - moor: Maure municipality: Municipalité neighbourhood: Quartier postcode: Code postal + quarter: Trimestre region: Région sea: Mer + square: Square state: État / province subdivision: Subdivision suburb: Quartier @@ -825,10 +871,8 @@ fr: abandoned: Voie ferrée abandonnée construction: Voie ferrée en construction disused: Voie ferrée désaffectée - disused_station: Gare ferroviaire désaffectée funicular: Funiculaire halt: Arrêt de train - historic_station: Gare ferroviaire historique junction: Jonction ferroviaire level_crossing: Passage à niveau light_rail: Voie ferrée légère @@ -854,6 +898,7 @@ fr: beauty: Magasin de produits de beauté beverages: Magasin de boissons bicycle: Magasin de vélos + bookmaker: Bureau de paris books: Librairie boutique: Boutique de mode butcher: Boucherie @@ -892,12 +937,16 @@ fr: hairdresser: Coiffeur hardware: Quincaillerie hifi: Magasin Hi-Fi - insurance: Assurance + houseware: Magasin d’articles ménagers + interior_decoration: Décoration intérieure jewelry: Bijouterie kiosk: Kiosque + kitchen: Magasin de cuisine laundry: Blanchisserie + lottery: Loto mall: Centre commercial market: Marché + massage: Massage mobile_phone: Boutique de téléphones mobiles motorcycle: Magasin de motos music: Boutique de musique / disquaire @@ -905,21 +954,27 @@ fr: optician: Opticien organic: Magasin d’alimentation bio outdoor: Magasin d’articles pour activité en plein air + paint: Galerie de peinture + pawnbroker: Prêteur sur gages pet: Animalerie pharmacy: Pharmacie photo: Boutique de photographie - salon: Salon de beauté + seafood: Fruits de mer second_hand: Boutique de produits d’occasion shoes: Magasin de chaussures - shopping_centre: Centre commercial sports: Magasin de d’articles de sport stationery: Papeterie supermarket: Supermarché tailor: Tailleur + ticket: Billetterie + tobacco: Bureau de tabac toys: Magasin de jouets travel_agency: Agence de voyage + tyres: Magasin de pneus + vacant: Commerce vaquant + variety_store: Magasin de variétés video: Magasin de vidéos - wine: Vendeur d’alcool à emporter / caviste + wine: Caviste "yes": Boutique tourism: alpine_hut: Refuge @@ -943,6 +998,7 @@ fr: viewpoint: Point de vue zoo: Zoo tunnel: + building_passage: Passage de bâtiment culvert: Buse "yes": Tunnel waterway: @@ -1140,9 +1196,8 @@ fr: trademarks_title_html: Marques trademarks_1_html: OpenStreetMap, le logo loupe et State of the Map sont des marques déposées de l'OpenStreetMap Foundation. Si vous avez des questions - à propos de l’utilisation de ces marques, merci de prendre contact avec le - Licence - Working Group. + à propos de l’utilisation de ces marques, merci de consulter notre règlement + concernant les marques déposées. welcome_page: title: Bienvenue ! introduction_html: Bienvenue à OpenStreetMap, la carte du monde libre et éditable. @@ -1292,7 +1347,9 @@ fr: des usages acceptés et à notre Politique de confidentialité.\n
\nVeuillez contacter l’OSMF \nsi vous avez des questions ou problèmes concernant les licences, - les droits d’auteur ou d’autres aspects juridiques." + les droits d’auteur ou d’autres aspects juridiques.\n
\nOpenStreetMap, le + logo avec la loupe et ''State of the Map'' sont des + marques déposées de OSMF." partners_title: Partenaires notifier: diary_comment_notification: @@ -1535,6 +1592,7 @@ fr: where_am_i: Où est-ce ? where_am_i_title: Décrit la position actuelle en utilisant le moteur de recherche submit_text: Aller + reverse_directions_text: Inverser les directions key: table: entry: @@ -1633,8 +1691,8 @@ fr: create: upload_trace: Envoyer la trace GPS trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration - dans la base de données. Ceci prend en général moins d’une demie heure et - un courriel vous sera envoyé lorsque cela sera terminé. + dans la base de données. Ceci prend en général moins d’une demi-heure et un + courriel vous sera envoyé lorsque ce sera terminé. edit: title: Modifier la trace %{name} heading: Modifier la trace %{name} @@ -2480,7 +2538,15 @@ fr: continue_without_exit: Continuez sur %{name} slight_right_without_exit: Tournez légèrement à droite sur %{name} offramp_right_without_exit: Prendre la bretelle à droite sur %{name} + offramp_right_with_directions: Prendre la bretelle à droite vers %{directions} + offramp_right_with_name_and_directions: Prendre la bretelle à droite sur %{name}, + vers %{directions} + offramp_right_without_directions: Prendre la bretelle à droite onramp_right_without_exit: Tourner à droite sur la bretelle sur %{name} + onramp_right_with_directions: Tourner à droite sur la bretelle vers %{directions} + onramp_right_with_name_and_directions: Tourner à droite sur la bretelle sur + %{name}, vers %{directions} + onramp_right_without_directions: Tourner à droite sur la bretelle endofroad_right_without_exit: À la fin de la route, tourner à droite sur %{name} merge_right_without_exit: Rejoindre à droite sur %{name} fork_right_without_exit: À la bifurcation, tourner à droite sur %{name} @@ -2490,7 +2556,15 @@ fr: sharp_left_without_exit: Tournez vivement à gauche sur %{name} turn_left_without_exit: Tournez à gauche sur %{name} offramp_left_without_exit: Prendre la bretelle de gauche jusque %{name} + offramp_left_with_directions: Prendre la bretelle à gauche vers %{directions} + offramp_left_with_name_and_directions: Prendre la bretelle à gauche sur %{name}, + vers %{directions} + offramp_left_without_directions: Prendre la bretelle à gauche onramp_left_without_exit: Tourner à gauche sur la bretelle sur %{name} + onramp_left_with_directions: Tourner à gauche sur la bretelle vers %{directions} + onramp_left_with_name_and_directions: Tourner à gauche sur la bretelle sur + %{name}, vers %{directions} + onramp_left_without_directions: Tourner à gauche sur la bretelle endofroad_left_without_exit: À la fin de la route, tourner à gauche sur %{name} merge_left_without_exit: Rejoindre à gauche sur %{name} fork_left_without_exit: À la bifurcation, tourner à gauche sur %{name} diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 66dff0829..5bd3060b1 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -388,22 +388,17 @@ fur: crematorium: Crematori dentist: Dentist doctors: Dotôrs - dormitory: Dormitori drinking_water: Aghe potabil driving_school: Scuele guide embassy: Ambassade - emergency_phone: Telefon di emergjence ferry_terminal: Terminâl traghets - fire_hydrant: Idrant fire_station: Stazion dai pompîrs fountain: Fontane fuel: Stazion di riforniment - health_centre: Centri pe salût hospital: Ospedâl ice_cream: Gjelato kindergarten: Scuelute library: Biblioteche - market: Marcjât nightclub: Club noturni office: Ufizi parking: Parcament @@ -470,7 +465,6 @@ fur: tertiary: Strade terziarie tertiary_link: Strade terziarie track: Piste - unsurfaced: Strade no asfaltade historic: archaeological_site: Sît archeologic battlefield: Cjamp di bataie @@ -551,7 +545,6 @@ fur: travel_agent: Agjenzie di viaçs "yes": Ufizi place: - airport: Aeropuart city: Citât country: Paîs county: Contee @@ -575,7 +568,6 @@ fur: abandoned: Ferade bandonade construction: Ferade in costruzion disused: Ferade bandonade - disused_station: Stazion de ferade bandonade halt: Fermade de ferade level_crossing: Passaç a nivel light_rail: Ferade lizere @@ -598,7 +590,6 @@ fur: electronics: Buteghe di eletroniche gallery: Galarie di art hairdresser: Piruchîr o barbîr - insurance: Assicurazion jewelry: Buteghe dal oresin laundry: Lavandarie market: Marcjât diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 98ad15aeb..21a5a5fc2 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -175,28 +175,22 @@ fy: crematorium: Krematoariurn dentist: Toskedokter doctors: Dokter - dormitory: Studintehûs drinking_water: Drinkwetter driving_school: Rydskoalle embassy: Ambassade fast_food: Fast food - fire_hydrant: Brânkraan fire_station: Brânwar food_court: Foodcourt fountain: Fontein fuel: Brânstof grave_yard: Begraafplak - gym: Fitnesssintrum - health_centre: Sûnenssintrum hospital: Sikehûs hunting_stand: Jachttoer ice_cream: Iis kindergarten: Beukerskoalle library: Bibleteek - market: Merk marketplace: Merkplein nightclub: Nachtklub - nursery: Pjutteboartersplak nursing_home: Ferpleechhûs office: Kantoar parking: Parkeare @@ -207,7 +201,6 @@ fy: preschool: Pjutteboartersplak of beukerskoalle prison: Finzenis pub: Kafee - reception_area: Resepsje restaurant: Restaurant retirement_home: Bejaardetehûs sauna: Sauna @@ -334,7 +327,6 @@ fy: travel_agent: Reisburo "yes": Kantoar place: - airport: Lofthaven city: Stêd country: Lân county: Distrikt @@ -344,7 +336,6 @@ fy: houses: Huzen island: Eilân locality: Plak - moor: Fean municipality: Gemeente neighbourhood: Wyk postcode: Postkoade @@ -367,7 +358,6 @@ fy: greengrocer: Grienteboer hairdresser: Kapper hifi: Hi-fi - insurance: Fersekering jewelry: Juwelier laundry: Waskerij market: Merk @@ -375,9 +365,7 @@ fy: pet: Bistewinkel pharmacy: Apoteek photo: Fotowinkel - salon: Skientmesalon second_hand: Kringloopwinkel - shopping_centre: Winkelsintrum supermarket: Supermerk tailor: Kleanmakker travel_agency: Reisburo diff --git a/config/locales/ga.yml b/config/locales/ga.yml index ed6c978a7..89d899cf8 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -438,33 +438,26 @@ ga: crematorium: Créamatóiriam dentist: Fiaclóir doctors: Dochtúirí - dormitory: Áras cónaithe drinking_water: Uisce Inólta driving_school: Scoil Tiomána embassy: Ambasáid - emergency_phone: Fón Éigeandála fast_food: Mearbhia ferry_terminal: Críochfort Farantóireachta - fire_hydrant: Béal Tuile fire_station: Stáisiún Dóiteáin food_court: Cúirt Bhia fountain: Scairdeán/fuarán fuel: Breosla gambling: Cearrbhachas grave_yard: Reilg - gym: Spórtlann / Giom - health_centre: Ionad Sláinte hospital: Ospidéal hunting_stand: Árdán seilge ice_cream: Uachtar reoite kindergarten: Naíonra library: Leabharlann - market: Margadh marketplace: Áit mhargaidh monastery: Mainistir motorcycle_parking: Páirceáil do Ghluaisrothair nightclub: Club Oíche - nursery: Naíonra nursing_home: Teach Altranais office: Oifig parking: Páirceáil @@ -478,7 +471,6 @@ ga: prison: Príosún pub: Teach tábhairne public_building: Foirgneamh Poiblí - reception_area: Limistéar Fáilte recycling: Ionad Athchúrsála restaurant: Bialann retirement_home: Áras Seanóirí @@ -574,7 +566,6 @@ ga: trunk: Mórbhóthar trunk_link: Mórbhóthar unclassified: Bóthar Neamhaicmithe - unsurfaced: Bóthar Gan Dromhchla "yes": Bóthar historic: archaeological_site: Láithreán Seandálaíochta @@ -639,7 +630,6 @@ ga: leisure: beach_resort: Ionad Saoire Cois Trá bird_hide: Folachán Éanbhreathnóireachta - club: Club common: Coimín dog_park: Páirc do Mhadraí fishing: Áit Iascaireachta @@ -732,8 +722,6 @@ ga: "yes": Oifig place: allotments: Cuibhrinn - block: Bloc - airport: Aerfort city: Cathair country: Tír county: Contae @@ -745,7 +733,6 @@ ga: islet: Oileáinín isolated_dwelling: Áit Chónaithe Iargúlta locality: Dúiche - moor: Móinteán municipality: Cathair bhardais/baile bardais neighbourhood: Comharsanacht postcode: Cód poist @@ -762,10 +749,8 @@ ga: abandoned: Iarnród Tréigthe construction: Iarnród á Thógáil disused: Iarnróid atá As Úsáid - disused_station: Stáisiún Iarnróid As Úsáid funicular: Iarnród Cáblach halt: Stad Traenach - historic_station: Stáisiún Iarnróid Stairiúil junction: Acomhal Iarnróid level_crossing: Crosaire Comhréidh light_rail: Iarnród Éadrom @@ -829,7 +814,6 @@ ga: hairdresser: Gruaigeadóir hardware: Siopa Crua-earraí hifi: Hi-Fi - insurance: Árachas jewelry: Siopa Seodóireachta kiosk: Both laundry: Neachtlann @@ -845,10 +829,8 @@ ga: pet: Siopa Peataí pharmacy: Cógaslann photo: Siopa Grianghrafadóireachta - salon: Ionad áilleachta/sciamhlann second_hand: Siopa Earraí Athláimhe shoes: Siopa Bróg - shopping_centre: Ionad Siopadóireachta sports: Siopa Spóirt stationery: Siopa Stáiseanóireachta supermarket: Ollmhargadh diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 09c5570f7..3b9018f32 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -459,33 +459,26 @@ gd: crematorium: Luaithreachan dentist: Fiaclaire doctors: Lighichean - dormitory: Suain-lann drinking_water: Uisge-òil driving_school: Sgoil draibhidh embassy: Ambasaid - emergency_phone: Fòn-èiginn fast_food: Biadh luath ferry_terminal: Port-aiseig - fire_hydrant: Tobar-sràide fire_station: Stèisean-smàlaidh food_court: Talla bìdh fountain: Fuaran fuel: Connadh gambling: Cearrachas grave_yard: Cladh - gym: Taigh-sunntais - health_centre: Ionad-slàinte hospital: Ospadal hunting_stand: Stannd seilge ice_cream: Reòiteagan kindergarten: Sgoil-àraich library: Leabhar-lann - market: Margadh marketplace: Ionad-margaidh monastery: Manachainn motorcycle_parking: Ionad-pàircidh motar-baidhseagal nightclub: Club-oidhche - nursery: Sgoil-àraich nursing_home: Taigh-altraim office: Oifis parking: Ionad-pàircidh @@ -499,7 +492,6 @@ gd: prison: Prìosan pub: Taigh-seinnse public_building: Togalach poblach - reception_area: Ionad-fàilte recycling: Ionad ath-chuairteachaidh restaurant: Taigh-bìdh retirement_home: Taigh-cluaineis @@ -595,7 +587,6 @@ gd: trunk: Prìomh-rathad trunk_link: Prìomh-rathad unclassified: Rathad neo-sheòrsaichte - unsurfaced: Rathad gun uachdar "yes": Rathad historic: archaeological_site: Làrach àrc-eòlach @@ -660,7 +651,6 @@ gd: leisure: beach_resort: Tràigh-turasachd bird_hide: Crò-eun - club: Club common: Fearann coitcheann dog_park: Pàirc-chon fishing: Raon iasgaich @@ -753,8 +743,6 @@ gd: "yes": Oifis place: allotments: Cuibhreann talmhainn - block: Bloca - airport: Port-adhair city: Baile country: Dùthaich county: Siorrachd/Còigeamh @@ -766,7 +754,6 @@ gd: islet: Eilean beag isolated_dwelling: Àite-còmhnaidh iomallach locality: Àite - moor: Mòine municipality: Baile neighbourhood: Coimhearsnachd postcode: Còd-puist @@ -783,10 +770,8 @@ gd: abandoned: Rèile thrèigte construction: Rèile 'ga togail disused: Rèile gun chleachdadh - disused_station: Stèisean-rèile gun chleachdadh funicular: Rèile-bhruthaich halt: Stad trèana - historic_station: Stèisean-rèile eachdraidheil junction: Snaidhm-rèile level_crossing: Crois-rèile fhosgailte light_rail: Rèile aotrom @@ -850,7 +835,6 @@ gd: hairdresser: Gruagaire hardware: Bùth leasachadh dachaigh hifi: HiFi - insurance: Àrachas jewelry: Bùth usgaran kiosk: Cìtheasg laundry: Taigh-nigheachain @@ -866,10 +850,8 @@ gd: pet: Bùth pheatachan pharmacy: Bùth-chungaidhean photo: Bùth dhealbhan - salon: Salon maise second_hand: Bùth rudan ath-làimhe shoes: Bùth bhrògan - shopping_centre: Ionad-seopadaireachd sports: Bùth spòrs stationery: Bùth pàipearachd supermarket: Oll-mhargadh diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 07e0fcb86..501e164ec 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -346,7 +346,7 @@ gl: map_image: Imaxe de mapa (mostra unha capa normal) embeddable_html: HTML incorporable licence: Licenza - export_details: Os datos do OpenStreetMap están licenciados baixo a licenza + export_details: Os datos do OpenStreetMap están licenciados baixo a licenza Open Data Commons Open Database License (ODbL). too_large: advice: 'Se a exportación anterior falla, considere utilizar unha das fontes @@ -386,14 +386,14 @@ gl: geocoder: search: title: - latlon: Resultados internos + latlon: Resultados internos uk_postcode: Resultados desde NPEMap / FreeThe Postcode - ca_postcode: Resultados desde Geocoder.CA - osm_nominatim: Resultados desde OpenStreetMap + ca_postcode: Resultados desde Geocoder.CA + osm_nominatim: Resultados desde OpenStreetMap Nominatim geonames: Resultados desde GeoNames - osm_nominatim_reverse: Resultados desde OpenStreetMap + osm_nominatim_reverse: Resultados desde OpenStreetMap Nominatim geonames_reverse: Resultados desde GeoNames search_osm_nominatim: @@ -403,12 +403,18 @@ gl: chair_lift: Teleférico drag_lift: Telesquí gondola: Telecabina + platter: Telesquí + pylon: Torre de alta tensión station: Estación de telesquí + t-bar: Telesquí de barra de metal en T aeroway: aerodrome: Aeródromo + airstrip: Aeródromo apron: Plataforma gate: Porta + hangar: Hangar helipad: Heliporto + parking_position: Posición de estacionamento runway: Pista taxiway: Vía de circulación do aeroporto terminal: Terminal @@ -443,37 +449,31 @@ gl: crematorium: Crematorio dentist: Dentista doctors: Médicos - dormitory: Residencia universitaria drinking_water: Auga potable driving_school: Escola de condución embassy: Embaixada - emergency_phone: Teléfono de emerxencia fast_food: Comida rápida ferry_terminal: Terminal de transbordadores - fire_hydrant: Boca de incendios fire_station: Parque de bombeiros food_court: Área de restauración fountain: Fonte fuel: Combustible gambling: Xogos de azar grave_yard: Cemiterio - gym: Ximnasio - health_centre: Centro de saúde hospital: Hospital hunting_stand: Lugar de caza ice_cream: Xeadaría kindergarten: Xardín de infancia library: Biblioteca - market: Mercado marketplace: Praza de mercado monastery: Mosteiro motorcycle_parking: Estacionamento para motocicletas nightclub: Club nocturno - nursery: Parvulario nursing_home: Residencia para a terceira idade office: Oficina parking: Aparcadoiro parking_entrance: Entrada de estacionamento + parking_space: Aparcadoiro pharmacy: Farmacia place_of_worship: Lugar de culto police: Policía @@ -483,7 +483,6 @@ gl: prison: Prisión pub: Pub public_building: Edificio público - reception_area: Zona de recepción recycling: Punto de reciclaxe restaurant: Restaurante retirement_home: Residencia de xubilados @@ -508,6 +507,7 @@ gl: village_hall: Concello waste_basket: Cesto do lixo waste_disposal: Contedor de lixo + water_point: Punto de auga youth_centre: Casa da xuventude boundary: administrative: Límite administrativo @@ -535,20 +535,25 @@ gl: "yes": Tenda de artesanía emergency: ambulance_station: Base de ambulancias + assembly_point: Punto de reunión defibrillator: Desfibrilador landing_site: Lugar de aterrizaxe de emerxencia phone: Teléfono de emerxencia + water_tank: Tanque de auga de emerxencia + "yes": Emerxencia highway: abandoned: Estrada abandonada bridleway: Pista de cabalos bus_guideway: Liña de autobuses guiados bus_stop: Parada de autobús construction: Autoestrada en construción + corridor: Corredor cycleway: Pista de bicicletas elevator: Ascensor emergency_access_point: Punto de acceso de emerxencia footway: Carreiro ford: Vao + give_way: Sinal de ceda o paso living_street: Rúa residencial milestone: Miliario motorway: Autoestrada @@ -570,6 +575,7 @@ gl: services: Área de servizo speed_camera: Radar steps: Chanzos + stop: Sinal de alto street_lamp: Luminaria tertiary: Estrada terciaria tertiary_link: Estrada terciaria @@ -579,7 +585,6 @@ gl: trunk: Estrada nacional trunk_link: Estrada nacional unclassified: Estrada sen clasificar - unsurfaced: Estrada non pavimentada "yes": Estrada historic: archaeological_site: Xacemento arqueolóxico @@ -598,6 +603,7 @@ gl: manor: Casa señorial memorial: Memorial mine: Mina + mine_shaft: Pozo mineiro monument: Monumento roman_road: Estrada romana ruins: Ruínas @@ -607,6 +613,7 @@ gl: wayside_cross: Cruce de camiños wayside_shrine: Santuario no camiño wreck: Pecio + "yes": Sitio histórico junction: "yes": Intersección landuse: @@ -644,7 +651,6 @@ gl: leisure: beach_resort: Balneario bird_hide: Observatorio de aves - club: Club common: Terreo común dog_park: Parque canino fishing: Área de pesca @@ -671,15 +677,32 @@ gl: water_park: Parque acuático "yes": Ocio man_made: + beehive: Colmea + bridge: Ponte + bunker_silo: Búnker + chimney: Cheminea + crane: Guindastre + dyke: Dique lighthouse: Faro + mine: Mina + mineshaft: Pozo mineiro + petroleum_well: Pozo petrolífero pipeline: Tubaxe + silo: Silo + surveillance: Vixilancia tower: Torre + wastewater_plant: Planta de tratamento de augas + watermill: Muíño hidráulico + water_tower: Torre de auga + water_well: Pozo + windmill: Muíño de vento works: Fábrica "yes": Artificial military: airfield: Aeródromo militar barracks: Barracas bunker: Búnker + "yes": Militar mountain_pass: "yes": Porto de montaña natural: @@ -725,7 +748,9 @@ gl: accountant: Contable administrative: Administración architect: Arquitecto + association: Asociación company: Empresa + educational_institution: Institución educativa employment_agency: Axencia de emprego estate_agent: Axencia inmobiliaria government: Oficina gobernamental @@ -737,8 +762,6 @@ gl: "yes": Oficina place: allotments: Hortas - block: Bloque - airport: Aeroporto city: Cidade country: País county: Condado @@ -750,12 +773,12 @@ gl: islet: Illote isolated_dwelling: Vivenda illada locality: Localidade - moor: Páramo municipality: Municipio neighbourhood: Veciñanza postcode: Código postal region: Rexión sea: Mar + square: Praza state: Estado/Provincia subdivision: Subdivisión suburb: Barrio @@ -767,10 +790,8 @@ gl: abandoned: Vía de tren abandonada construction: Vía ferroviaria en construción disused: Vía ferroviaria en desuso - disused_station: Estación de trens en desuso funicular: Vía de funicular halt: Parada de trens - historic_station: Estación de trens histórica junction: Unión de vías ferroviarias level_crossing: Paso a nivel light_rail: Metro lixeiro @@ -834,12 +855,13 @@ gl: hairdresser: Perrucaría hardware: Ferraxaría hifi: Hi-Fi - insurance: Aseguradora jewelry: Xoiaría kiosk: Quiosco laundry: Lavandaría + lottery: Lotaría mall: Centro comercial market: Mercado + massage: Masaxe mobile_phone: Tenda de telefonía móbil motorcycle: Tenda de motocicletas music: Tenda de música @@ -850,18 +872,17 @@ gl: pet: Tenda de mascotas pharmacy: Farmacia photo: Tenda de fotografía - salon: Salón de beleza second_hand: Tenda de segunda man shoes: Zapataría - shopping_centre: Centro comercial sports: Tenda de deportes stationery: Papelaría supermarket: Supermercado tailor: Xastraría + tobacco: Estanco toys: Xoguetaría travel_agency: Axencia de viaxes video: Tenda de vídeos - wine: Tenda de licores + wine: Tenda de viño "yes": Tenda tourism: alpine_hut: Cabana alpina @@ -916,7 +937,7 @@ gl: level10: Fronteira do barrio description: title: - osm_nominatim: Localización desde OpenStreetMap + osm_nominatim: Localización desde OpenStreetMap Nominatim geonames: Localización desde GeoNames types: @@ -991,19 +1012,19 @@ gl: legal_babble: title_html: Dereitos de autoría e licenza intro_1_html: "O OpenStreetMap ® - está dispoñible baixo datos abertos e atópase baixo a Open - Data\nCommons Open Database License (ODbL) da Fundación + está dispoñible baixo datos abertos e atópase baixo a Open + Data\nCommons Open Database License (ODbL) da Fundación OpenStreetMap (OSMF)." intro_2_html: |- Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos, na medida en que acredite o OpenStreetMap e mais os seus colaboradores. Se altera ou constrúe a partir dos nosos datos, terá que distribuír o resultado baixo a mesma licenza. O - texto + texto legal ao completo explica os seus dereitos e responsabilidades. intro_3_html: |- Os datos cartográficos dos cuadrantes dos nosos mapas e a nosa documentación - atópanse baixo a licenza Creative + atópanse baixo a licenza Creative Commons recoñecemento compartir igual 2.0 (CC BY-SA). credit_title_html: Como acreditar o OpenStreetMap credit_1_html: |- @@ -1012,7 +1033,7 @@ gl: credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñibles baixo a Open \nDatabase License e, se utiliza os cuadrantes dos nosos mapas, que os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando - con\nesta páxina.\nComo + con\nesta páxina.\nComo alternativa, e obrigatoriamente se está distribuíndo o OSM nun\nformulario de datos, pode nomear e ligar directamente cara á(s) licenza(s). Naqueles medios\nnos que non sexa posible incluír as ligazóns (por exemplo, nas obras @@ -1028,7 +1049,7 @@ gl: more_title_html: Máis información more_1_html: |- Descubra máis sobre como empregar os nosos datos e como acreditarnos na páxina de licenza de OSMF. + href="https://osmfoundation.org/Licence">páxina de licenza de OSMF. more_2_html: |- Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un mapa API gratuíto aos desenvolvedores. @@ -1042,10 +1063,10 @@ gl: e outras fontes, entre elas: contributors_at_html: |- Austria: Contén datos de - Stadt Wien (baixo a licenza - CC BY), - Land Vorarlberg e - Land Tirol (baixo a licenza CC-BY AT con emendas). + Stadt Wien (baixo a licenza + CC BY), + Land Vorarlberg e + Land Tirol (baixo a licenza CC-BY AT con emendas). contributors_ca_html: |- Canadá: Contén datos de GeoBase®, GeoGratis (© Department of Natural @@ -1056,13 +1077,13 @@ gl: Finlandia: Contén datos da National Land Survey of Finland's Topographic Database e outros conxuntos de datos, baixo a - licenza NLSFI. + licenza NLSFI. contributors_fr_html: |- Francia: Contén datos con orixe na Direction Générale des Impôts. contributors_nl_html: |- Países Baixos: Contén datos de © AND, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Nova Zelandia: Contén datos con orixe no Land Information New Zealand. Dereitos de autor da coroa. @@ -1082,7 +1103,7 @@ gl: contributors_footer_1_html: |- Para obter máis información sobre estas e outras fontes usadas para axudar na mellora do OpenStreetMap, bote unha ollada á páxina dos + href="https://wiki.openstreetmap.org/wiki/Contributors">páxina dos colaboradores no wiki do OpenStreetMap. contributors_footer_2_html: |- A inclusión de datos no OpenStreetMap non implica que o que @@ -1096,14 +1117,14 @@ gl: infringement_2_html: |- Se pensa que se engadiu material protexido de xeito inapropiado á base de datos do OpenStreetMap ou a este sitio, consulte - o noso procedemento + o noso procedemento para retirar datos ou deixe unha notificación no noso formulario en liña. trademarks_title_html: Marcas rexistadas trademarks_1_html: OpenStreetMap, o logotipo coa lupa e ''State of the Map'' son marcas rexistadas da Fundación OpenStreetMap. Se ten algunha pregunta - sobre a utilización das marcas, por favor envée as súas cuestión ó Grupo - de Traballo de Licenzas. + sobre a utilización das marcas, por favor consulte a nosa Política + de Licenzas. welcome_page: title: Reciba a nosa benvida! introduction_html: Dámoslle a benvida ao OpenStreetMap, o mapa do mundo libre @@ -1137,8 +1158,8 @@ gl: paragraph_1_html: OpenStreetMap ten poucas regras formais, pero esperamos que todos os participantes colaboraren e se comuniquen coa comunidade. Se está considerando algunha actividade que non sexa a edición manual, lea e siga - as instrucións sobre org/wiki/Import/Guidelines'>importacións - e edicións + as instrucións sobre org/wiki/Import/Guidelines'>importacións + e edicións automatizadas. questions: title: Ten algunha pregunta? @@ -1174,7 +1195,7 @@ gl: explanation_html: |- Se lle preocupa como se usan os nosos datos ou lle preocupan os contidos, consulte a páxina de dereitos de autoría para obter máis información legal ou póñase en contacto cun dos - grupos de traballo da Fundación OSM. + grupos de traballo da Fundación OSM. help_page: title: Obter axuda introduction: |- @@ -1185,7 +1206,7 @@ gl: title: Dámoslle a benvida ao OSM description: Comece con esta guía rápida cos principios básicos do OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Guía do principiante description: Guía para principiantes, mantida pola comunidade. help: @@ -1209,7 +1230,7 @@ gl: description: Axuda para as empresas e organizacións que migran a mapas e a outros servizos baseados en OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: No wiki atopará documentación detallada do OSM. about_page: @@ -1234,8 +1255,8 @@ gl: Para obter máis información sobre a comunidade, consulte o blogue do OpenStreetMap, diarios de usuarios, - blogues da comunidade, e - o sitio web da Fundación OSM. + blogues da comunidade, e + o sitio web da Fundación OSM. open_data_title: Datos libres open_data_html: |- Os datos do OpenStreetMap son datos libres; pode usalos libremente e para calquera finalidade @@ -1463,7 +1484,7 @@ gl: potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch, ten que desmarcar o camiño actual ou o punto, se está a editar no modo en vivo, ou premer sobre o botón "Gardar".) - potlatch2_not_configured: O Potlatch 2 non está configurado; consulte http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port para obter máis información potlatch2_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch 2, prema en "Gardar".) @@ -1556,7 +1577,7 @@ gl: edit: Editar preview: Vista previa markdown_help: - title_html: Analizado con Markdown + title_html: Analizado con Markdown headings: Cabeceiras heading: Cabeceira subheading: Subcabeceira @@ -1665,7 +1686,7 @@ gl: description: Examinar as cargas recentes de pistas GPS tagged_with: ' etiquetadas con %{tags}' empty_html: Aínda non hai nada por aquí. Cargue unha - nova pista ou obteña máis información sobre as pistas GPS na páxina + nova pista ou obteña máis información sobre as pistas GPS na páxina do wiki. delete: scheduled_for_deletion: Pista á espera da súa eliminación @@ -1875,12 +1896,12 @@ gl: html: |-

A diferenza doutros mapas, o OpenStreetMap está completamente creado por xente coma vostede, e calquera persoa é libre de corrixilo, actualizalo, descargalo e utilizalo.

Rexístrese para comezar a contribuír. Enviarémoslle un correo electrónico para confirmar a súa conta.

- license_agreement: Cando confirme a súa conta necesitará aceptar os termos + license_agreement: Cando confirme a súa conta necesitará aceptar os termos do colaborador. email address: 'Enderezo de correo electrónico:' confirm email address: Confirmar o enderezo de correo electrónico not displayed publicly: A súa dirección IP non se mostra publicamente, vexa - a nosa política de protección de datos para máis información display name: 'Nome mostrado:' @@ -2000,12 +2021,12 @@ gl: email never displayed publicly: (nunca mostrado publicamente) external auth: 'Autenticación externa:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: que é isto? public editing: heading: 'Edición pública:' enabled: Activado. Non é anónimo e pode editar os datos. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: que é isto? disabled: Desactivado e non pode editar os datos. Todas as anteriores edicións son anónimas. @@ -2016,7 +2037,7 @@ gl: mensaxes ou ollar a súa localización. Para mostrar o que editou e permitir que a xente se poña en contacto con vostede mediante a páxina web, prema no botón que aparece a continuación. Desde a migración da API á versión - 0.6, tan só os usuarios públicos poden editar os datos do mapa (máis + 0.6, tan só os usuarios públicos poden editar os datos do mapa (máis información).
  • Os enderezos de correo electrónico non se farán públicos.
  • Non é posible reverter esta acción e agora os novos usuarios xa son públicos por defecto.
diff --git a/config/locales/he.yml b/config/locales/he.yml index 0acf1d347..3c201d851 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -449,33 +449,26 @@ he: crematorium: משרפה dentist: רופא שיניים doctors: רופאים - dormitory: מעונות drinking_water: מי שתייה driving_school: בית ספר לנהיגה embassy: שגרירות - emergency_phone: טלפון חירום fast_food: מזון מהיר ferry_terminal: מסוף מעבורת - fire_hydrant: ברז כיבוי אש fire_station: תחנת כיבוי אש food_court: אזור מזון מהיר fountain: מזרקה fuel: דלק gambling: הימורים grave_yard: בית קברות - gym: מכון כושר/חדר כושר - health_centre: מרכז בריאות hospital: בית חולים hunting_stand: תצפית ציידים ice_cream: גלידה kindergarten: גן ילדים library: ספרייה - market: שוק marketplace: שוק monastery: מנזר motorcycle_parking: חניית אופנועים nightclub: מועדון לילה - nursery: פעוטון nursing_home: בית אבות office: משרד parking: חניה @@ -489,7 +482,6 @@ he: prison: כלא pub: פאב public_building: מבנה ציבור - reception_area: אזור קליטה recycling: נקודת מיחזור restaurant: מסעדה retirement_home: בית אבות @@ -585,7 +577,6 @@ he: trunk: דרך ראשית trunk_link: דרך ראשית unclassified: דרך לא מסווגת - unsurfaced: דרך בלתי־סלולה "yes": דרך historic: archaeological_site: אתר ארכאולוגי @@ -650,7 +641,6 @@ he: leisure: beach_resort: אתר נופש לחוף ים bird_hide: מצפור - club: מועדון common: שטח משותף dog_park: פארק כלבים fishing: אזור דיג @@ -677,9 +667,20 @@ he: water_park: פארק מים "yes": נופש man_made: + beehive: כוורת דבורים + bridge: גשר + bunker_silo: בונקר + chimney: ארובה + crane: עגורן lighthouse: מגדלור + mine: מכרה + mineshaft: פיר מכרה + monitoring_station: תחנת מעקב pipeline: קו צינורות + surveillance: מעקב tower: מגדל + water_tower: מגדל מים + water_well: באר works: מפעל "yes": מעשה־אדם military: @@ -743,8 +744,6 @@ he: "yes": משרד place: allotments: שטחים חקלאיים - block: רובע - airport: נמל תעופה city: עיר country: ארץ county: מחוז @@ -756,7 +755,6 @@ he: islet: איוֹן isolated_dwelling: מגורים מבודדים locality: יישוב - moor: אדמת כבול municipality: עירייה neighbourhood: שכונה postcode: מיקוד @@ -773,10 +771,8 @@ he: abandoned: מסילת ברזל נטושה construction: מסילת ברזל בבנייה disused: מסילת ברזל שאינה בשימוש - disused_station: תחנת רכבת שאינה בשימוש funicular: פוניקולר halt: תחנת רכבת - historic_station: תחנת רכבת היסטורית junction: מפגש מסילות ברזל level_crossing: מפגש מסילת ברזל וכביש light_rail: רכבת קלה @@ -840,12 +836,12 @@ he: hairdresser: מעצב שער hardware: חנות חומרי בניין hifi: ציוד מוזיקה - insurance: ביטוח jewelry: חנות תכשיטים kiosk: קיוסק laundry: מכבסה mall: מרכז קניות market: שוק + massage: עיסוי mobile_phone: חנות טלפונים ניידים motorcycle: חנות אופנועים music: חנות כלי נגינה @@ -853,21 +849,23 @@ he: optician: אופטיקאי organic: חנות מזון אורגני outdoor: חנות ציוד מחנאות + paint: חנות צבע pet: חנות חיות מחמד pharmacy: בית מרקחת photo: חנות צילום - salon: סלון + seafood: מאכלי ים second_hand: חנות יד שנייה shoes: חנות נעליים - shopping_centre: מרכז קניות sports: חנות ספורט stationery: חנות כלי כתיבה supermarket: סופרמרקט tailor: חייט + tobacco: חנות טבק toys: חנות צעצועים travel_agency: סוכנות נסיעות + tyres: חנות צמיגים video: ספריית וידאו - wine: חנות אלכוהול + wine: חנות יין "yes": חנות tourism: alpine_hut: בקתה אלפינית diff --git a/config/locales/hr.yml b/config/locales/hr.yml index c90feeb01..d48a0ff54 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -444,33 +444,26 @@ hr: crematorium: Krematorij dentist: Zubar doctors: Doktor - dormitory: Studentski dom drinking_water: Pitka voda driving_school: AutoÅ¡kola embassy: Veleposlanstvo - emergency_phone: Telefon (S.O.S) fast_food: Fast food ferry_terminal: Trajektni terminal - fire_hydrant: Hidrant fire_station: Vatrogasna postaja food_court: Blagovaonski kutak fountain: Fontana fuel: Benzinska gambling: Kockarnica grave_yard: Groblje - gym: Fitness centar - health_centre: Zdravstveni centar hospital: Bolnica hunting_stand: Čeka ice_cream: Slastičarna kindergarten: Dječji vrtić library: Knjižnica - market: Tržnica marketplace: Tržnica monastery: Samostan motorcycle_parking: Parking za motocikle nightclub: Noćni klub - nursery: Čuvanje djece nursing_home: Starački dom office: Kancelarija parking: Parking @@ -484,7 +477,6 @@ hr: prison: Zatvor pub: Pub public_building: Ustanova - reception_area: Recepcija recycling: Reciklažna točka restaurant: Restoran retirement_home: Dom za starije osobe @@ -580,7 +572,6 @@ hr: trunk: Cesta rezervirana za motorna vozila trunk_link: Cesta rezrevirana za mot. voz. - prilazna cesta unclassified: Nerazvrstana cesta - unsurfaced: Neasfaltirana cesta "yes": Cesta historic: archaeological_site: ArheoloÅ¡ko nalaziÅ¡te @@ -640,7 +631,6 @@ hr: vineyard: Vinograd leisure: beach_resort: Plaža - club: Klub common: Općinsko zemljiÅ¡te dog_park: Park za pse fishing: Ribičko područje @@ -721,7 +711,6 @@ hr: ngo: Ured nedržavne organizacije "yes": Ured place: - airport: Zračna luka city: Grad country: Država county: Županija/grofovija @@ -732,7 +721,6 @@ hr: island: Otok islet: Otočić locality: Lokalitet - moor: Močvara municipality: Općina postcode: PoÅ¡tanski broj region: Područje @@ -748,10 +736,8 @@ hr: abandoned: NapuÅ¡tena pruga construction: Pruga u izgradnji disused: NapuÅ¡tena pruga - disused_station: Željeznička stanica (nije u upotrebi) funicular: Uspinjača halt: Željeznička stanica - historic_station: Povijesna željeznička stanica junction: Željeznički čvor level_crossing: Pružni prijelaz light_rail: Laka željeznica @@ -815,7 +801,6 @@ hr: hairdresser: Frizer hardware: Željezar hifi: Hi-Fi - insurance: Osiguranje jewelry: Zlatarna kiosk: Kiosk laundry: Praonica rublja @@ -831,9 +816,7 @@ hr: pet: Trgovina za kućne ljubimce pharmacy: Ljekarna photo: Fotograf - salon: Salon shoes: Trgovina obućom - shopping_centre: Trgovački centar sports: Trgovina sportskom opremom stationery: Papirnica supermarket: Supermarket diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 7cc4d6dd0..7f09bcb83 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -439,33 +439,26 @@ hsb: crematorium: Krematorij dentist: Zubny lěkar doctors: Lěkarjo - dormitory: Internat drinking_water: Pitna woda driving_school: Jězbna Å¡ula embassy: Wulkopósłanstwo - emergency_phone: Nuzowy telefon fast_food: Přikuski ferry_terminal: Přewozny přistaw - fire_hydrant: Wohnjowy hydrant fire_station: Wohnjostraža food_court: Food Court fountain: Studnja fuel: Tankownja gambling: Hra wo zbožo grave_yard: Kěrchow - gym: Fitnesowy center/Fitnesowe studijo - health_centre: Strowotny centrum hospital: Chorownja hunting_stand: Łakańca ice_cream: Jědźny lód kindergarten: Pěstowarnja library: Knihownja - market: Wiki marketplace: Torhošćo monastery: klóšter motorcycle_parking: parkowanišćo za motorske nightclub: Nócny klub - nursery: Pěstowarnja nursing_home: Hladarnja office: Běrow parking: Parkowanišćo @@ -479,7 +472,6 @@ hsb: prison: Jastwo pub: Korčma public_building: Zjawne twarjenje - reception_area: Přijimanski wobłuk recycling: Přijimarnja starowiznow restaurant: Hosćenc retirement_home: Starownja @@ -575,7 +567,6 @@ hsb: trunk: Dalokodróha trunk_link: Dalokodróha unclassified: Njezarjadowana dróha - unsurfaced: Njewobtwjerdźena dróha "yes": dróha historic: archaeological_site: Archeologiske wurywanišćo @@ -640,7 +631,6 @@ hsb: leisure: beach_resort: Mórske kupjele bird_hide: Ptači schow - club: towarstwo common: Gmejnski kraj dog_park: psyči park fishing: Rybnišćo @@ -733,8 +723,6 @@ hsb: "yes": Běrow place: allotments: małozahrodki - block: blok - airport: Lětanišćo city: Wulkoměsto country: Kraj county: Wokrjes @@ -746,7 +734,6 @@ hsb: islet: Kupka isolated_dwelling: Jednotliwe bydło locality: Sydlišćo - moor: Bahno municipality: Gmejna neighbourhood: Bydlenski wobwod postcode: Postowe wodźenske čisło @@ -763,10 +750,8 @@ hsb: abandoned: Rozpušćena železnica construction: Železnica so twari disused: Zastajena železnica - disused_station: Zawrjene dwórnišćo funicular: Powjaznica halt: Železniske zastanišćo - historic_station: Historiske dwórnišćo junction: Železniske křižnišćo level_crossing: Železniski přechod light_rail: Měšćanska železnica @@ -830,7 +815,6 @@ hsb: hairdresser: Frizerski salon hardware: Twarske wiki hifi: Hi-fi - insurance: Zawěsćernja jewelry: Debjenkowy wobchod kiosk: Kiosk laundry: Myjernja @@ -846,10 +830,8 @@ hsb: pet: Coowobchod pharmacy: Lěkarnja photo: Fotograf - salon: Salon second_hand: Nakupowanišćo shoes: Wobchod črijow - shopping_centre: Nakupowanišćo sports: Sportowy wobchod stationery: Papjernistwo supermarket: Superwiki diff --git a/config/locales/hu.yml b/config/locales/hu.yml index b5c9ad786..28d0c971a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -457,33 +457,26 @@ hu: crematorium: Krematórium dentist: Fogorvos doctors: Orvosi rendelő - dormitory: Kollégium drinking_water: Ivóvíz driving_school: Autósiskola embassy: Nagykövetség - emergency_phone: Segélyhívó fast_food: Gyorsétterem ferry_terminal: Kompkikötő - fire_hydrant: Tűzcsap fire_station: Tűzoltóság food_court: Ételudvar fountain: Szökőkút fuel: Benzinkút gambling: Szerencsejáték grave_yard: Kis temető - gym: Fitnesz- / Tornaterem - health_centre: Egészségügyi központ hospital: Kórház hunting_stand: Magasles ice_cream: Jégkrém kindergarten: Óvoda library: Könyvtár - market: Piac marketplace: Vásártér monastery: Kolostor motorcycle_parking: Motoros parkoló nightclub: Éjszakai bár - nursery: Óvoda nursing_home: Idősek otthona office: Iroda parking: Parkoló @@ -497,7 +490,6 @@ hu: prison: Börtön pub: Kocsma public_building: Középület - reception_area: Recepció recycling: Szelektív hulladékgyűjtő restaurant: Étterem retirement_home: Nyugdíjasotthon @@ -593,7 +585,6 @@ hu: trunk: Autóút trunk_link: Autóút unclassified: Egyéb út - unsurfaced: Burkolatlan út "yes": Út historic: archaeological_site: Régészeti lelőhely @@ -658,7 +649,6 @@ hu: leisure: beach_resort: Tengerparti üdülőhely bird_hide: Madárles - club: Klub common: Közös terület dog_park: Kutyapark fishing: Horgászterület @@ -751,8 +741,6 @@ hu: "yes": Iroda place: allotments: Veteményeskertek - block: Blokk - airport: Repülőtér city: Nagyváros country: Ország county: Megye @@ -764,7 +752,6 @@ hu: islet: Kis sziget isolated_dwelling: Elszigetelt épület locality: Hely - moor: Mocsár municipality: Település neighbourhood: Szomszédság postcode: Irányítószám @@ -781,10 +768,8 @@ hu: abandoned: Felhagyott vasút construction: Építés alatt álló vasút disused: Használaton kívüli vasút - disused_station: Használaton kívüli vasútállomás funicular: Siklóvasút halt: Vasúti megállóhely - historic_station: Történelmi vasútállomás junction: Vasúti csomópont level_crossing: Vasúti átjáró light_rail: HÉV @@ -848,7 +833,6 @@ hu: hairdresser: Fodrászat hardware: Szerelési bolt hifi: Hi-Fi bolt - insurance: Biztosító jewelry: Ékszerbolt kiosk: Trafik laundry: Mosoda @@ -864,10 +848,8 @@ hu: pet: Állatkereskedés pharmacy: Gyógyszertár photo: Fotóbolt - salon: Szalon second_hand: Használtcikk kereskedés shoes: Cipőbolt - shopping_centre: Bevásárlóközpont sports: Sportbolt stationery: Írószerbolt supermarket: Szupermarket diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 8398d9aa7..93e8cae5b 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Carlosedepaula +# Author: Fanjiayi # Author: Julian Mendez # Author: Macofe # Author: McDutchie @@ -343,7 +344,7 @@ ia: map_image: Imagine de carta (monstra le strato standard) embeddable_html: HTML incorporabile licence: Licentia - export_details: Le datos de OpenStreetMap es licentiate sub le Open + export_details: Le datos de OpenStreetMap es licentiate sub le Open Data Commons Open Database License (ODbL). too_large: advice: 'Si iste exportation falle, considera usar un del fontes listate hic @@ -384,14 +385,14 @@ ia: geocoder: search: title: - latlon: Resultatos interne + latlon: Resultatos interne uk_postcode: Resultatos de NPEMap / FreeThe Postcode - ca_postcode: Resultatos de Geocoder.CA - osm_nominatim: Resultatos de OpenStreetMap + ca_postcode: Resultatos de Geocoder.CA + osm_nominatim: Resultatos de OpenStreetMap Nominatim geonames: Resultatos de GeoNames - osm_nominatim_reverse: Resultatos ab OpenStreetMap + osm_nominatim_reverse: Resultatos ab OpenStreetMap Nominatim geonames_reverse: Resultatos ab GeoNames search_osm_nominatim: @@ -441,33 +442,26 @@ ia: crematorium: Crematorio dentist: Dentista doctors: Medicos - dormitory: Dormitorio drinking_water: Aqua potabile driving_school: Autoschola embassy: Ambassada - emergency_phone: Telephono de emergentia fast_food: Fast food ferry_terminal: Terminal de ferry - fire_hydrant: Hydrante de incendio fire_station: Caserna de pumperos food_court: Zona de restaurantes fountain: Fontana fuel: Carburante gambling: Joco de hasardo grave_yard: Cemeterio - gym: Centro de fitness / Gymnasio - health_centre: Centro de sanitate hospital: Hospital hunting_stand: Posto de chassa ice_cream: Gelato kindergarten: Schola pro juvene infantes library: Bibliotheca - market: Mercato marketplace: Mercato monastery: Monasterio motorcycle_parking: Parking a motocyclo nightclub: Club nocturne - nursery: Sala recreative pro parve infantes nursing_home: Casa de convalescentia office: Officio parking: Parking @@ -481,7 +475,6 @@ ia: prison: Prision pub: Taverna public_building: Edificio public - reception_area: Area de reception recycling: Puncto de recyclage restaurant: Restaurante retirement_home: Residentia pro vetere personas @@ -577,7 +570,6 @@ ia: trunk: Via national trunk_link: Via national unclassified: Via non classificate - unsurfaced: Cammino de terra "yes": Cammino historic: archaeological_site: Sito archeologic @@ -642,7 +634,6 @@ ia: leisure: beach_resort: Loco de vacantias al plagia bird_hide: Observatorio de aves - club: Club common: Terreno commun dog_park: Parco pro canes fishing: Area de pisca @@ -670,6 +661,7 @@ ia: "yes": Tempore libere man_made: lighthouse: Pharo + mine: Mina pipeline: Tubulatura tower: Turre works: Fabrica @@ -678,6 +670,7 @@ ia: airfield: Aerodromo militar barracks: Barracas bunker: Bunker + "yes": Militar mountain_pass: "yes": Passo de montania natural: @@ -723,6 +716,7 @@ ia: accountant: Contabile administrative: Administration architect: Architecto + association: Associatione company: Compania employment_agency: Agentia de empleo estate_agent: Agentia immobiliari @@ -735,8 +729,6 @@ ia: "yes": Officio place: allotments: Jardines familial - block: Bloco - airport: Aeroporto city: Citate country: Pais county: Contato @@ -748,12 +740,12 @@ ia: islet: Insuletta isolated_dwelling: Habitation isolate locality: Localitate - moor: Landa municipality: Municipalitate neighbourhood: Quartiero postcode: Codice postal region: Region sea: Mar + square: Quadrate state: Stato subdivision: Subdivision suburb: Suburbio @@ -765,10 +757,8 @@ ia: abandoned: Ferrovia abandonate construction: Ferrovia in construction disused: Ferrovia in disuso - disused_station: Station ferroviari in disuso funicular: Ferrovia funicular halt: Halto de traino - historic_station: Station ferroviari historic junction: Junction ferroviari level_crossing: Passage a nivello light_rail: Metro legier @@ -832,7 +822,6 @@ ia: hairdresser: Perruccheria hardware: Quincalieria hifi: Hi-fi - insurance: Assecurantia jewelry: Joieleria kiosk: Kiosque laundry: Lavanderia @@ -848,10 +837,8 @@ ia: pet: Boteca de animales pharmacy: Pharmacia photo: Magazin de photographia - salon: Salon second_hand: Magazin de secunde mano shoes: Scarperia - shopping_centre: Centro commercial sports: Magazin de sport stationery: Papireria supermarket: Supermercato @@ -914,7 +901,7 @@ ia: level10: Limite de suburbio description: title: - osm_nominatim: Loco de OpenStreetMap + osm_nominatim: Loco de OpenStreetMap Nominatim geonames: Position de GeoNames types: @@ -990,26 +977,26 @@ ia: title_html: Copyright e Licentia intro_1_html: |- OpenStreetMap® es datos aperte, licentiate sub le Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) per le Fundation OpenStreetMap (OSMF). + href="https://osmfoundation.org/">Fundation OpenStreetMap (OSMF). intro_2_html: |2- Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas e datos, a condition que vos da recognoscentia a OpenStreetMap e su contributores. Si vos altera o extende nostre cartas e datos, vos pote distribuer le resultato solmente sub le mesme licentia. Le - complete codice + complete codice legal explica vostre derectos e responsabilitates. intro_3_html: |- Le cartographia in nostre tegulas de carta, e nostre documentation, son - publicate sub licentia Creative + publicate sub licentia Creative Commons Attribution-ShareAlike 2.0 (CC-BY-SA). credit_title_html: Como dar recognoscentia a OpenStreetMap credit_1_html: |- Nos require que vos usa le recognoscentia “© OpenStreetMap contributors”. credit_2_html: |- - Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a iste pagina de copyright. + Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a iste pagina de copyright. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola ‘OpenStreetMap’), a opendatacommons.org, e (si relevante) a creativecommons.org. credit_3_html: 'Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:' @@ -1019,7 +1006,7 @@ ia: more_title_html: Pro saper plus more_1_html: |- Lege plus sur le uso de nostre datos, e como recognoscer nos, in le pagina de licentia OSMF. + href="https://osmfoundation.org/Licence">pagina de licentia OSMF. more_2_html: |- Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre politica pro le uso del API, politica pro le uso de tegulas @@ -1030,8 +1017,8 @@ ia: altere fontes, inter le quales:' contributors_at_html: |- Austria: Contine datos ab le - Citate de Vienna licentiate sub - CC BY. + Citate de Vienna licentiate sub + CC BY. contributors_ca_html: |- Canada: Contine datos ab GeoBase®, GeoGratis (© Department of Natural @@ -1040,14 +1027,14 @@ ia: Statistics Canada). contributors_fi_html: "Finlandia: Contine datos ab le base de datos topographic del Inspection \nNational del Territorio de Finlandia - e de altere insimules de datos, sub le\nlicentia + e de altere insimules de datos, sub le\nlicentia NLSFI." contributors_fr_html: |- Francia: Contine datos fornite per le Direction Générale des Impôts. contributors_nl_html: |- Nederlandia: Contine datos © AND, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Nove Zelandia: Contine datos proveniente de Land Information New Zealand. Crown Copyright reservate. @@ -1067,7 +1054,7 @@ ia: contributors_footer_1_html: |- Pro ulterior detalios de iste e altere fontes que ha essite usate pro adjutar a meliorar OpenStreetMap, vide le pagina + href=""https://wiki.openstreetmap.org/wiki/Contributors">pagina de contributores in le wiki de OpenStreetMap. contributors_footer_2_html: |2- Le inclusion de datos in OpenStreetMap non implica que le fornitor @@ -1080,13 +1067,13 @@ ia: sin explicite permission del titulares del derecto de autor. infringement_2_html: Si vos crede que material sub copyright ha essite inserite inappropriatemente in le base de datos de OpenStreetMap o in iste sito, per - favor consulta nostre procedura - de remotion o submitte un plancto immediate usante nostre formulario + favor consulta nostre procedura + de remotion o submitte un plancto immediate usante nostre formulario in linea. trademarks_title_html: Marcas commercial trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the Map" es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones sur - le uso de iste marcas, invia los al gruppo + le uso de iste marcas, invia los al gruppo de labor sur licentias. welcome_page: title: Benvenite! @@ -1119,8 +1106,8 @@ ia: paragraph_1_html: OpenStreetMap ha poc regulas formal, ma nos expecta que tote le participantes collabora e communica con le communitate. Si vos considera un activitate altere que modification per mano, lege e seque le directivas - sur le importation - e sur le modification + sur le importation + e sur le modification automatisate. questions: title: Questiones? diff --git a/config/locales/id.yml b/config/locales/id.yml index 42b7cadd3..429eff633 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -461,33 +461,26 @@ id: crematorium: Tempat Kremasi (Pembakaran Mayat) dentist: Dokter Gigi doctors: Dokter - dormitory: Asrama drinking_water: Air Minum driving_school: Sekolah Mengemudi embassy: Kedutaan Besar - emergency_phone: Telepon Darurat fast_food: Makanan Cepat Saji ferry_terminal: Terminal Kapal Feri - fire_hydrant: Hidran/Keran Kebakaran fire_station: Stasiun Pemadam Kebakaran food_court: Tempat Makan fountain: Air Mancur fuel: Stasiun Pengisian Bahan Bakar gambling: Perjudian grave_yard: Kuburan - gym: Pusat Kebugaran / Gym - health_centre: Pusat Kesehatan hospital: Rumah Sakit hunting_stand: Pos Berburu ice_cream: Es Krim kindergarten: Taman Kanak-kanak library: Perpustakaan - market: Pasar marketplace: Pasar monastery: Biara motorcycle_parking: Parkir Motor nightclub: Klub Malam - nursery: Pendidikan Anak Usia Dini (PAUD) nursing_home: Panti Jompo office: Kantor parking: Parkir @@ -501,7 +494,6 @@ id: prison: Penjara pub: Pub public_building: Bangunan Publik - reception_area: Area Bagian Penerima Tamu recycling: Titik Daur Ulang restaurant: Restoran retirement_home: Rumah Jompo @@ -597,7 +589,6 @@ id: trunk: Jalan Nasional trunk_link: Jalan Nasional unclassified: Jalan Tidak Terklasifikasi - unsurfaced: Jalan Tanpa Permukaan "yes": Jalan historic: archaeological_site: Situs arkeologi @@ -662,7 +653,6 @@ id: leisure: beach_resort: Resort Pantai bird_hide: Tempat Observasi Burung - club: Klub common: Lahan Publik dog_park: Taman Anjing fishing: Tempat Pemancingan @@ -755,8 +745,6 @@ id: "yes": Kantor place: allotments: Tanah Garapan - block: Blok - airport: Bandara city: Kota country: Negara county: Provinsi @@ -768,7 +756,6 @@ id: islet: Pulau Kecil isolated_dwelling: Daerah Terisolasi locality: Lokal - moor: Tegalan municipality: Kotamadya/Kabupaten neighbourhood: Lingkungan postcode: Kode Pos @@ -785,10 +772,8 @@ id: abandoned: Rel Kereta Api Terbengkalai construction: Rel kereta yang diperbaiki disused: Rel Kereta Api Tak Terpakai - disused_station: Bekas Stasiun Kereta funicular: Trem yang digerakan dengan kabel halt: Pemberhentian kereta - historic_station: Stasiun Kereta Bersejarah junction: Persimpangan Rel level_crossing: Perlintasan Bertingkat light_rail: Kereta api cepat @@ -852,7 +837,6 @@ id: hairdresser: Penata Rambut hardware: Toko Perangkat Keras hifi: Hi-Fi - insurance: Asuransi jewelry: Toko Perhiasan kiosk: Kios/Warung laundry: Penatu @@ -868,10 +852,8 @@ id: pet: Toko Hewan pharmacy: Apotek photo: Studio Foto - salon: Salon second_hand: Toko loak shoes: Toko Sepatu - shopping_centre: Pusat Perbelanjaan sports: Toko Olahraga stationery: Toko Alat Tulis supermarket: Supermarket diff --git a/config/locales/is.yml b/config/locales/is.yml index 88e11b179..cfe1cf68d 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -411,12 +411,19 @@ is: chair_lift: Stólalyfta drag_lift: Toglyfta gondola: Eggjalyfta + platter: Diskalyfta + pylon: Lyftumastur station: Lyftustöð + t-bar: T-lyfta aeroway: aerodrome: Flugsvæði + airstrip: Flugbraut apron: Flughlað gate: Hlið + hangar: Flugskýli helipad: Þyrlupallur + holding_position: Biðstæði + parking_position: Loftfarastæði runway: Flugbraut taxiway: Akbraut flugvéla terminal: Flugstöð @@ -451,37 +458,32 @@ is: crematorium: Bálstofa dentist: Tannlæknir doctors: Læknar - dormitory: Heimavist drinking_water: Drykkjarvatn driving_school: Ökuskóli embassy: Sendiráð - emergency_phone: Neyðarsími fast_food: Skyndibitastaður ferry_terminal: Ferjustöð - fire_hydrant: Brunahani fire_station: Slökkvistöð food_court: Veitingasvæði fountain: Gosbrunnur fuel: Eldsneyti gambling: Fjárhættuspil grave_yard: Kirkjugarður - gym: Líkamsræktarstöð - health_centre: Heilsumiðstöð + grit_bin: Sandkista hospital: Sjúkrahús hunting_stand: Skotvöllur ice_cream: Ísbúð kindergarten: Leikskóli library: Bókasafn - market: Markaður marketplace: Markaður monastery: Klaustur motorcycle_parking: Mótorhjólastæði nightclub: Næturklúbbur - nursery: Skiptiborð nursing_home: Hjúkrunarheimili office: Skrifstofa parking: Bílastæði parking_entrance: Aðgangur að bílastæði + parking_space: Bílastæði pharmacy: Lyfjabúð place_of_worship: Tilbeiðslustaður police: Lögreglustöð @@ -491,7 +493,6 @@ is: prison: Fangelsi pub: Krá public_building: Opinber bygging - reception_area: Móttökusvæði recycling: Endurvinnsla restaurant: Veitingastaður retirement_home: Elliheimili @@ -499,7 +500,7 @@ is: school: Skóli shelter: Skýli shop: Verslun - shower: Steypibað + shower: Sturta social_centre: Félagsmiðstöð social_club: Samfélagsklúbbur social_facility: Félagsþjónusta @@ -516,6 +517,7 @@ is: village_hall: Hreppsskrifstofa waste_basket: Ruslafata waste_disposal: Ruslsöfnun + water_point: Vatnspóstur youth_centre: Ungmennamiðstöð boundary: administrative: Stjórnsýslumörk @@ -524,6 +526,7 @@ is: protected_area: Verndarsvæði bridge: aqueduct: Vatnsveitubrú + boardwalk: Plankabrú suspension: Hengibrú swing: Snúningsbrú viaduct: Dalbrú @@ -543,25 +546,31 @@ is: "yes": Handverkshús emergency: ambulance_station: Sjúkrabílastöð + assembly_point: Safnsvæði defibrillator: Hjartastuðtæki landing_site: Neyðarlending phone: Neyðarsími + water_tank: Vatnstankur fyrir neyðartilfelli + "yes": Neyðartilfelli highway: abandoned: Ónotuð hraðbraut bridleway: Reiðstígur bus_guideway: Strætisvagnaakrein með stýringu bus_stop: Strætisvagnabiðstöð construction: Hraðbraut í byggingu + corridor: Gangur cycleway: Hjólastígur elevator: Lyfta emergency_access_point: Neyðaraðgangur footway: Göngustígur ford: Vað + give_way: Víkja-skilti living_street: Vistgata milestone: Vegalengdarsteinn motorway: Hraðbraut motorway_junction: Þjóðvegatenging motorway_link: Hraðbraut + passing_place: Víkingakantur path: Slóð pedestrian: Gönguleið platform: Pallur @@ -578,6 +587,7 @@ is: services: Hraðbrautaþjónusta speed_camera: Hraðamyndavél steps: Tröppur + stop: Stöðvunarskilti street_lamp: Ljósastaur tertiary: Annar vegur tertiary_link: Annar vegur @@ -586,8 +596,8 @@ is: trail: Stígur trunk: Stofnbraut (Hringvegurinn) trunk_link: Stofnbraut (Hringvegurinn) + turning_loop: Snúningsslaufa unclassified: Óflokkaður vegur - unsurfaced: Vegur án slitlags "yes": Vegur historic: archaeological_site: Fornminjar @@ -606,6 +616,7 @@ is: manor: Herragarður memorial: Minnismerki mine: Náma + mine_shaft: Námugöng monument: Minnisvarði roman_road: Rómverskur vegur ruins: Rústir @@ -615,6 +626,7 @@ is: wayside_cross: Vegakross wayside_shrine: Vegaskrín wreck: Flak + "yes": Sögustaður junction: "yes": Tenging landuse: @@ -652,9 +664,9 @@ is: leisure: beach_resort: Strandbær bird_hide: Fuglaskoðunarhús - club: Klúbbur common: Almenningur dog_park: Hundagarður + firepit: Eldhola fishing: Fiskveiði fitness_centre: Líkamsræktarstöð fitness_station: Líkamsræktarstöð @@ -679,15 +691,46 @@ is: water_park: Vatnsleikjagarður "yes": Afþreying man_made: + adit: Námuinngangur + beacon: Miðunarmerki + beehive: Býflugnabú + breakwater: Brimvarnargarður + bridge: Brú + bunker_silo: Sprengjubyrgi + chimney: Skorsteinn + crane: Krani + dolphin: Bryggjustólpi + dyke: Flóðgarður + embankment: Stallur + flagpole: Fánastöng + gasometer: Gasmælir + groyne: Öldubrjótur + kiln: Brennsluofn lighthouse: Viti + mast: Mastur + mine: Náma + mineshaft: Námugöng + monitoring_station: Vöktunarstöð + petroleum_well: Olíulind + pier: Bryggja pipeline: Leiðsla + silo: Síló + storage_tank: Geymslutankur + surveillance: Eftirlit tower: Turn + wastewater_plant: Vatnshreinsistöð + watermill: Vatnsmylla + water_tower: Vatnsturn + water_well: Brunnur + water_works: Vatnsvinnsla + windmill: Vindmylla works: Verksmiðja "yes": Manngert military: airfield: Herflugvöllur barracks: Herbúðir bunker: Sprengjubyrgi + "yes": Hernaðar mountain_pass: "yes": Fjallaskarð natural: @@ -733,11 +776,14 @@ is: accountant: Bókari administrative: Stjórnsýsla architect: Arkítektar + association: Samtök company: Fyrirtæki + educational_institution: Menntastofnun employment_agency: Vinnumiðlun estate_agent: Fasteignasali government: Stjórnarskrifstofa insurance: Tryggingaskrifstofa + it: Upplýsingatækniskrifstofa lawyer: Lögmaður ngo: Skrifstofa frjálsra félagasamtaka telecommunication: Fjarskiptaskrifstofa @@ -745,9 +791,8 @@ is: "yes": Skrifstofa place: allotments: Úthlutuð svæði - block: Reitur - airport: Flugvöllur city: Borg + city_block: Götureitur country: Land county: Sýsla farm: Býli @@ -758,12 +803,13 @@ is: islet: Smáeyja isolated_dwelling: Einangraður bústaður locality: Sveitarfélag - moor: Mýri municipality: Sveitarfélag neighbourhood: Nágrenni postcode: Póstnúmer + quarter: Hverfi region: Hérað sea: Hafið + square: Torg state: Ríki subdivision: Undirskipting suburb: Úthverfi @@ -775,10 +821,8 @@ is: abandoned: Aflögð járnbraut construction: Járnbraut í byggingu disused: Aflögð járnbraut - disused_station: Aflögð járnbrautarstöð funicular: Kláfbraut halt: Lestarstopp - historic_station: Söguleg lestarstöð junction: Járnbrautatenging level_crossing: Þverun brautarteina light_rail: Léttlest @@ -804,6 +848,7 @@ is: beauty: Snyrtivöruverslun beverages: Drykkjarfangaverslun bicycle: Hjólaverslun + bookmaker: Veðmangari books: Bókabúð boutique: Sérverslun butcher: Slátrari @@ -842,12 +887,16 @@ is: hairdresser: Hársnyrting hardware: Verkfærabúð hifi: Hljómtækjaverslun - insurance: Tryggingar + houseware: Húsbúnaðarverslun + interior_decoration: Innanhúshönnun jewelry: Skartgripaverslun kiosk: Söluturn + kitchen: Eldhúsvörur laundry: Þvottahús + lottery: Lottó mall: Verslunarkjarni market: Markaður + massage: Nudd mobile_phone: Farsímaverslun motorcycle: Mótorhjólaverslun music: Tónlistarverslun @@ -855,21 +904,27 @@ is: optician: Sjóntækjafræðingur organic: Verslun með lífrænt fæði outdoor: Útivistarverslun + paint: Málningarvöruverslun + pawnbroker: Veðlánari pet: Gæludýraverslun pharmacy: Lyfjabúð photo: Ljósmyndavöruverslun - salon: Snyrtistofa + seafood: Fiskmeti second_hand: Verslun með notað shoes: Skóbúð - shopping_centre: Verslunarmiðstöð sports: Íþróttavöruverslun stationery: Ritfangaverslun supermarket: Kjörbúð tailor: Klæðskeri + ticket: Miðasala + tobacco: Tóbaksverslun toys: Leikfangaverslun travel_agency: Ferðaskrifstofa + tyres: Dekkjaverslun + vacant: Laust verslunarrými + variety_store: Smávörumarkaður video: Videoleiga - wine: Án vínveitingaleyfis + wine: Vínbúð "yes": Verslun tourism: alpine_hut: Fjallaskáli @@ -893,6 +948,7 @@ is: viewpoint: Útsýnisstaður zoo: Dýragarður tunnel: + building_passage: Undirgöng í gegnum byggingu culvert: Ræsi "yes": Göng waterway: @@ -1160,14 +1216,34 @@ is: start_mapping: Hefja kortlagningu add_a_note: title: Enginn tími fyrir breytingar? Bættu við athugasemd! + paragraph_1_html: Það er auðvelt að bæta við minnispunkti ef þú vilt laga eitthvað + smávægilegt en hefur ekki tíma til að skrá þig og læra hvernig maður breytir + kortinu. + paragraph_2_html: |- + Farðu á landakortið og smelltu á minnismiðatáknið: + . Þetta mun bæta merki á kortið, sem þú getur fært til + með því að draga það. Bættu við skilaboðunum þínum, smelltu síðan á að vista, og annað kortagerðarfólk mun væntanlega rannsaka málið. fixthemap: title: Tilkynna vandamál / Laga kortið how_to_help: title: Hvernig á að hjálpa til join_the_community: title: Ganga í hópinn + explanation_html: |- + Ef þú hefur rekist á vandamál í kortagögnunum, til dæmis ef það vantar götu eða húsnúmer, er besta leiðin + að ganga til liðs við OpenStreetMap og bæta við eða laga gögnin sjálfur. \ + add_a_note: + instructions_html: |- + Smelltu á eða sama táknið í kortaglugganum. + Þetta mun bæta merki á kortið, sem þú getur fært til + með því að draga það. Bættu við skilaboðunum þínum, smelltu síðan á að vista, og annað kortagerðarfólk mun væntanlega rannsaka málið. other_concerns: title: Önnur íhugunarefni + explanation_html: "Ef þú ert að velta fyrir þér hvernig gögnin okkar eru notuð + eða einhverju varðandi efni þeirra, geturðu skoðað\nsíðuna + varðandi höfundarrétt varðandi nánari lagaskýringar, eða haft samband + við viðeigandi \nOSMF + vinnuhóp. \\" help_page: title: Til að fá hjálp introduction: |- @@ -1244,7 +1320,9 @@ is: okkar varðandi ásættanlega notkun auk persónuverndarstefnu okkar\n.
\nEndilega hafðu samband við OSMF \nef þú ert með spurningar eða beiðnir varðandi notkunarleyfi, - höfundarrétt eða önnur lögfræðileg málefni." + höfundarrétt eða önnur lögfræðileg málefni.\n
\nOpenStreetMap, táknmerkið + með stækkunarglerinu og ástand kortsins eru skrásett + vörumerki OSMF." partners_title: Samstarfsaðilar notifier: diary_comment_notification: @@ -1327,24 +1405,46 @@ is: af minnispunktunum þínum' subject_other: '[OpenStreetMap@] %{commenter} hefur gert athugasemd við minnispunkt sem þú hefur áhuga á' + your_note: '%{commenter} hefur sett athugasemd við einn af minnispunktunum + þínum nálægt %{place}.' + commented_note: '%{commenter} hefur sett athugasemd við minnispunkt á korti + sem þú hefur gert athugasemd við. Minnispunkturinn er nálægt %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} hefur leyst einn af minnispunktunum þínum' subject_other: '[OpenStreetMap@] %{commenter} hefur leyst minnispunkt sem þú hefur áhuga á' + your_note: '%{commenter} hefur leyst einn af minnispunktunum þínum nálægt + %{place}.' + commented_note: '%{commenter} hefur leyst minnispunkt á korti sem þú hefur + gert athugasemd við. Minnispunkturinn er nálægt %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} hefur endurvirkjað einn af minnispunktunum þínum' subject_other: '[OpenStreetMap@] %{commenter} hefur endurvirkjað minnispunkt sem þú hefur áhuga á' + your_note: '%{commenter} hefur endurvirkjað einn af minnispunktunum þínum + nálægt %{place}.' + commented_note: '%{commenter} hefur endurvirkjað minnispunkt á korti sem þú + hefur gert athugasemd við. Minnispunkturinn er nálægt %{place}.' details: Nánari upplýsingar um minnispunktinn er að finna á %{url}. changeset_comment_notification: hi: Hæ %{to_user}, greeting: Hæ, commented: + subject_own: '[OpenStreetMap] %{commenter} hefur gert athugasemd við eitt + af breytingasettunum þínum' + subject_other: '[OpenStreetMap@] %{commenter} hefur gert athugasemd við breytingasett + sem þú hefur áhuga á' + your_changeset: '%{commenter} hefur sett athugasemd við eitt af breytingasettunum + þínum sem búið var til %{time}' + commented_changeset: '%{commenter} hefur sett athugasemd við breytingasett + á korti sem þú fylgist með og var búið til af %{changeset_author} - %{time}' partial_changeset_with_comment: með umsögninni '%{changeset_comment}' partial_changeset_without_comment: án athugasemdar details: Nánari upplýsingar um breytingasettið er að finna á %{url}. + unsubscribe: Til að hætta áskrift að uppfærslum á þessu breytingasetti, farðu + þá á %{url} og smelltu á "Segja upp áskrift". message: inbox: title: Innhólf @@ -1396,6 +1496,10 @@ is: no_sent_messages: Þú hefur ekki seint nein skeyti, hví ekki að hafa samband við einhverja %{people_mapping_nearby_link}? people_mapping_nearby: nálæga notendur + reply: + wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst + um að svara voru ekki send til þess notanda. Skráðu þig inn sem réttan notanda + til að geta svarað. read: title: Les skilaboð from: Frá @@ -1406,6 +1510,9 @@ is: delete_button: Eyða back: Til baka to: Til + wrong_user: Þú hefur skráð þig inn sem `%{user}' en skilaboðin sem þú baðst + um að lesa voru ekki send af eða til þess notanda. Skráðu þig inn sem réttan + notanda til að geta svarað. sent_message_summary: delete_button: Eyða mark: @@ -1423,6 +1530,8 @@ is: createnote: Bæta við minnispunkti license: copyright: Höfundarréttur OpenStreetMap og þáttakendur, með opnu notkunarleyfi + remote_failed: Breytingar mistókust - gakktu úr skugga um að JOSM eða Merkaartor + sé hlaðið inn og að fjarstjórnunarvalkosturinn sé virkur edit: not_public: Þú hefur ekki merkt breytingar þínar sem opinberar. not_public_description: Þú getur ekki lengur gert breytingar nema þær séu merktar @@ -1456,6 +1565,7 @@ is: where_am_i: Hvar er þetta? where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu submit_text: Byrja + reverse_directions_text: Snúa stefnu við key: table: entry: @@ -1640,6 +1750,8 @@ is: public_traces_from: Ferlar eftir %{user} description: Skoða nýlega innsenda GPS-ferla tagged_with: ' með merkið %{tags}' + empty_html: Ekkert hér ennþá. Sendu inn nýjan feril + eða lærðu meira um GPS-ferlun á wiki-síðunni. delete: scheduled_for_deletion: Þessum feril verður eitt make_public: @@ -1698,6 +1810,8 @@ is: invalid: Auðkenningarteiknið er ekki gilt. revoke: flash: Þú afturkallaðir aðgangsteiknið fyrir %{application} + permissions: + missing: Þú hefur ekki gefið forritinu heimild fyrir aðgang að þessum eiginleikum oauth_clients: new: title: Skrá nýtt forrit @@ -1734,6 +1848,9 @@ is: issued_at: Gefið út þann revoke: Eyða banninu my_apps: Forritin mín + no_apps: Ert þú að nota forrit sem þú myndir vilja skrá til notkunar hjá okkur + með %{oauth} staðlinum? Þú verður að skrá vefforritið áður en það fer að senda + OAuth-beiðnir á þessa þjónustu. registered_apps: 'Þú hefur skráð eftirfarandi forrit:' register_new: Skrá nýtt forrit form: @@ -1755,6 +1872,10 @@ is: sorry: Því miður, þessi %{type} fannst ekki. create: flash: Nýtt OAuth forrit hefur verið skráð + update: + flash: Uppfærði upplýsingar biðlaraforritsins + destroy: + flash: Eyðilagði skráningu biðlaraforritsins user: login: title: Innskrá @@ -1857,6 +1978,8 @@ is: password: 'Lykilorð:' confirm password: 'Staðfestu lykilorðið:' use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar + auth no password: Með auðkenningu frá þriðja aðila er ekki nauðsynlegt að nota + lykilorð, en einhver aukaverkfæri eða þjónar gætu samt þurft á því að halda. continue: Nýskrá terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags þíns! @@ -1867,10 +1990,14 @@ is: terms: title: Skilmálar vegna framlags heading: Skilmálar vegna framlags + read and accept: Lestu skilmálana og ýttu á 'Samþykkja' hnappinn til að staðfesta + að þý fallist á skilmálana fyrir núverandi- jafnt sem framtíðar- framlög þín. consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög mín verði í almenningseigu (Public Domain) consider_pd_why: hvað þýðir þetta? consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + guidance: 'Upplýsingar sem hjálpa til við að skilja þessi hugtök: á mannamáli + og nokkrar óformlegar þýðingar' agree: Samþykkja declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Hafna @@ -2028,6 +2155,8 @@ is: confirm: heading: Athuga með tölvupóstinn þinn! introduction_1: Við höfum sent þér staðfestingartölvupóst. + introduction_2: Staðfestu aðganginn þinn með því að smella á tengilinn í tölvupóstinum + og þá geturðu hafið kortlagningu. press confirm button: Hér getur þú staðfest að þú viljir virkja notandaaðganginn þinn. button: Staðfesta @@ -2037,6 +2166,11 @@ is: reconfirm_html: Ef þú vilt að við sendum þér staðfestingarpóstinn aftur, smelltu hér. confirm_resend: + success: Við höfum sent staðfestingarskilaboð til %{email}, um leið og þú staðfestir + aðganginn þinn geturðu farið að vinna í kortunum.

Ef þú ert að + nota ruslpóstsíukerfi sem sendir staðfestingarbeiðnir, gakktu úr skugga um + að %{sender} sé á lista yfir leyfða sendendur, því við erum ekki fær um að + svara neinum staðfestingarbeiðnum. failure: Notandinn %{name} fannst ekki. confirm_email: heading: Staðfesta breytingu á netfangi @@ -2081,9 +2215,20 @@ is: \nvirkni.\n

\n

\nHafðu samband við vefstjóra ef þú \nvilt ræða þetta mál.\n

" auth_failure: + connection_failed: Tenging við auðkenningarþjónustu mistókst + invalid_credentials: Ógild auðkenni sannvottunar no_authorization_code: Enginn auðkenningarkóði unknown_signature_algorithm: Óþekkt reiknirit undirritunar invalid_scope: Ógilt notkunarsvið + auth_association: + heading: Auðkennið þitt er ekki ennþá tengt neinum OpenStreetMap-aðgangi. + option_1: |- + Ef þú ert ný(r) notandi í OpenStreetMap, skaltu útbúa nýjan aðgang + með því að nota innfyllingarformið hér fyrir neðan. + option_2: |- + Ef þú ert þegar með aðgang, geturðu skráð þig inn á aðganginn + með notandanafni og lykilorði og síðan tengt aðganginn + við auðkennið þitt í notandastillingunum. user_role: filter: not_an_administrator: Aðeins möppudýr geta sýslað með leyfi, og þú ert ekki @@ -2091,6 +2236,7 @@ is: not_a_role: „%{role}“ er ekki gilt leyfi. already_has_role: Notandinn hefur þegar „%{role}“ leyfi doesnt_have_role: Notandinn er ekki með „%{role}“ leyfi. + not_revoke_admin_current_user: Get ekki svift þennan notanda möppudýrsréttindum. grant: title: Staðfestu leyfisveitingu heading: Staðfestu leyfisveitingu @@ -2134,6 +2280,7 @@ is: back: Listi yfir öll bönn needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi. filter: + block_expired: Bannið er þegar útrunnið og er ekki hægt að breyta. block_period: Banntíminn verður að vera í forstillingunum. create: try_contacting: Endilega reyndu að hafa samband við notendur áður en þú bannar @@ -2215,6 +2362,9 @@ is: reopened_at_by_html: Endurvirkjað fyrir %{when} síðan af %{user} rss: title: Minnispunktar OpenStreetMap + description_area: Listi yfir minnispunkta sem hafa verið tilkynntir, gerðar + athugasemdir við eða hefur verið lokað á svæðinu þínu [(%{min_lat}|%{min_lon}) + -- (%{max_lat}|%{max_lon})] description_item: RSS-streymi fyrir minnispunkt %{id} opened: nýr minnispunktur (nálægt %{place}) commented: ný athugasemd (nálægt %{place}) @@ -2224,7 +2374,11 @@ is: comment: Athugasemd full: Allur minnispunkturinn mine: + title: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir við af + %{user} heading: Minnispunktar frá %{user} + subheading: Minnispunktar sem hafa verið sendir inn eða gerðar athugasemdir + við af %{user} id: Auðkenni (ID) creator: Búið til af description: Lýsing @@ -2276,6 +2430,7 @@ is: notes: Minnispunktar á korti data: Gögn korts gps: Opinberir GPS-ferlar + overlays: Virkja yfirlög til að auðvelda lausn vandamála á kortinu title: Lög copyright: © Þáttakendur í OpenStreetMap verkefninu donate_link_text: @@ -2300,8 +2455,13 @@ is: intro: Fannstu mistök eða eitthvað sem vantar? Láttu aðra kortagerðarmenn vita svo hægt sé að laga það. Færðu kortamerkið á réttan stað og skrifaðu minnispunkt til að útskýra vandamálið. + advice: Minnispunkturinn þinn er opinber og gæti verið notaður til að uppfæra + kortið; því ættirðu ekki að setja inn neinar persónulegar upplýsingar, eða + upplýsingar úr höfundarvörðu efni. add: Bæta við minnispunkti show: + anonymous_warning: Þessi minnispunktur inniheldur athugasemdir frá óskráðum + notendum sem ætti að yfirfara sérstaklega. hide: Fela resolve: Leysa reactivate: Virkja aftur @@ -2329,7 +2489,15 @@ is: continue_without_exit: Haltu áfram á %{name} slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name} offramp_right_without_exit: Farðu á rampinn til hægri yfir á %{name} + offramp_right_with_directions: Farðu á rampinn til hægri í áttina að %{directions} + offramp_right_with_name_and_directions: Farðu á rampinn til hægri á %{name}, + í áttina að %{directions} + offramp_right_without_directions: Farðu á rampinn til hægri onramp_right_without_exit: Beygðu til hægri á rampinum inn á %{name} + onramp_right_with_directions: Beygðu til hægri á rampinn í áttina að %{directions} + onramp_right_with_name_and_directions: Beygðu til hægri á rampinn til %{name}, + í áttina að %{directions} + onramp_right_without_directions: Beygðu til hægri á rampinn endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn á %{name} merge_right_without_exit: Hliðraðu þér inn á akreinina til hægri inn á %{name} @@ -2340,7 +2508,15 @@ is: sharp_left_without_exit: Kröpp vinstribeygja inn á %{name} turn_left_without_exit: Beygðu til vinstri yfir á %{name} offramp_left_without_exit: Farðu á rampinn til vinstri yfir á %{name} + offramp_left_with_directions: Farðu á rampinn til vinstri í áttina að %{directions} + offramp_left_with_name_and_directions: Farðu á rampinn til vinstri á %{name}, + í áttina að %{directions} + offramp_left_without_directions: Farðu á rampinn til vinstri onramp_left_without_exit: Beygðu til vinstri á rampinum inn á %{name} + onramp_left_with_directions: Beygðu til vinstri á rampinn í áttina að %{directions} + onramp_left_with_name_and_directions: Beygðu til vinstri á rampinn til %{name}, + í áttina að %{directions} + onramp_left_without_directions: Beygðu til vinstri á rampinn endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn á %{name} merge_left_without_exit: Hliðraðu þér inn á akreinina til vinstri inn á %{name} @@ -2348,10 +2524,10 @@ is: slight_left_without_exit: Beygðu lítillega til vinstri yfir á %{name} via_point_without_exit: (um punkt) follow_without_exit: Fylgja %{name} - roundabout_without_exit: Í hringtorginu, beygðu á %{name} + roundabout_without_exit: Í hringtorginu, beygðu útaf á %{name} leave_roundabout_without_exit: Farðu út úr hringtorginu - %{name} stay_roundabout_without_exit: Vertu áfram á hringtorginu - %{name} - start_without_exit: Byrjaðu við endann á %{name} + start_without_exit: Byrjaðu á %{name} destination_without_exit: Farðu á leiðarenda against_oneway_without_exit: Farðu á móti einstefnu á %{name} end_oneway_without_exit: Einstefna endar á %{name} diff --git a/config/locales/it.yml b/config/locales/it.yml index 0aa002bbe..3f9c08324 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -168,6 +168,8 @@ it: title_comment: Gruppo di modifiche %{id} - %{comment} join_discussion: Accedi per unirti alla discussione discussion: Discussione + still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno + disponibili quando verrà chiuso. node: title: 'Nodo: %{name}' history_title: 'Cronologia nodo: %{name}' @@ -437,12 +439,19 @@ it: chair_lift: Seggiovia drag_lift: Sciovia gondola: Cabinovia + platter: Skilift a piattello + pylon: Pilone station: Stazione funivia + t-bar: Skilift ad ancora aeroway: aerodrome: Aerodromo + airstrip: Pista di atterraggio apron: Piazzale di sosta gate: Gate + hangar: Hangar helipad: Elisuperficie + holding_position: Posizione di attesa + parking_position: Posizione di parcheggio runway: Pista taxiway: Pista di rullaggio terminal: Terminal @@ -477,37 +486,32 @@ it: crematorium: Crematorio dentist: Dentista doctors: Medici - dormitory: Dormitorio drinking_water: Acqua potabile driving_school: Scuola guida embassy: Ambasciata - emergency_phone: Colonnina SOS fast_food: Fast Food ferry_terminal: Terminal traghetti - fire_hydrant: Pompa antincendio fire_station: Vigili del fuoco food_court: Area ristorazione fountain: Fontana fuel: Stazione di rifornimento gambling: Gioco d'azzardo grave_yard: Cimitero - gym: Centro fitness / Palestra - health_centre: Casa di cura + grit_bin: Contenitore antigelo hospital: Ospedale hunting_stand: Postazione di caccia ice_cream: Gelateria kindergarten: Asilo infantile library: Biblioteca - market: Mercato marketplace: Mercato monastery: Monastero motorcycle_parking: Parcheggio per Moto nightclub: Night Club - nursery: Asilo nido nursing_home: Residenza sanitaria assistenziale office: Ufficio parking: Parcheggio parking_entrance: Entrata del parcheggio + parking_space: Posto di parcheggio pharmacy: Farmacia place_of_worship: Luogo di culto police: Polizia @@ -517,7 +521,6 @@ it: prison: Prigione pub: Pub public_building: Edificio pubblico - reception_area: Area accoglienza recycling: Punto riciclaggio rifiuti restaurant: Ristorante retirement_home: Casa di Riposo @@ -542,6 +545,7 @@ it: village_hall: Municipio waste_basket: Cestino rifiuti waste_disposal: Smaltimento dei rifiuti + water_point: Punto di rifornimento acqua youth_centre: Centro Giovanile boundary: administrative: Confine amministrativo @@ -550,6 +554,7 @@ it: protected_area: Area protetta bridge: aqueduct: Acquedotto + boardwalk: Passerella suspension: Ponte sospeso swing: Ponte girevole viaduct: Viadotto @@ -569,25 +574,31 @@ it: "yes": Negozio di Artigianato emergency: ambulance_station: Stazione delle ambulanze + assembly_point: Punto di ritrovo defibrillator: Defibrillatore landing_site: Luogo per l'atterraggio di emergenza phone: Telefono di emergenza + water_tank: Serbatoio d'acqua di emergenza + "yes": Emergenza highway: abandoned: Autostrada abbandonata bridleway: Percorso per equitazione bus_guideway: Corsia autobus a guida vincolata bus_stop: Fermata dell'autobus construction: Strada in costruzione + corridor: Corridoio cycleway: Percorso ciclabile elevator: Ascensore emergency_access_point: Colonnina SOS footway: Percorso pedonale ford: Guado + give_way: Segnale di dare precedenza living_street: Living Street milestone: Pietra miliare motorway: Autostrada motorway_junction: Uscita autostradale motorway_link: Autostrada + passing_place: Piazzola di sosta path: Sentiero pedestrian: Percorso pedonale platform: Piattaforma @@ -604,6 +615,7 @@ it: services: Stazione di servizio speed_camera: Autovelox fisso steps: Scala + stop: Segnale di arresto street_lamp: Lampione tertiary: Strada terziaria tertiary_link: Strada terziaria @@ -612,8 +624,8 @@ it: trail: Percorso escursionistico trunk: Superstrada trunk_link: Superstrada + turning_loop: Anello di inversione di marcia unclassified: Strada non classificata - unsurfaced: Strada non pavimentata "yes": Strada historic: archaeological_site: Sito archeologico @@ -632,6 +644,7 @@ it: manor: Maniero memorial: Memoriale mine: Mina + mine_shaft: Pozzo minerario monument: Monumento roman_road: Strada romana ruins: Rovine @@ -641,6 +654,7 @@ it: wayside_cross: Croce wayside_shrine: Edicola votiva wreck: Relitto + "yes": Sito storico junction: "yes": Incrocio landuse: @@ -678,9 +692,9 @@ it: leisure: beach_resort: Stabilimento balneare bird_hide: Osservatorio Camuffato - club: Club common: Area comune (UK) dog_park: Parco per cani + firepit: Braciere fishing: Riserva di pesca fitness_centre: Centro Fitness fitness_station: Centro fitness @@ -705,15 +719,44 @@ it: water_park: Parco acquatico "yes": Tempo libero man_made: + adit: Galleria mineraria + beacon: Fanale + beehive: Alveare + breakwater: Frangiflutti + bridge: Ponte + bunker_silo: Bunker + chimney: Ciminiera + crane: Gru + dyke: Argine + embankment: Terrapieno + flagpole: Asta portabandiera + gasometer: Gasometro + kiln: Fornace lighthouse: Faro + mast: Pilone + mine: Miniera + mineshaft: Pozzo minerario + monitoring_station: Stazione di monitoraggio + petroleum_well: Pozzo petrolifero + pier: Molo pipeline: Tubazione + silo: Silo + storage_tank: Cisterna di stoccaggio + surveillance: Sorveglianza tower: Torre + wastewater_plant: Impianto di depurazione delle acque + watermill: Mulino ad acqua + water_tower: Torre dell'acqua + water_well: Pozzo + water_works: Impianto idrico + windmill: Mulino a vento works: Fabbrica "yes": Artificiale military: airfield: Aeroporto militare barracks: Caserma bunker: Bunker + "yes": Militare mountain_pass: "yes": Passo di montagna natural: @@ -759,11 +802,14 @@ it: accountant: Ragioniere administrative: Amministrazione architect: Architetto + association: Associazione company: Azienda + educational_institution: Istituto d'istruzione employment_agency: Agenzia di lavoro estate_agent: Agente immobiliare government: Ufficio governativo insurance: Agenzia di assicurazione + it: Ufficio IT lawyer: Avvocato ngo: Ufficio di una ONG (Organizzazione Non Governativa) telecommunication: Ufficio di telecomunicazioni @@ -771,9 +817,8 @@ it: "yes": Ufficio place: allotments: Orti casalinghi - block: Blocco - airport: Aeroporto city: Città + city_block: Blocco urbano country: Nazione county: Contea (in Italia NON usare) farm: Area agricola @@ -784,12 +829,13 @@ it: islet: Isoletta isolated_dwelling: Case sparse locality: Località (luogo con nome, non popolato) - moor: Molo municipality: Comune neighbourhood: Quartiere postcode: CAP + quarter: Quartiere region: Provincia sea: Mare + square: Piazza state: Regione subdivision: Suddivisione suburb: Quartiere @@ -801,10 +847,8 @@ it: abandoned: Ferrovia abbandonata construction: Ferrovia in costruzione disused: Ferrovia in disuso - disused_station: Stazione ferroviaria in disuso funicular: Funicolare halt: Fermata del treno - historic_station: Stazione ferroviaria storica junction: Nodo ferroviario level_crossing: Passaggio a livello light_rail: Metropolitana leggera @@ -830,6 +874,7 @@ it: beauty: Prodotti cosmetici beverages: Negozio bevande bicycle: Negozio biciclette + bookmaker: Centro scommesse books: Libreria boutique: Boutique butcher: Macellaio @@ -868,12 +913,16 @@ it: hairdresser: Parrucchiere hardware: Ferramenta hifi: Hi-Fi - insurance: Assicurazioni + houseware: Negozio di casalinghi + interior_decoration: Decorazione d'interni jewelry: Gioielleria kiosk: Edicola + kitchen: Negozio di cucina laundry: Lavanderia + lottery: Lotteria mall: Centro commerciale market: Mercato + massage: Massaggio mobile_phone: Centro telefonia mobile motorcycle: Concessionario di motociclette music: Articoli musicali @@ -881,21 +930,27 @@ it: optician: Ottico organic: Negozio di prodotti naturali ed ecologici outdoor: Negozio di articoli per sport all'aperto + paint: Negozio di vernici + pawnbroker: Banco dei pegni pet: Negozio animali pharmacy: Farmacia photo: Articoli fotografici - salon: Salone + seafood: Frutti di mare second_hand: Negozio oggetti usati shoes: Negozio di calzature - shopping_centre: Centro commerciale sports: Articoli sportivi stationery: Cartoleria supermarket: Supermercato tailor: Sarto + ticket: Biglietteria + tobacco: Tabaccheria toys: Negozio di giocattoli travel_agency: Agenzia di viaggi + tyres: Negozio di pneumatici + vacant: Spazio commerciale libero + variety_store: Negozio a prezzi fissi video: Videoteca - wine: Alcolici + wine: Negozio di vini "yes": Negozio tourism: alpine_hut: Rifugio alpino @@ -1119,8 +1174,8 @@ it: trademarks_title_html: Marchi registrati trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e "State of the Map" sono marchi registrati della Fondazione OpenStreetMap. - Se avete domande sull''uso dei marchi, inviatele al gruppo - di lavoro per le licenze.' + Se avete domande sull''uso dei marchi, vedi la nostra politica + sui marchi.' welcome_page: title: Benvenuto! introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile. @@ -1261,7 +1316,9 @@ it: di utilizzo accettabile ed alla nostra informativa sulla privacy\n
\nSi prega di contattare la OSMF \nin caso di dubbi e problemi di licenza, copyright o altre questioni - legali." + legali.\n
\n\"OpenStreetMap\", il logo con la lente d'ingrandimento e \"State + of the Map\" sono sono + marchi registrati della OSMF." partners_title: Partner notifier: diary_comment_notification: @@ -1501,6 +1558,7 @@ it: where_am_i: Dove lo trovo? where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca submit_text: Vai + reverse_directions_text: Inverti la marcia key: table: entry: @@ -2036,7 +2094,7 @@ it: public editing: heading: 'Modifiche pubbliche:' enabled: Abilitate. Non anonimo con il permesso di modificare i dati. - enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: che cos'è questo? disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche precedenti sono anonime. @@ -2112,7 +2170,7 @@ it: press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email. button: Conferma - success: Confermato il cambio di indirizzo e-mail! + success: Confermata la modifica di indirizzo email! failure: Un indirizzo email con questo codice è già stato confermato. unknown_token: Questo codice di conferma è scaduto oppure non esiste. set_home: @@ -2173,6 +2231,8 @@ it: not_a_role: La stringa `%{role}' non è un ruolo valido. already_has_role: L'utente possiede già il ruolo %{role}. doesnt_have_role: L'utente non possiede il ruolo %{role}. + not_revoke_admin_current_user: Impossibile rimuovere i privilegi di amministratore + all'utente corrente. grant: title: Conferma l'assegnazione del ruolo heading: Conferma l'assegnazione del ruolo @@ -2397,6 +2457,9 @@ it: intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli altri mappatori così possono correggerlo. Sposta il puntatore nella posizione esatta e inserisci una nota per spiegare il problema. + advice: La tua nota è pubblica e potrebbe essere utilizzata per aggiornare + la mappa, pertanto non inserire informazioni personali e neppure dati provenienti + da mappe protette da copyright oppure elenchi. add: Aggiungi la nota show: anonymous_warning: Questa nota include commenti da parte di utenti anonimi @@ -2428,7 +2491,15 @@ it: continue_without_exit: Prosegui su %{name} slight_right_without_exit: Svolta leggermente a destra in %{name} offramp_right_without_exit: Prendi la rampa sulla destra in %{name} + offramp_right_with_directions: Prendi la rampa a destra in direzione %{directions} + offramp_right_with_name_and_directions: Prendi la rampa a destra su %{name}, + in direzione %{directions} + offramp_right_without_directions: Prendi la rampa a destra onramp_right_without_exit: Gira a destra sulla rampa in %{name} + onramp_right_with_directions: Gira a destra sulla rampa in direzione %{directions} + onramp_right_with_name_and_directions: Gira a destra sulla rampa su %{name}, + in direzione %{directions} + onramp_right_without_directions: Gira a destra sulla rampa endofroad_right_without_exit: Alla fine della strada svolta a destra in %{name} merge_right_without_exit: Immettiti a destra in %{name} fork_right_without_exit: Al bivio svolta a destra in %{name} @@ -2438,17 +2509,25 @@ it: sharp_left_without_exit: Svolta tutto a sinistra in %{name} turn_left_without_exit: Svolta a sinistra in %{name} offramp_left_without_exit: Prendi la rampa sulla sinistra in %{name} + offramp_left_with_directions: Prendi la rampa a sinistra in direzione %{directions} + offramp_left_with_name_and_directions: Prendi la rampa a sinistra su %{name}, + in direzione %{directions} + offramp_left_without_directions: Prendi la rampa a sinistra onramp_left_without_exit: Gira a sinistra sulla rampa in %{name} + onramp_left_with_directions: Gira a sinistra alla rampa in direzione %{directions} + onramp_left_with_name_and_directions: Gira a sinistra alla rampa su %{name}, + in direzione %{directions} + onramp_left_without_directions: Gira a sinistra sulla rampa endofroad_left_without_exit: Alla fine della strada svolta a sinistra in %{name} merge_left_without_exit: Immettiti a sinistra in %{name} fork_left_without_exit: Al bivio svolta a sinistra in %{name} slight_left_without_exit: Svolta leggermente a sinistra in %{name} via_point_without_exit: (punto di passaggio) follow_without_exit: Segui %{name} - roundabout_without_exit: Alla rotonda prendi %{name} + roundabout_without_exit: Alla rotonda prendi l'uscita su %{name} leave_roundabout_without_exit: Esci dalla rotonda - %{name} stay_roundabout_without_exit: Rimani sulla rotonda - %{name} - start_without_exit: Inizia alla fine di %{name} + start_without_exit: Inizia a %{name} destination_without_exit: Raggiungi la destinazione against_oneway_without_exit: Vai contro il senso unico in %{name} end_oneway_without_exit: Fine del senso unico in %{name} diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 3fbb59bec..bf94aeb09 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -159,6 +159,7 @@ ja: title_comment: 変更セット %{id} - %{comment} join_discussion: 議論に参加するにはログインしてください discussion: 議論 + still_open: 変更セットが開いたままです - 議論を行うには変更セットが閉じられている必要があります。 node: title: 'ノード: %{name}' history_title: 'ノードの履歴: %{name}' @@ -450,33 +451,26 @@ ja: crematorium: 火葬場 dentist: 歯科医 doctors: 医師 - dormitory: 寮 drinking_water: 飲み水 driving_school: 自動車学校 embassy: 大使館 - emergency_phone: 緊急電話 fast_food: ファストフード ferry_terminal: フェリー乗り場 - fire_hydrant: 消火栓 fire_station: 消防署 food_court: フードコート fountain: 噴水 fuel: 燃料 gambling: ギャンブル grave_yard: 墓地 - gym: フィットネス センター/ジム - health_centre: 保健所 hospital: 病院 hunting_stand: ハンティング スタンド ice_cream: アイスクリーム販売店 kindergarten: 幼稚園 library: 図書館 - market: 市場 marketplace: 市場 monastery: 修道院 motorcycle_parking: バイクの駐輪場 nightclub: ナイト クラブ - nursery: 保育所 nursing_home: 老人ホーム office: オフィス parking: 駐車場 @@ -490,7 +484,6 @@ ja: prison: 刑務所 pub: パブ public_building: 公共建築物 - reception_area: レセプションエリア recycling: リサイクル場 restaurant: レストラン retirement_home: 老人ホーム @@ -586,7 +579,6 @@ ja: trunk: 国道 trunk_link: 国道 unclassified: 未分類の道路 - unsurfaced: 未舗装道路 "yes": 道路 historic: archaeological_site: 考古学サイト @@ -651,7 +643,6 @@ ja: leisure: beach_resort: ビーチ リゾート bird_hide: 観察小屋 - club: クラブ common: 共有地 dog_park: ドッグ・パーク fishing: 釣り場 @@ -682,6 +673,8 @@ ja: man_made: lighthouse: 灯台 pipeline: パイプライン + silo: サイロ + storage_tank: 貯蔵タンク tower: 塔 works: 工房 "yes": 人工 @@ -735,6 +728,7 @@ ja: administrative: 管理 architect: 建築士 company: 会社 + educational_institution: 教育施設 employment_agency: 職業紹介 estate_agent: 不動産代理店 government: 官公庁 @@ -746,8 +740,6 @@ ja: "yes": オフィス place: allotments: 家庭菜園 - block: ブロック - airport: 空港 city: 市 country: 国 county: 郡 @@ -759,7 +751,6 @@ ja: islet: 小島 isolated_dwelling: 免震住宅 locality: 地域 - moor: 沼地 municipality: 市町村 neighbourhood: 小字 postcode: Postcode @@ -776,10 +767,8 @@ ja: abandoned: 廃止鉄道 construction: 建設中の鉄道 disused: 廃線跡 - disused_station: 廃駅 funicular: ケーブル鉄道 halt: 列車停止 - historic_station: 廃駅 junction: 鉄道連絡駅 level_crossing: 踏切 light_rail: ライトレール @@ -843,7 +832,6 @@ ja: hairdresser: 美容室 hardware: ホームセンター hifi: 高級オーディオ - insurance: 保険 jewelry: 宝石店 kiosk: キオスク laundry: クリーニング店 @@ -856,21 +844,24 @@ ja: optician: メガネ店 organic: 有機食材店 outdoor: アウトドア ショップ + paint: 画材店 pet: ペット ショップ pharmacy: 薬局 photo: 写真屋 - salon: サロン + seafood: 海鮮品屋 second_hand: 中古品店 shoes: 靴屋 - shopping_centre: ショッピング センター sports: スポーツ用品専門店 stationery: 文房具店 supermarket: スーパーマーケット tailor: 洋服店 + ticket: チケット店 + tobacco: タバコ屋 toys: 玩具店 travel_agency: 旅行代理店 + variety_store: 雑貨店 video: ビデオ ショップ - wine: 酒屋 + wine: ワイン屋 "yes": 店舗 tourism: alpine_hut: 高山小屋 @@ -1054,8 +1045,8 @@ ja: href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">却下手順をお読みになるか、オンライン却下のページから直接申し立てを行ってください。 trademarks_title_html: 商標 - trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関するお問い合わせはライセンス担当部までお寄せください。 + trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関しては、商標利用ポリシーを参照ください。 welcome_page: title: ようこそ! introduction_html: フリーで編集可能な世界地図、OpenStreetMapへようこそ。サインアップしたので、マッピングの準備はすべて整いました。知っておかなければならない重要事項を簡単に説明します。 @@ -1150,10 +1141,11 @@ ja: open_data_html: OpenStreetMapはオープンデータです。あなたはOpenStreetMapと協力者の著作権を表示すれば、いかなる目的でも無料で利用することができます。もし何らかの方法でデータを変更したり二次データを作成したりした場合も、同じライセンス条件下でのみ結果を配布できます。詳しくは、著作権とライセンスをご覧ください。 legal_title: 法律関係 - legal_html: "このサイトおよび関連のサービスはOpenStreetMap財団 - (OSMF)のコミュニティから継承したものです。OpenStreetMap財団の運営するサービスの利用者には利用規定ならびに当財団のOpenStreetMap財団 + (OSMF) が運営しています。OpenStreetMap財団の運営するサービス利用者は、私たちの定める利用規定ならびに当財団のプライバシーに関する規定の対象となります。\n
- \nライセンス、著作権その他法的な質問や問題がある場合は、OpenStreetMap財団までご連絡ください。" + \nライセンス、著作権その他法的な質問や問題がある場合は、OpenStreetMap財団までご連絡ください。\n
\nOpenStreetMapならびに拡大鏡のロゴおよびState + of the MapはOpenStreetMap財団の登録商標です。" partners_title: パートナー notifier: diary_comment_notification: @@ -1339,7 +1331,7 @@ ja: get_directions_title: 2点を結ぶルートを検索 from: 出発点 to: 目的地 - where_am_i: これはどこにありますか? + where_am_i: 現在表示中の位置情報 where_am_i_title: 検索エンジンを使用して現在の場所を記述 submit_text: 検索 key: @@ -1952,6 +1944,7 @@ ja: not_a_role: 文字列「%{role}」は、有効な権限ではありません。 already_has_role: 利用者は既に %{role} 権限を付与されています。 doesnt_have_role: ユーザーに %{role} 権限が付与されていません。 + not_revoke_admin_current_user: 現在のユーザに管理者権限がありません。 grant: title: 権限付与の確認 heading: 権限付与の確認 @@ -2156,6 +2149,7 @@ ja: notes: new: intro: 間違いや情報の抜けがありましたか？　他のマッパーが修正できるよう、お知らせください。マーカーを正しい位置に移動し、問題を説明するメモを入力します。 + advice: 投稿した地図メモは公開され、地図の更新に利用されます。そのため、著作権保護された地図や一覧情報からの転用情報や、個人情報の入力は行わないでください。 add: メモを追加 show: anonymous_warning: このメモはIP利用者によるコメントも含んでいるため、個別に確認してください。 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index c9d5e07d5..c1f7c916c 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -336,30 +336,23 @@ ka: crematorium: კრემატორიუმი dentist: დანტისტი doctors: ექიმი - dormitory: საერთო საცხოვრებელი drinking_water: სასმელი წყალი driving_school: ავტოსკოლა embassy: საელჩო - emergency_phone: საგანგებო სიტუაციების სამსახურის ტელეფონი fast_food: სწრაფი კვება ferry_terminal: ბორანის სადგური - fire_hydrant: სახანძრო ჰიდრანტი fire_station: სახანძრო განყოფილება fountain: შადრევანი fuel: საწვავი grave_yard: საფლავი - gym: ფიტნეს ცენტრი / სავარჯიშო დარბაზი - health_centre: ჯანმრთელობის ცენტრი hospital: საავადმყოფო hunting_stand: სანადირო კოშკურა ice_cream: ნაყინი kindergarten: საბავშვო ბაღი library: ბიბლიოთეკა - market: მაღაზია marketplace: ბაზარი monastery: მონასტერი nightclub: ღამის კლუბი - nursery: პანსიონატი nursing_home: მოხუცებულთა თავშესაფარი office: ოფისი parking: ავტოსადგომი @@ -373,7 +366,6 @@ ka: prison: ციხე pub: პაბი public_building: საჯარო შენობა - reception_area: მიმღები recycling: ნაგავსაყრელი restaurant: რესტორანი retirement_home: მოხუცებულთა თავშესაფარი @@ -458,7 +450,6 @@ ka: traffic_signals: შუქნიშანი trail: ბილიკი unclassified: ადგილობრივი გზა - unsurfaced: უზედაპირო გზა "yes": გზა historic: archaeological_site: არქეოლოგიური გათხრები @@ -514,7 +505,6 @@ ka: vineyard: ვენახი "yes": მიწათსარგებლობა leisure: - club: კლუბი dog_park: ძაღლების პარკი fishing: სათევზაო ტერიტორია fitness_centre: ფიტნეს-ცენტრი @@ -601,8 +591,6 @@ ka: travel_agent: ტურისტული სააგენტო "yes": ოფისი place: - block: კვარტალი - airport: აეროპორტი city: ქალაქი country: ქვეყანა county: ოლქი @@ -612,7 +600,6 @@ ka: houses: სახლები island: კუნძული islet: პატარა კუნძული - moor: ტორფნარი municipality: მუნიციპალიტეტი neighbourhood: სამეზობლო postcode: საფოსტო ინდექსი @@ -628,10 +615,8 @@ ka: abandoned: მიტოვებული რკინიგზა construction: რკინიგზის რემონტი disused: მიტოვებული რკინიგზა - disused_station: მიტოვებული რკინიგზის სადგური funicular: ფუნიკულიორი halt: მატარებლის გაჩერება - historic_station: ისტორიული რკინიგზის სადგური level_crossing: სარკინიგზო გადასასვლელი light_rail: მსუბუქი რკინიგზა monorail: მონორელსი @@ -678,7 +663,6 @@ ka: gift: საჩუქრების მაღაზია greengrocer: ხილ-ბოსტნეულის მაღაზია hairdresser: საპარიკმახერო - insurance: სადაზღვევო jewelry: საიუველირო მაღაზია kiosk: ჯიხური laundry: სამრეცხაო @@ -693,10 +677,8 @@ ka: pet: ზოომაღაზია pharmacy: აფთიაქი photo: ფოტომაღაზია - salon: სალონი second_hand: მეორადების მაღაზია shoes: ფეხსაცმლის მაღაზია - shopping_centre: სავაჭრო ცენტრი sports: სპორტული მაღაზია stationery: საკანცელარიო მაღაზია supermarket: სუპერმარკეტი diff --git a/config/locales/kab.yml b/config/locales/kab.yml index d684fb659..d69178447 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -4,6 +4,7 @@ # Author: Belkacem77 # Author: Mastanabal # Author: Mhenni +# Author: MustaphaLateb # Author: Sayem AtVkm # Author: SlimaneAmiri --- @@ -440,33 +441,26 @@ kab: crematorium: TanerÉ£ut dentist: Amejjay n tuÉ£mas doctors: Imejjayen - dormitory: Anaḍḍas drinking_water: Aman n tissit driving_school: AÉ£erbaz n uselmed n tenheṛt embassy: Tamahelt - emergency_phone: TiliÉ£ri n utrab fast_food: Učči arurad ferry_terminal: Anemdu n ufirri - fire_hydrant: Amsexsay n tmes fire_station: Taqcelt n isexsayen food_court: Tamnaḍt n wučči fountain: Tala fuel: AserÉ£u gambling: Uraren yidrimen grave_yard: Tajebbant - gym: Fitness / tajimnastikt - health_centre: Almus n tdawsa hospital: Sbiá¹­ar hunting_stand: Tanefsart n uselfeÉ£ ice_cream: Tamagrist kindergarten: Tibḥirt n warrac library: Tanedlist - market: Alzuz marketplace: Ssuq monastery: Amunastiṛ motorcycle_parking: AneÉ£sar n imuá¹­uten nightclub: Tazeqqa n yiḍ - nursery: Tanectalt nursing_home: Axxam n tastaÉ£t s udawi office: Tanarit parking: AneÉ£sar @@ -480,7 +474,6 @@ kab: prison: Lḥebs pub: Ttberna public_building: AzadaÉ£ azayez - reception_area: Tamnaḍt n usiweḍ recycling: Point de wallus n usseqdec restaurant: Asečču retirement_home: Axxam n testaÉ£t @@ -575,9 +568,12 @@ kab: stone: Ablaḍ tomb: Tanḍelt landuse: + basin: Amdun farm: Tibḥirt farmland: Akal n tkerrazt forest: Tiẓgi + landfill: Agudu + railway: Avrid tmacit leisure: stadium: Annar natural: @@ -608,8 +604,6 @@ kab: "yes": Tanarit place: allotments: Talmat n twacult - block: Iḥder - airport: Anafag city: TiÉ£remt country: Tamurt county: Tamurt @@ -961,6 +955,9 @@ kab: key: table: entry: + forest: Tiẓgi + lake: + - Amdun school: - AÉ£erbaz - Tasdawit diff --git a/config/locales/km.yml b/config/locales/km.yml index be5070f1e..dc886ee44 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -276,23 +276,18 @@ km: crematorium: កន្លែងបញ្ចុះសព dentist: ទន្ដបណ្ឌិត doctors: វេជ្ជបណ្ឌិត - dormitory: អន្តេវាសិកដ្ឋាន drinking_water: ទឹកផឹក driving_school: សាលាបង្រៀនបើកបរ embassy: ស្ថានទូត - emergency_phone: ទូរស័ព្ទសង្រ្គោះបន្ទាន់ fire_station: ស្ថានីយ៍អគ្គីភ័យ food_court: អាហារដ្ឋាន fountain: ទឺកផុស fuel: ឥន្ធនៈ grave_yard: វាលផ្នូរខ្មោច - gym: មណ្ឌលឬកន្លែងហាត់ប្រាណ - health_centre: មណ្ឌលសុខភាព hospital: មន្ទីរពេទ្យ ice_cream: ការ៉េម kindergarten: សាលាមតេ្តយ្យ library: បណ្ណាល័យ - market: ផ្សារ marketplace: ទីផ្សារ nightclub: ក្លឹបរាត្រី office: ការិយាល័យ @@ -420,7 +415,6 @@ km: travel_agent: ភ្នាក់ងារទេសចរណ៍ "yes": ការិយាល័យ place: - airport: អាកាសយានដ្ឋាន city: ទីក្រុង county: ប្រទេស house: ផ្ទះ @@ -435,7 +429,6 @@ km: abandoned: ផ្លូវដែកបោះបង់ចោល construction: ផ្លូវដែកកំពុងស្ថាបនា disused: ផ្លូវដែកឈប់ប្រើ - disused_station: ស្ថានីយ៍ផ្លូវដែកឈប់ប្រើ station: ស្ថានីយ៍ផ្លូវដែក subway: ស្ថានីយ៍រថភ្លើងក្រោមដី subway_entrance: ច្រកចូលស្ថានីយ៍រថភ្លើងក្រោមដី diff --git a/config/locales/kn.yml b/config/locales/kn.yml index dc251cabd..90074c6d7 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -307,27 +307,21 @@ kn: crematorium: ‍‍ಚಿತಾಗಾರ dentist: ದಂತವೈದ್ಯ doctors: ವೈದ್ಯರು - dormitory: ‍‍ಧರ್ಮಶಾಲೆ drinking_water: ಕುಡಿಯುವ ನೀರು driving_school: ‍‍ವಾಹನ ಚಾಲನೆಯ ತರಬೇತಿ ಶಾಲೆ embassy: ‍‍ರಾಯಭಾರ ಕಚೇರಿಯ - emergency_phone: ‍‍ತುರ್ತು ದೂರವಾಣಿ fast_food: ‍‍ಫಾಸ್ಟ್ ಫುಡ್ ferry_terminal: ‍‍ಹಾಯಿದೋಣಿ ನಿಲ್ದಾಣ - fire_hydrant: ‍‍ಬೆಂಕಿ ಕೊಳಾಯಿ fire_station: ‍‍ಅಗ್ನಿಶಾಮಕ ಠಾಣೆ fountain: ‍ಕಾರಂಜಿ fuel: ‍ಇಂಧನ grave_yard: ಸ್ಮಾಶಾನ - health_centre: ‍‍ಆರೋಗ್ಯ ಕೇಂದ್ರ hospital: ಆಸ್ಪತ್ರೆ ice_cream: ‍ಐಸ್ ಕ್ರೀಂ kindergarten: ‍‍‍ಶಿಶುವಿಹಾರ library: ಗ್ರಂಥಾಲಯ - market: ‍‍ಮಾರುಕಟ್ಟೆ marketplace: ‍‍ಮಾರುಕಟ್ಟೆ monastery: ‍‍ಮಠ - nursery: ‍‍ನರ್ಸರಿ office: ಕಛೇರಿ pharmacy: ‍‍ಔ‍ಷಧಾಲಯ place_of_worship: ‍‍ಆರಾಧನಾ ಮಂದಿರ @@ -418,7 +412,6 @@ kn: ngo: ಸರ್ಕಾರೇತರ ಕಛೇರಿ "yes": ಕಛೇರಿ place: - airport: ವಿಮಾನ ನಿಲ್ದಾಣ city: ನಗರ country: ದೇಶ house: ಮನೆ @@ -433,7 +426,6 @@ kn: "yes": ಊರು railway: halt: ರೈಲು ನಿಲ್ದಾಣ - historic_station: ಐತಿಹಾಸಿಕ ರೈಲು ನಿಲ್ದಾಣ junction: ರೈಲು ಜಂಕ್ಷನ್ monorail: ಮೊನೊರೈಲು station: ರೈಲು ನಿಲ್ದಾಣ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 46ccf3d54..4deff2f29 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -451,33 +451,26 @@ ko: crematorium: 화장장 dentist: 치과 doctors: 의원 - dormitory: 기숙사 drinking_water: 음수대 driving_school: 운전 학원 embassy: 대사관 - emergency_phone: 긴급 전화 fast_food: 패스트 푸드 ferry_terminal: 페리 부두 - fire_hydrant: 소화전 fire_station: 소방서 food_court: 푸드코트 fountain: 분수대 fuel: 주유소 gambling: 도박장 grave_yard: 묘지 - gym: 피트니스 센터 / 체육관 - health_centre: 보건소 hospital: 병원 hunting_stand: 사냥장 ice_cream: 아이스크림 kindergarten: 유치원 library: 도서관 - market: 시장 marketplace: 시장 monastery: 수도원 motorcycle_parking: 오토바이 주차장 nightclub: 나이트 클럽 - nursery: 보육원 nursing_home: 복지관 office: 사옥 parking: 주차장 @@ -491,7 +484,6 @@ ko: prison: 교도소 pub: 술집 public_building: 공공 건물 - reception_area: 접수 구역 recycling: 재활용장 restaurant: 음식점 retirement_home: 노인정 @@ -578,6 +570,7 @@ ko: services: 고속도로 휴게소 speed_camera: 속도 카메라 steps: 계단 + stop: 정지 표지 street_lamp: 가로등 tertiary: 3ì°¨ 도로 tertiary_link: 3ì°¨ 도로 @@ -587,7 +580,6 @@ ko: trunk: 대로 또는 간선 도로 trunk_link: 간선 도로 unclassified: 분류되지 않은 도로 - unsurfaced: 비포장 도로 "yes": 도로 historic: archaeological_site: 유적지 @@ -615,6 +607,7 @@ ko: wayside_cross: 도로변의 십자가 wayside_shrine: 길가의 신사 wreck: 난파선 + "yes": 유적지 junction: "yes": 분기점 landuse: @@ -652,7 +645,6 @@ ko: leisure: beach_resort: 해수욕장 bird_hide: 조류 관찰소 - club: 클럽 common: 공유지 dog_park: 반려견 공원 fishing: 낚시터 @@ -679,9 +671,16 @@ ko: water_park: 워터 파크 "yes": 여가 man_made: + beehive: 벌통 + bridge: 다리 + chimney: 굴뚝 + dyke: 제방 lighthouse: 등대 + mineshaft: 갱도 pipeline: 파이프라인 tower: 탑 + water_well: 우물 + windmill: 풍차 works: 공장 "yes": 인공물 military: @@ -738,6 +737,7 @@ ko: estate_agent: 부동산 중개 government: 정부 기관 insurance: 보험 회사 사옥 + it: IT 오피스 lawyer: 변호사 사무실 ngo: 비정부 기구 사무실 telecommunication: 통신 회사 사옥 @@ -745,8 +745,6 @@ ko: "yes": 사옥 place: allotments: 텃밭 - block: 벽돌 - airport: 공항 city: 시 country: 국가 county: êµ° @@ -758,7 +756,6 @@ ko: islet: 작은 섬 isolated_dwelling: 독립 주택 locality: 지역 - moor: 습지 municipality: 시정촌 neighbourhood: 마을 postcode: 우편 번호 @@ -775,10 +772,8 @@ ko: abandoned: 폐선된 철도 construction: 건설 중인 철도 disused: 폐선된 철도 - disused_station: 폐역된 철도역 funicular: 케이블 ì¹´ halt: 기차 정지 - historic_station: 역사적인 철도역 junction: 철도 분기점 level_crossing: 건널목 light_rail: 경전철 @@ -842,7 +837,6 @@ ko: hairdresser: 미용실 hardware: 철물점 hifi: 고급 오디오 - insurance: 보험 jewelry: 보석 상점 kiosk: 키오스크 숍 laundry: 세탁소 @@ -858,10 +852,9 @@ ko: pet: 애완 동물 가게 pharmacy: 약국 photo: 사진관 - salon: 가게 + seafood: 해산물 second_hand: 중고품 가게 shoes: 신발 가게 - shopping_centre: 쇼핑 센터 sports: 스포츠용품점 stationery: 문구점 supermarket: 수퍼마켓 @@ -2307,7 +2300,7 @@ ko: roundabout_without_exit: '%{name}의 회전교차로에서' leave_roundabout_without_exit: 회전교차로를 떠나세요 - %{name} stay_roundabout_without_exit: 회전교차로에 머무세요 - %{name} - start_without_exit: '%{name}의 끝에서 시작' + start_without_exit: '%{name}에서 시작' destination_without_exit: 목적지에 도달합니다 against_oneway_without_exit: '%{name}(으)로 한 방향으로 가세요' end_oneway_without_exit: '%{name}에서의 한 방향의 끝' diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 77543719e..2ea45ac98 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -7,9 +7,12 @@ # Author: Gomada --- ku-Latn: + html: + dir: ltr time: formats: friendly: '%e %B %Y saet %H:%M' + blog: '%e %B %Y' activerecord: models: acl: Lîsteya Kontrolê Têketinan @@ -40,10 +43,10 @@ ku-Latn: tracepoint: Nuqteya Taqîbkirinê tracetag: Nîşana Şopandinê user: Bikarhêner - user_preference: Tercîhên Bikarhêner - user_token: Sembola Bikarhênerê + user_preference: Tercîhên bikarhêner + user_token: Sembola bikarhênerê way: Rê - way_node: Girêdana Rê + way_node: Girêdana rê way_tag: Nîşana rê attributes: diary_comment: @@ -91,7 +94,7 @@ ku-Latn: description: Potlatch 2 (sererastkirina ji ser geroka webê) remote: name: Ji Dûr Ve Îdarekirin - description: Ji Dûr Ve Kontrol (JOSM yan jî Merkaartor) + description: Ji dûr ve kontrol (JOSM yan jî Merkaartor) browse: created: Hate çêkirin closed: Hate girtin @@ -268,15 +271,15 @@ ku-Latn: full: Temamiya Gotûbêjê diary_entry: new: - title: Nivîsa Nû yê Rojane + title: Nivîsa nû yê rojane publish_button: Biweșîne list: title: Rojnivîskên bikarhêneran title_friends: Rojnivîskên hevalan title_nearby: Rojnivîskên Bikarhênerên nêzîk - user_title: Rojnivîska %{user}'s + user_title: Rojnivîska %{user} in_language_title: Nivîsên Rojane yên bi %{language} - new: Nivîsa Nû yê Rojane + new: Nivîsa nû yê rojane new_title: Di rojnivîska xwe de nivîsekî nû binivîse no_entries: Nivîsên rojane tine recent_entries: Nivîsên rojane yên dawîn @@ -344,11 +347,11 @@ ku-Latn: newer_comments: Şîroveyên nûtir older_comments: Şîroveyên kevintir export: - title: Eksport bike + title: Derxîne start: - area_to_export: Cihê ku wê were eksportkirin + area_to_export: Cihê ku wê were derxistin manually_select: Bi destê xwe cihekî din bibijêre - format_to_export: Awayê eksportkirinê + format_to_export: Awayê derxistinê osm_xml_data: Daneyên OpenStreetMapê a bi şiklê XML'yê map_image: Risma Xerîteyê (tebeqeya standart nîşan dide) embeddable_html: HTML'a ku dikare were pêvekirin @@ -377,7 +380,7 @@ ku-Latn: title: Xulasayê Bajara Mezin description: Xulasayên ji bo bajarên mezin yên dinyayê û derdorê wan bajaran other: - title: Çavkaniyên Din + title: Çavkaniyên din description: Çavkaniyên îlawe yên ku li ser wîkiya OpenStreetMapê hatine lîstekirin options: Vebijêrk @@ -409,14 +412,21 @@ ku-Latn: chair_lift: Teleferîk drag_lift: Teleferîka Şemitînê gondola: Teleferîkên Gondolê + platter: Teleferîk + pylon: Dîrek / Birc station: Stasyona Teleferîkê + t-bar: Teleferîka T-Bar'ê aeroway: aerodrome: Balafirrgeh + airstrip: Pîsta ji bo danînê apron: Apron gate: Dergeh + hangar: Garaja Teyareyan helipad: Pîsta Helîkopterê + holding_position: Cihê sekinandinê ji bo balafiran + parking_position: Pozîsyona Parkê runway: Pîsta teyareyê - taxiway: Rêya taksiyê + taxiway: Rêya balafirgehê terminal: Termînal amenity: animal_shelter: Sitargeha Heywanan @@ -449,37 +459,32 @@ ku-Latn: crematorium: Krematoryûm (sotingeh) dentist: Doktorê Diranan doctors: Bijîşk - dormitory: Yurdê Xwendekaran drinking_water: Ava Vexwarinê driving_school: Mekteba Ajokeriyê embassy: Konsolxane - emergency_phone: Telefonên ji bo Rewşa Acîl fast_food: Fast Food ferry_terminal: Termînala Ferîbotê - fire_hydrant: Muslixa Şewatê fire_station: Îtfaiye food_court: Cihê xwarinê fountain: Avweşînk fuel: Petrol gambling: Qumarxane grave_yard: Qebristan - gym: Navenda fitnissê / Salona werzişê - health_centre: Navenda Sihhetê + grit_bin: Qutiya qûm an jî xwêyê hospital: Nexweşxane hunting_stand: Standa nêçîrê ice_cream: Bestenî kindergarten: Zarokxane library: Pirtûkxane - market: Dikan marketplace: Cihê Bazarê monastery: Manastir motorcycle_parking: Cihê Parkê yê Motorsiklêtan nightclub: Klûba şevê - nursery: Pêşdibistan nursing_home: Aramxane office: Ofîs parking: Otopark parking_entrance: Deriyê Ketinê yê Parkê + parking_space: Cihê parkê pharmacy: Îlacxane place_of_worship: Îbadetxane / Perestîşgeh police: Polîs @@ -489,7 +494,6 @@ ku-Latn: prison: Girtîgeh pub: Bar public_building: Avahiya Dewletê - reception_area: Cihê Pêşwazîkirinê recycling: Nuqteya Cardin Bikaranînê restaurant: Restorant retirement_home: Xaniya Lênêrînê @@ -514,6 +518,7 @@ ku-Latn: village_hall: Odeya Gund waste_basket: Sêlika sergoyê waste_disposal: Sêlika avêtiyan + water_point: Nuqteya Avê youth_centre: Merkeza gencan boundary: administrative: Sînorê îdarî @@ -522,6 +527,7 @@ ku-Latn: protected_area: Erdên Muhafezekirî bridge: aqueduct: Coyê Avê + boardwalk: Rêya ji textê suspension: Pira hilawîstî swing: Pira hilawistî viaduct: Viyadûk @@ -541,157 +547,1094 @@ ku-Latn: "yes": Dikana Hunerên Destan emergency: ambulance_station: Stasyona Ambûlansê + assembly_point: Cihê Civînê defibrillator: Defîbrîllator landing_site: Cihê Daketinê yê ji bo Rewşa Acîl phone: Telefonê ji bo Rewşa Acîl + water_tank: Depoya avê yê ji bo rewşên acîl + "yes": Rewşa Acîl highway: abandoned: Riyên Metrûk bridleway: Rêyên hespan bus_guideway: Xeta Rêyên Otobêsan yên Rêberîkirî bus_stop: Rawestgeha Otobêsê construction: Rêya ku tê çêkirin + corridor: Korîdor cycleway: Rêya Bisiklêtê elevator: Asansor emergency_access_point: Nuqteya Gihandinê yê ji bo Rewşên Acîl footway: Peyarê (rêya peyadeyan) ford: Bihura Avê + give_way: Sînyala "Rê Bide"yê living_street: Kuçeya Heyatê milestone: Nuqteya Werçerxê motorway: Otorê + motorway_junction: Terqarêya Otorêyê motorway_link: Rêya Otorêyê + passing_place: Cihê derbasbûnê path: Şiverê + pedestrian: Rêya peyayan + platform: Peron + primary: Rêya Sereke + primary_link: Rêya Sereke + proposed: Rêya Pêşniyarkirî + raceway: Pîsta Pêşbaziyê + residential: Rêya Cihê Lêmanê + rest_area: Cihê Bêhnvedanê + road: Rê + secondary: Rêya di Dereceya Duyem de + secondary_link: Girêdana bi Rêya Dereceya Duyem re + service: Rêya Servîsê + services: Tesîsên Bêhnvedanê + speed_camera: Kameraya Sur'etê + steps: Derence + stop: Sînyala Seknê + street_lamp: Lembeya Kuçeyê + tertiary: Rêya di Dereceya Sêyem de + tertiary_link: Rêya di Dereceya Sêyem de + track: Rêyên ji xweliyê + traffic_signals: Sînyalên trafîkê + trail: Şop + trunk: Rêya serekî + trunk_link: Girêdana bi rêya serekî re + turning_loop: Çerxa Zivirrînê + unclassified: Rêya Nesinifandî + "yes": Rê historic: + archaeological_site: Cîhê arkeolojîk + battlefield: Meydana Herbê + boundary_stone: Kevira Hidûdê building: Avahiya dîrokî + bunker: Sitare castle: Keleh church: Dêr + city_gate: Dergehê bajarê + citywalls: Kelheya Bajarê + fort: Kelhe + heritage: Cihê Bermayiyên Tarîxî house: Xanî + icon: Îkon + manor: Koşk + memorial: Abîde + mine: Kana Madenê + mine_shaft: Bîra madenê monument: Yadpeyker + roman_road: Rêya Romayê ruins: Xerabe stone: Kevir + tomb: Qebr tower: Birc + wayside_cross: Wayside Cross (Xaçên li kinara rêyê) + wayside_shrine: Wayside Shrine (Tirbeyên li kinara rêyê) + wreck: Keştiya Binavbûyî + "yes": Cihê Dîrokî + junction: + "yes": Terqarê landuse: + allotments: Bax û bostan + basin: Hewz + brownfield: Erdên Terkkirî cemetery: Goristan + commercial: Cihê Xizmetên Ticarî + conservation: Erdên Muhafezekirî + construction: Înşaet farm: Zevî + farmland: Zevî + farmyard: Hewşa Çiftligê forest: Daristan + garages: Garaj grass: Giya + greenfield: Erdê Şûv + industrial: Cihê endustriyê + landfill: Cihê Veşartina Çopan + meadow: Mêrg military: Qada Eskerî mine: Kana Madenê + orchard: Baxçeya Fêkiyan + quarry: Kana Madenê railway: Rêhesin + recreation_ground: Meydana Bêhnvedanê + reservoir: Enbara Avê + reservoir_watershed: Hewzeya Çemê + residential: Cihê îkametê + retail: Esnaf (Perakendefiroş) + road: Cihê Rêyê + village_green: Meydana Şînahiyan + vineyard: Rez + "yes": Emilandina erdê leisure: + beach_resort: Havîngeha li ber Plajê + bird_hide: Cihê Çavdêrîkirina Çivîkan + common: Erdê umûmî + dog_park: Parka Kûçikan + firepit: Cihê ji bo şewatê + fishing: Cihê masîgirtinê + fitness_centre: Navenda Fîtnissê + fitness_station: Navenda Sporê garden: Baxçe golf_course: Cihê Golfê + horse_riding: Ajotina Hespê + ice_rink: Şemitandina li ser cemedê + marina: Marîna + miniature_golf: Golfa Mînyatûr + nature_reserve: Herêma Muhefezekirina Tebîetê park: Park + pitch: Sehaya Sporê + playground: Lîstikgeha zarokan + recreation_ground: Meydana Bêhnvedanê + resort: Havîngeh + sauna: Saûna + slipway: Rêya Şemitandina Qayîkan + sports_centre: Navenda Sporê stadium: Stadyûm + swimming_pool: Hewza soberîkirinê + track: Rêya bazdanê + water_park: Parka avê + "yes": Wextên vala + man_made: + adit: Galerî + beacon: Fanûsa deryayê + beehive: Kewara mozan + breakwater: Pêlşkên + bridge: Pir + bunker_silo: Sitare + chimney: Dûkêş + crane: Wînç + dolphin: Cihê lenger avêtinê + dyke: Bendav + embankment: Benda erdê + flagpole: Stûna alayê + gasometer: Gazpîv + groyne: Bend + kiln: Firûn + lighthouse: Birca Deryayî + mast: Stûn + mine: Maden + mineshaft: Bîra madenê + monitoring_station: Stasyona çavdêrîkirinê + petroleum_well: Bîra petrolê + pier: Îskele + pipeline: Xeta boriyê + silo: Sîlo + storage_tank: Tanka embarkirinê + surveillance: Muşahede + tower: Birc + wastewater_plant: Tesîsa parzinandinê yê avên qirêj + watermill: Aşê avê + water_tower: Birca avî + water_well: Bîr + water_works: Tesîsa safîkirina avê + windmill: Aşê bayî + works: Fabrîqe + "yes": Çêkirina însanan + military: + airfield: Balafirgeha Eskerî + barracks: Eskergeh + bunker: Sitare + "yes": Eskerî + mountain_pass: + "yes": Derbasgeha Çiyayan natural: + bay: Kendav + beach: Plaj + cape: Nîvgirav + cave_entrance: Deriyê şikeftê + cliff: Kendal crater: Zung + dune: Girikê ji qûmê + fell: Serê çiyayan + fjord: Fjord (delavê teng û dirêj) + forest: Daristan + geyser: Gayzer (kaniyên germavê) + glacier: Qeşa + grassland: Mêrg + heath: Devî + hill: Gir island: Girav + land: Erd + marsh: Çirav + moor: Erda Bejî + mud: Herrî + peak: Lûtke / gir + point: Nuqte + reef: Resîf + ridge: Pişta çiyayê - berpal rock: Zinar + saddle: Zîn + sand: Xîz + scree: Berikên hezazê + scrub: Devîstan + spring: Kanî stone: Kevir + strait: Tengav tree: Dar valley: Newal + volcano: Çiyayê agirîn water: Av + wetland: Erdê avî wood: Daristan office: accountant: Mihasebekar administrative: Rêveberî architect: Mîmar + association: Komele company: Şirket + educational_institution: Enstîtuya perwerdehiyê employment_agency: Saziya Karê estate_agent: Emlaqfiroş government: Daîreya Dewletê insurance: Ofîsa Sîgortayê + it: Ofîsa Teknolojiyên Enformasyonê lawyer: Eboqat ngo: Ofîsa Komeleyên Civata Sivîl + telecommunication: Ofîsa telekomunîkasyonê + travel_agent: Acenteya seyahetê + "yes": Ofîs place: - airport: Firrgeh + allotments: Bax û bostan city: Bajar + city_block: Bloka bajarê country: Welat county: Welat + farm: Zevî + hamlet: Mezra house: Xanî houses: Xanî island: Girav + islet: Giravok + isolated_dwelling: Xaniya îzolekirî + locality: Cih + municipality: Şaredarî + neighbourhood: Mehel / herêm + postcode: Koda posteyê + quarter: Herêmek bajarê region: Herêm sea: Behr + square: Meydana bajêr state: Eyalet subdivision: Binbeş suburb: Tax / Banliyo town: Bajarok + unincorporated_area: Herêma ku şexsiyeta we ya qanûnî tine ye village: Gund + "yes": Cih + railway: + abandoned: Rêya şemendeferê ya metrûk + construction: Rêya şemendeferê ê ku tê çêkirin + disused: Rêya şemendeferê ê ku nayê emilandin + funicular: Xeta Fenîkulerê + halt: Rawestgeha trênê + junction: Çarriyanê şemendeferê + level_crossing: Derbasgeha rêya hesinî + light_rail: Xeta trênê yê sivik + miniature: Rêya trênê a mînyatûr + monorail: Xeta trênê a yekalî + narrow_gauge: Rêhesina bi xeta teng + platform: Perona xeta trênê + preserved: Rêya trênê yê muhafezekirî + proposed: Rêya trênê yê pêşniyarkirî + spur: Rêya trênê yê talî + station: Stasyona trênê + stop: Rawestgeha trênê + subway: Metro + subway_entrance: Cihê têketinê ya metroyê + switch: Meqesa rêhesinê + tram: Rêya tramwayê + tram_stop: Rawestgeha tramwayê shop: + alcohol: Dikana Araqan + antiques: Antîkafiroş + art: Dikanê tiştên hunerî bakery: Firrin + beauty: Salona Bedewiyê + beverages: Dikana tiştên vexwarinê + bicycle: Bisiklêtfiroş + bookmaker: Girew / Miçilge + books: Dikana Firotana Kitêban + boutique: Bûtîk + butcher: Qesab + car: Firoşgehên erebeyan + car_parts: Parçeyên erebeyan + car_repair: Tamîrkera erebeyan + carpet: Dikanê xaliyan + charity: Dikana malên xêrkariyê + chemist: Dermanfiroş + clothes: Dikana cilan + computer: Dikana Kompûteran + confectionery: Dikana Şîraniyan + convenience: Beqal + copyshop: Dikana kopîkirinê + cosmetics: Dikana kozmetîkan + deli: Şarkuterî + department_store: Firoşgeha mezin + discount: Dikana tiştûmiştên di erzaniyê de + doityourself: Tu Bixwe Çêbike + dry_cleaning: Paqijiya ziwa + electronics: Dikana elektronîkan + estate_agent: Emlaqfiroş + farm: Dikana mehsûlên çandiniyê + fashion: Dikana Cil û Bergên Mode + fish: Dikana Firotana Masiyan + florist: Kulîlkfiroş + food: Dikana Xwarinê + funeral_directors: Rêvebirên merasima cenazeyê furniture: Mobîlya gallery: Galerî - insurance: Misogerî + garden_centre: Navenda Tişt û miştên Baxçeyan + general: Dikan / Mexeze + gift: Dikana Tişt û miştên diyariyê + greengrocer: Dikana Şînahiyan + grocery: Beqal + hairdresser: Kuafor + hardware: Xurdefiroş + hifi: Dikana Cîhazên Hi-Fi + houseware: Dikana eşyayên xaniyan + interior_decoration: Dekorasyona hundirê malê + jewelry: Gewherfiroş + kiosk: Kîosk (Dikanên biçûk) + kitchen: Dikana malzemeyên mitbaxê + laundry: Cihê Cilşûştinê + lottery: Piyango + mall: Mexezeyên Mezin + market: Market + massage: Masaj + mobile_phone: Dikana Telefonên Mobîl + motorcycle: Dikana motorsîklêtan + music: Dikanên muzîkê + newsagent: Bayiya Rojnameyan + optician: Berçavkvan + organic: Dikana xwarinên organîk + outdoor: Dikana ekîpmanê yê sporên servekirî + paint: Dikana boyaxan + pawnbroker: Rehîngir / selefxur + pet: Dikana firotana heywanan + pharmacy: Dermanxane + photo: Dikana fotografê + seafood: Berhemên behrê + second_hand: Dikana destê diduyan + shoes: Dikana solan + sports: Dikana malzemeyên werzişê + stationery: Qirtasiye + supermarket: Supermarket + tailor: Cildirû + ticket: Firoşgeha bilêtan + tobacco: Dikana titûnê + toys: Dikana pêlîstokan + travel_agency: Acenteya seyahetê + tyres: Dikana lastîkan + vacant: Dikanê vala + variety_store: Dikana tiştên çeşîd bi çeşîd + video: Dikana vîdeoyan + wine: Dikana araqê + "yes": Dikan tourism: + alpine_hut: Qulûbeya çiyayê + apartment: Qata apartmanê + artwork: Berhemên hunerî + attraction: Cihên balkêş + bed_and_breakfast: Pansiyona tevî 'taştê û nivîn' + cabin: Xanîk + camp_site: Cihê kampê + caravan_site: Cihê karavanê + chalet: Xaniya zozanê + gallery: Galerî + guest_house: Mêvanxane + hostel: Hostel hotel: Hotel information: Agahî + motel: Motel + museum: Muzexane + picnic_site: Cihê seyranê + theme_park: Lûnapark + viewpoint: Xala nêrîna menzereyê zoo: Baxçeyê heywanan + tunnel: + building_passage: Korîdora avahiyê + culvert: Kanala bin erdê + "yes": Tunel + waterway: + artificial: Rêava sûnî + boatyard: Tersaneya botan + canal: Kanal + dam: Bendav + derelict_canal: Kanalê bêxwedî + ditch: Co + dock: Lengergeh + drain: Kanala drênajê + lock: Kilîd + lock_gate: Deriyê avê + mooring: Lengergeh + rapids: Şîp + river: Çem + stream: Robar + wadi: Gelî + waterfall: Sûlav + weir: Bariyera avê + "yes": Robar + admin_levels: + level2: Hidûda welatê + level4: Sînora parêzgehê + level5: Sînora herêmê + level6: Hidûda navçeyê + level8: Hidûda bajarê + level9: Sînora gundê + level10: Sînora taxê + description: + title: + osm_nominatim: Cihên ji OpenStreetMap + Nominatim + geonames: Cihên ji GeoNames + types: + cities: Bajarên mezin + towns: Bajar + places: Cih + results: + no_results: Ti encam nehatin dîtin + more_results: Encamên zêdetir layouts: + logo: + alt_text: Logoya OpenStreetMapê + home: Here Cihê Mala Xwe logout: Derkeve log_in: Têkeve + log_in_tooltip: Bi hesabê xwe yê heyî têkeve + sign_up: Xwe Qeyd Bike + start_mapping: Dest bi çêkirina nexşeyan bike + sign_up_tooltip: Ji bo ku tu guherandinan bikî hesabek çêbike edit: Biguherîne history: Dîrok + export: Derxîne + data: Dane + export_data: Daneyan derxîne derve + gps_traces: Şopên GPSê + gps_traces_tooltip: Şopên GPSê îdare bike + user_diaries: Rojnivîskên bikarhênerê + user_diaries_tooltip: Rojnivîskên bikarhênerê bibîne + edit_with: Bi %{editor} sererast bike + tag_line: Xerîteya Dinyayê a Wîkiya Azad + intro_header: Tu bi xêr hatî OpenStreetMapêǃ + intro_text: OpenStreetMap xerîteyekî dinyayê ye ku ji aliyê kesên wek te ve tê + çêkirin û emilandina we belaş e û di bin lîsansa azad de ye. + intro_2_create_account: Ji xwe re hesabekî çêbike + partners_html: Pêşkêşkirina bernameyê ji alî %{ucl}, %{bytemark}, %{ic} û %{partners} + ve tê piştgirîkirin. + partners_ucl: University College London + partners_ic: Imperial College London + partners_bytemark: Bytemark Hosting + partners_partners: şirîkên me + osm_offline: Databasa OpenStreetMapê vê gavê offline e ji ber ku niha xebatên + sererastkirinê tê kirin. + osm_read_only: Databasa OpenStreetMapê vê gavê di moda tenê-xwendinê de ye ji + ber ku niha xebatên sererastkirinê tê kirin. + donate: Ji bo Fonda Pêşxistina Hişkalavê bi %{link} piştgiriyê bide OpenStreetMapê. help: Alîkarî + about: Derbar + copyright: Mafê daneriyê + community: Civak + community_blogs: Blogên Civakê + community_blogs_title: Blogên endamên civaka OpenStreetMapê + foundation: Weqif + foundation_title: Weqfa OpenStreetMapê + make_a_donation: + title: Bi bexşa pereyê hûn dikarin piştgiriyê bidin OpenStreetMapê + text: Bexş bike + learn_more: Zêdetir Hîn Bibe + more: Zêdetir license_page: foreign: title: Derbarê vê wergerê de + text: Eger di navbera vê rûpela tercumekirî û %{english_original_link} de îxtilafek + hebe wê rûpela bi zimanê îngilîzî li ber çavan were girtin + english_link: eslê we ya bi îngilîzî native: title: Der barê vê rûpelê + text: Hûn vêga dinêrin versiyona bi zimanê îngilîzî ya rûpela mafê daneriyê. + Hûn dikarin vebigerin %{native_link} a vê rûpelê an jî hûn dikarin li vir + bimînin da ku hûn derbarê mafê daneriyê û derbarê %{mapping_link} de agahiyan + werbigrin. + native_link: versiyona bi kurdî + mapping_link: dest bi çêkirina nexşeyan bike + legal_babble: + title_html: Mafê daneriyê û lîsans + intro_1_html: |- + OpenStreetMap® open data ye, bi lîsansa Open Data + Commons Open Database License (ODbLê) ku ji aliyê OpenStreetMap Foundation (OSMF) ve hatiye çêkirin ve hatiye lîsanskirin. + intro_2_html: Hûn serbest in ku daneyên me kopî bikin, belav bikin, bişînin + yekî an jî adapte bikin bi şerta ku hûn behsa me bikin, rûmeta me bigrin. + Eger hûn daneyên me biguherînin an jî baştir bikin hûn vê netîceyê tenê di + bin eynî lîsansê de dikarin belav bikin. Temamiya koda + qanûnî, maf û berpirsiyariyên we îzah dike. + intro_3_html: |- + Nexşesazî û belgekirinên di nexşeya me de, di bin lîsansa Creative + Commons Attribution-ShareAlike 2.0 (CC BY-SA) de hatiye lîsanskirin. + credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin + credit_1_html: Ji bo referansgirtinê divê tu wisa binivîsîː “© beşarên + OpenStreetMapê ”. + credit_2_html: Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa Open + Database License de hatiye lîsanskirin, û eger karoyên nexşeya me were emilandin, + diyar bikin ku ev kartografî jî bi CC BY-SA hatiye lîsanskirin. Hûn vê bi + lînkdana ji rûpela mafê + daneriyê re dikarin bikin. Wekî alternatîv, û wekî hewcehiyek eger tu + OSMyê di formekî daneyan de belav bikî tu dikarî rasterast lîsansan bi nav + bikî an jî girê bidî lîsansê(n) rasterast. Di medyayên ku lînkkirin ne mimkun + bin de (wekî mînak. xebatên çapkirî), em ji we re pêşniyar dikin ku hûn xwînerên + xwe tewcîhê openstreetmap.org'ê, opendatacommons.org'ê, û heke minasib be + creativecommons.org'ê bikin. + credit_3_html: "Ji bo nexşeyekî elektronîk yê gerrînbar, çavkanî divê li jêra + goşeya alî rastê were xuyan. \nWek nimûne:" + attribution_example: + alt: Mînakekê atfkirinê ya OpenSteetMapê yê li ser malperekî înternetê + title: Mînaka atfkirinê + more_title_html: Zêdetir hîn bibe + more_1_html: |- + Ji bo ku derbarê emilandina daneyên me û referansdana me de zêdetir hîn bibî rûpela Lîsansê a OSMFê bixwîne. + more_2_html: Digel ku OpenStreetMap bi daneyên vekirî be jî, em ji bo aliyên + sêyem APIyekê nexşeyê ya belaş peyda nakin. Binêre rûpelên me yên Polîtîkaya + Emilandina APIyê , Polîtîkaya + Emilandina Karoyê û Polîtîkaya + Emilandina Nominatimê. + contributors_title_html: Beşdarên me + contributors_intro_html: 'Bi hezaran beşdarên me hene. Herwiha em ji ajansên + nexşekirinê yên netewî û çavkaniyên din jî daneyên bi lîsansa-vekirî îhtîwa + dikin, hinek ji wan ev in:' + contributors_at_html: |- + Awistirya: Daneyên ji Stadt Wien (di bin + CC BY de), Land Vorarlberg û Land Tirol (tevî guhertinan di bin lîsansa CC BY AT de) dihundirrîne. + contributors_ca_html: |- + Keneda: Daneyên ji GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), û StatCan (Geography Division, + Statistics Canada) dihundirrîne. + contributors_fi_html: 'Fînlenda: Daneyên ji National Land Survey + of Finland''s Topographic Database û ji komên din ên daneyan, di bin a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">Lîsansa + NLSFI de daneyan dihundirrîne.' + contributors_fr_html: 'Frensa: Daneyên ji Direction Générale + des Impôts''ê hatine bidestxistin dihundirrîne.' + contributors_nl_html: |- + Holenda: Daneyên © ANDê dihundirrîne, 2007 + (www.and.com) + contributors_nz_html: 'Nû Zelenda: Daneyên ku ji Land Information + New Zealandê hatine bidestxistin dihundirrîne. Crown Copyright parastî ye.' + contributors_si_html: |- + Slovenya: Daneyên ji Surveying and Mapping Authority û + Ministry of Agriculture, Forestry and Food + (agahiyên ji xelkê re vekirî yên Slovenyayê) dihundirrîne. + contributors_za_html: |- + Afrîkaya Başûr: Daneyên ku ji Chief Directorate: + National Geo-Spatial Information hatine bidestxistin dihundirrîne. Mafê daneriyê yê dewletê parastî ye. + contributors_gb_html: |- + Mîrnişîna Yekbûyî: Daneyên Ordnance + Survey data © dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-12. + contributors_footer_1_html: |- + Ji bo dêtayên van û çavkaniyên din yên ku di pêşdebirina OpenStreeteMapê de hatine bikaranîn agahiyên zêdetir werbigrî, xêra xwe ji ser OpenStreetMap Wiki'yê binêre rûpela Beşdaran. + contributors_footer_2_html: Daxilbûna daneyan a di OpenStreetMapê de nayê maneya + ku peydakera daneyan yê eslî OpenStreetMapê teswîb dike, garantiyekî temîn + dike an jî berpirsîyariyekê qebûl dike. + infringement_title_html: Îxlala mafê daneriyê + infringement_1_html: Kesên ku tevkariyên OSMê dikin bila ti carî ji bîr nekin + daneyên ji çavkaniyên ku mafên wan ên daneriyê parastî be (wekî nimûne Google + Maps an jî nexşeyên çapkirî) bêyî destûra eşkere yê xwediyê wan, ji van çavkaniyan + ti daneyek wernegrin. + infringement_2_html: Eger tu bawer bî materyalekî ku mafê we yê daneriyê parastî + ye bi şaşîtî li vê sîteyê an jî li daneya OpenStreetMapê hatibe zêdekirin + xêra xwe miracaeta prosedûra + me ya rakirinê bike an jî rasterast di rûpela + me ya dosyekirinê a online de qeyd bikin. + trademarks_title_html: Markên bazirganî + trademarks_1_html: OpenStreetMap, logoya mercekê û State of the Map; markên + ticarî yên OpenStreetMap Foundationê yên qeydkirî nin. Heke derbarê bikaranîna + markan de pirsên we hebin xêra xwe binêrin Polîtîkaya + Markên Ticarî. + welcome_page: + title: Tu bi xêr hatî! + introduction_html: Tu bi xêr hatî OpenStreetMapê, nexşeya dinyayê yê azad û yê + ku bi rehetî dikare were sererastkirin. Niha te xwe qeyd kiriye û tu dikarî + dest bi nexşekirinê bikî. Va ye li vir rêbernameyek bilez yê tiştên muhîm heye + ku divê tu van bizanibî. + whats_on_the_map: + title: Çi hene li ser nexşeyê + on_html: OpenStreetMap cihekî ye ji bo nexşekirina tiştên heqîqî û rojane + - tê de bi milyonan avahî, rê û dêtayên derbarê deveran de heye. Her taybetmendiyê + cîhana rastîn ê ku bala te bikişîne dikarî nexşe bikî. + off_html: Çi tê de nabe? Daneyên serhişkane yên wek nirxandin, xisûsiyetên + dîrokî an jî ferazî û daneyên ji çavkaniyên ku mafên wan ên daneriyê parastî + be hatibin. Eger destûrekî we yê xisûsî tine be, ji nexşeyên online an jî + ji nexşeyên ser kaxizan kopî nekin. + basic_terms: + title: Termên esasî yên ji bo nexşekirinê + paragraph_1_html: OpenStreetMap xwediyê argoya xwe (zimanê xwe yê taybet) ye. + Vaye li vir çend peyvên ku wê bi kêrên we bên heye. + editor_html: Sererastker (edîtor) bername an jî malperekî înternetê + ye ku hûn wê dikarin ji bo sererastkirina nexşeyê bi kar bînin. + node_html: Girêk, nuqteyekî di nexşeyê de ye, wekî restorantek + an jî darek. + way_html: Rê, xetek an jî deverek yê wekî cadeyek, golek an + jî avahiyek e. + tag_html: Etîket, parçeyekî daneyê yê derbarê girêkek an jî + rêyek yê mîna navê restorantek an jî lîmîta lezê yê kolanek e. + rules: + title: Qaîdeyên vêǃ + paragraph_1_html: "Her çiqas qaîdeyen fermî yên OpenStreetMapê hindik bin jî + em ji hemû kesên tevkariya me dikin hêvî dikin ku bi civatê re bi hevkarî + bixebitin û di têkiliyê de bin. Eger tu bifikirî ku xebatên xwe ne bi destê + xwe bi rê ve bibî, xêra xwe ji jêr rêziknameyê bixwîne û bi ya rêziknameyê + bike: Împort + kirin û \nSererastkirinên + Otomatîk." + questions: + title: Pirsekî te heye? + paragraph_1_html: OpenStreetMap ji bo hînbûna projeyê, pirskirin û cewabdana + pirsan, û ji bo nîqaşên ku bi hevkarî têne kirin û ji bo belgekirina mijarên + nexşeyê xwediyê çend çavkaniyan e. Ji vir alîkariyê + werbigrin. + start_mapping: Dest bi çêkirina nexşeyan bike + add_a_note: + title: Ji bo sererastkirinê wextê te tine? Wê gavê notek lê zêde bike! + paragraph_1_html: Eger tu bixwazibî tenê tiştek biçûk rast bikî û wextê te ji + bo qeydbûnê û ji bo ku hînbibî mirov wê çawa sererast bike tine be, tenê notek + binivîsî bes e. + paragraph_2_html: 'Tenê here nexşeyê û bitikîne ser + sembola notê: . Wê ev, li nexşeyê nîşankerek + zêde bike, ê ku tu bikaribî bi kaşkirinê cihê wî biguherînî. Peyamê xwe binivîse, + dû re li qeydkirin''ê bitikîne. Nexşesazên din wê lê bikolin.' + fixthemap: + title: Pirgirêkek rabigihîne / Nexşeyê sererast bike + how_to_help: + title: Çawa dikarim alî we bikim? + join_the_community: + title: Tevlî civatê bibe + explanation_html: Heke te di daneyên nexşeya me de pirsgirêkek ferq kiribe, + wekî mînak kolanek an jî adrêsa te kêm be, riya herî baş a dewamkirinê beşdarî + civata me ya OpenStreetMapê bibe û tu bixwe rast bike an jî îlawe bike. + add_a_note: + instructions_html: Tenê bitikîne ser îkona an jî + ji ser ekrana xerîteyê bitikîne ser eynî îkonê. Wê ev, ji nexşeyê re nîşankerek + deyne ku tu dikarî bi kaşkirinê cihê vê nîşankerê biguherînî. Peyama xwe + binivîse, piştre bitikîne ser qeyd bike'yê, wê nexşesazên din lê bikolin. + other_concerns: + title: Meseleyên din + explanation_html: |- + Eger derbarê emilandina daneyan an jî derbarê naverokan de fikarên te hebin ji bo ku zêdetir agahiyên zagonî werbigrî xêra xwe binêre rûpela me ya mafê daneriyê an jî bi + koma xebatê yê OSMFê a eleqedar re bikeve îrtîbatê. help_page: + title: Wergirtina alîkariyê + introduction: OpenStreetMap ji bo hînbûna projeyê, pirskirin û cewabdana pirsan, + û ji bo nîqaşên ku bi hevkarî têne kirin û ji bo belgekirina mijarên nexşeyê + xwediyê çend çavkaniyan e. + welcome: + url: /welcome + title: Bi xêr hatî OSM'ê + description: Bi vê rêbernameya kurt ê ku tê de esasên OpenStreetMapê heye dest + pê bike. + beginners_guide: + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: Rêbera ji bo kesên ku nû dest pê kirine + description: Civata me, ji bo kesên ku nû dest pê kirine rêbertî dike. + help: + url: https://help.openstreetmap.org/ + title: help.openstreetmap.org + description: Pirsek bipirsin an binêrin cewabên li ser malpera OSMê ya pirs-û-bersivê. + mailing_lists: + title: Lîsteya E-nameyan + description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur de + hûn dikarin pirsan bipirsin an jî mijarên balkêş nîqaş bikin. forums: title: Forum + description: Pirs û gotûbêjên ji bo kesên ku înterfeysên bi şêweya panoya daxuyaniyê + tercîh dikin. + irc: + title: IRC + description: Sohbeta înteraktîv yê bi gelek zimanan û di gelek mijaran de. + switch2osm: + title: switch2osm + description: Alikariya ji bo şirket û komeleyên ku derbasî nexşe û xizmetên + din yên bi bingeha OpenStreetMapê dibin. + wiki: + url: https://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Ji bo belgeyên OSMyê yên bi berfirehî binêrin wîkî'yê. about_page: + next: Pêşve + copyright_html: ©Beşdarên
OpenStreetMapê + used_by: '%{name} li ser bi hezaran malper, sepanên mobîl û cîhazên hişkalavan, + daneyên nexşeyê li hev tîne' + lede_text: OpenStreetMap ji alî civata nexşesazên ku ji seransera dinyayê der + barê kolanan, kafeyan, stasyonên trênan û zêdetirê wan de daneyan tevlî vir + dike û diparêze. + local_knowledge_title: Zanyariya herêmî + local_knowledge_html: OpenStreetMap girîngiyê dide zanyariyên xwecihî. Beşdarên + me ji bo tesdîq bikin ku OSM rast û rojane ye, wêneyên hewayî, cîhazên GPSê + û nexşeyên deverê yên bi teknolojiya-nizm bi kar tînin. + community_driven_title: Bi rêbertiya civatê + community_driven_html: Civata OpenStreetMapê curbicur û bengîn e û herroj mezintir + dibe. Di navbera beşdarên me de nexşesazên dilxwaz, pisporên GISê, endazyerên + serverên OSMê dixebitînin, xêrxwazên ji bo herêmên di tesîra karesatê de mane + nexşe dikin û zêdetirên wan jî henin. Derbarê civatê de ji bo ku zêdetir tiştan + hîn bibî, binêre Bloga OpenStreetMapê, + rojnivîskên bikarhêneran, blogên + civatê û malpera Weqfa OSMê. + open_data_title: Daneyên vekirî + open_data_html: 'OpenStreetMap bi daneya vekirî ye: hûn serbest in ku vê + bi her armancê bi kar bînin, bi şerta ku hûn OpenStreetMap û beşdarên wê referans + bidin. Heke hûn daneyan biguherînin an jî li serê zêde bikin hûn vê encamê tenê + di bin eynî lîsansê de dikarin belav bikin. Ji bo dêtayan binêrin rûpela + lîsans û mafê daneriyê.' legal_title: Zagonî + legal_html: |- + Ev malper û gelek xizmetên din yên pêwendîdar bi awayekî fermî ji aliyê Weqfa OpenStreetMapê (OSMF) ve li ser navê civatê tê birêvebirin. Bikaranîna hemû karûbarên ku ji aliyê OSMF ve tê birêvebirin mijara + Politikayên Bikaranînê yê Qebûlbar û Politikaya me ya Veşarîtiyê ye +
Eger di derbarê lîsanskirin, mafê daneriyê de pirsên we hebin an jî ji bo pirsên we yên din ên qanûnî xêra xwe bi OSMF re bikevin têkiliyê.
OpenStreetMap, logoya mercekê û State of the Map marqeyên ticarî yên qeydkirî yê OSMFê nin. + partners_title: Şirîkên me notifier: diary_comment_notification: + subject: '[OpenStreetMap] %{user} li ser nivîsek rojane şirove kir' hi: Silav %{to_user}, + header: '%{from_user} nivîsa rojane yê OpenStreetMapê a bi mijara %{subject} + şirove kir:' + footer: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji ser + %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} dikarî cewab bidî. + message_notification: + hi: Merheba %{to_user}, + header: '%{from_user} ji te re bi rêya OpenStreetMapê peyamek bi mijara %{subject} + şand:' + footer_html: Tu dikarî peyamê ji ser %{readurl} jî bixwînî û ji ser %{replyurl} + jî dikarî cewab bidî. + friend_notification: + hi: Merheba %{to_user}, + subject: '[OpenStreetMap] %{user} te wek heval lê zêde kir' + had_added_you: Bikarhêner %{user} li ser OpenStreetMapê te wek heval lê zêde + kir. + see_their_profile: Ji ser %{userurl} dikarî binêrî profîlê wan. + befriend_them: Herwiha ji ser %{befriendurl} wan dikarî wek heval lê zêde bikî. gpx_notification: greeting: Silav, + your_gpx_file: Ev mîna dosyeya te ya GPXê tê xuyan + with_description: tevî vê îzahê + and_the_tags: 'û etîketên bi dû ve de:' + and_no_tags: û etîket tine ye. + failure: + subject: '[OpenStreetMap] Anîna GPXê bi ser neket' + failed_to_import: 'anîna dosyeyê bi ser neket. Çewtî ev e:' + more_info_1: Derbarê çewtiyên împortkirina GPXê de û ji bo ku xwe ji van çewtiyan + dûr bixî, zêdetir agahiyan + more_info_2: 'ji vir dikarî bibînî:' + success: + subject: '[OpenStreetMap] Împortkirina GPXê bi ser ket' + loaded_successfully: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points} + bi awayekî serkefî hate barkirin. + signup_confirm: + subject: '[OpenStreetMap] Bi xêr hatî OpenStreetMapê' + greeting: Merhebaǃ + created: Yekî (hêvî dikim ku ew tu bî) berî vêga li %{site_url} hesabekî nû + çêkir. + confirm: 'Berî ku em tiştekî din bikin, divê em piştrast bikin ku ev daxwaz + ji te hatiye, lewma xêra xwe ji bo teyîdkirina hesabê xwe bitikîne ser vê + lînkê:' + welcome: Piştî te hesabê xwe teyîd kir, em ê ji te re ji bo ku tu karibî dest + pê bikî hinek agahiyên din jî bidin. + email_confirm: + subject: '[OpenStreetMap] E-peyama xwe tesdîq bike' email_confirm_plain: greeting: Silav, + hopefully_you: Yekî (em hêvî dikin ku ew tu bî) dixwaze adrêsa e-peyama te ya + li %{server_url}, wek %{new_address} biguherîne. + click_the_link: Eger, ev ê te be, xêra xwe ji bo tesdîqkirina guhertinê bitikîne + ser lînka li jêr. email_confirm_html: greeting: Silav, + hopefully_you: Yekî (em hêvî dikin ku ew tu bî) dixwaze adrêsa e-peyama te ya + li %{server_url} qeydkîrî ye, wek %{new_address} biguherîne. + click_the_link: Eger, ew tu bî, xêra xwe ji bo tesdîqkirina guhertinê bitikîne + ser lînka li jêr. + lost_password: + subject: '[OpenStreetMap] Daxwaza nûkirina şîfreyê' lost_password_plain: greeting: Silav, + hopefully_you: Yekî (dibe be ku tu bî) xwest ku şîfreya vê adrêsa e-peyamê ya + hesaba openstreetmap.orgê were nûkirin. + click_the_link: Eger ev tu bî, xêra xwe ji bo nûkirina şîfreyê bitikîne ser + lînla li jêr. lost_password_html: greeting: Silav, + hopefully_you: Yekî (dibe be ku tu bî) xwest ku şîfreya vê adrêsa e-peyamê ya + hesaba openstreetmap.orgê were nûkirin. + click_the_link: Eger ev tu bî, xêra xwe ji bo nûkirina şîfreyê bitikîne ser + lînla li jêr. + note_comment_notification: + anonymous: Bikarhênerek anonîm + greeting: Merheba, + commented: + subject_own: '[OpenStreetMap] %{commenter} li ser notekî te şiroveyek nivîsand' + subject_other: '[OpenStreetMap] %{commenter} li ser notek ku tu pê eleqedar + dibî şiroveyek nivîsand' + your_note: '%{commenter} li ser notekî te yê nexşeyê a nêzîkî %{place} şiroveyek + berda.' + commented_note: '%{commenter} li ser notekî te yê nexşeyê a ku te şiroveyek + berdabû şiroveyek nivîsand. Ev not nêzîkî %{place} (y)e.' + closed: + subject_own: '[OpenStreetMap] %{commenter} yek ji notên te çareser kir' + subject_other: '[OpenStreetMap] %{commenter} notek ku tu pê eleqedar dibî + çareser kir' + your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} çareser + kir.' + commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû çareser + kir. Ev not nêzîkî %{place} (y)e.' + reopened: + subject_own: '[OpenStreetMap] %{commenter} yek ji notên te ji nû ve aktîv + kir' + subject_other: '[OpenStreetMap] %{commenter} notek ku tu pê eleqedar dibî + ji nû ve aktîv kir' + your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} ji + nû ve da aktîvkirin.' + commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû jinûve + da aktîvkirin. Ev not nêzîkî %{place} (y)e.' + details: Dêtayên zêdetir yên derbarê notê de hûn dikarin ji %{url} bibînin. + changeset_comment_notification: + hi: Merheba %{to_user}, + greeting: Merheba, + commented: + subject_own: '[OpenStreetMap] %{commenter} yek ji desteyên te yên guherandinê + şiroveyek nivîsand' + subject_other: '[OpenStreetMap] %{commenter} desteyekî guherandinê ê ku tu + pê eleqedar dibî şirove kir' + your_changeset: '%{commenter} li ser desteyekî te yê guherandinê ê ku di %{time} + de hatibû çêkirin, şiroveyek berda' + commented_changeset: '%{commenter} li ser desteya guhertinê yê ku tu dişopînî + şiroveyek berda, ji aliyê %{changeset_author} ve di %{time} de hatiye çêkirin' + partial_changeset_with_comment: tevî şiroveya '%{changeset_comment}' + partial_changeset_without_comment: bêyî şirove + details: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin ji %{url} + bibînin. + unsubscribe: Ji bo ku ji abonetiya rojanekirinên vê desteya guherandinê derbikevî, + here %{url} û bitikîne ser "Abonetiyê betal bike". message: inbox: + title: Qutiya hatiyan + my_inbox: Qutiya min a hatiyan + outbox: qutiya çûyiyan + messages: '%{new_messages} û %{old_messages} hene.' + new_messages: + one: '%{count} peyama nû' + other: '%{count} peyamên nû' + old_messages: + one: '%{count} peyama kevin' + other: '%{count} peyamên kevin' from: Ji + subject: Mijar + date: Dîrok + no_messages_yet: Hêj peyama te tine ye. Çima ji ser %{people_mapping_nearby_link} + bi kesên nêzîkê xwe re nakevî îrtîbatê? + people_mapping_nearby: lînka nexşesazên li derdorên nêzîk message_summary: + unread_button: Wek nexwendî nîşan bide + read_button: Wek xwendî nîşan bide + reply_button: Cewab bide delete_button: Jê bibe new: + title: Peyamê bişîne + send_message_to: Ji %{name} re peyamekî nû bişîne + subject: Mijar + body: Nivîs send_button: Bişîne + back_to_inbox: Vegere qutiya hatiyan + message_sent: Peyam hate şandin + limit_exceeded: Te di wextekî kurt de gelek peyaman şand. Xêra xwe berî ku tu + zêdetir peyaman bişînî hinekî bisekine. + no_such_message: + title: Mesajek wek vê tine ye + heading: Mesajek wek vê tine ye + body: Li me bibore, bi vê id'yê ti peyam tine ye. + outbox: + title: Qutiya çûyiyan + my_inbox: '%{inbox_link}' + inbox: Qutiya min a hatiyan + outbox: Qutiya min a çûyiyan + messages: + one: Te %{count} peyam şand + other: Te %{count} peyaman şand + to: Ji bo + subject: Mijar + date: Dîrok + no_sent_messages: Te hêj ji kesî re peyam neşandiye. Çima ji ser %{people_mapping_nearby_link} + bi hinek kesên nêzîkê xwe re nakevî îrtîbatê? + people_mapping_nearby: lînka nexşesazên li derdorên nêzîk + reply: + wrong_user: Te wek `%{user}' têket, lê peyamê ku te dixwest were cewabdayîn + ji wî/wê bikarhênerê re nehate şandin. Xêra xwe ji bo cewabdanê wekî bikarhênerê + rast têbikeve. read: + title: Peyamê bixwîne from: Ji + subject: Mijar date: Dem + reply_button: Bersiv bide + unread_button: Wek nexwendî nîşan bide + delete_button: Jê bibe + back: Paşve vegere + to: Ji bo + wrong_user: Te wek `%{user}' têket, lê peyamê ku dihate xwestin ku tu wê bixwînî + ji aliyê wî/wê bikarhênerê ve an jî ji wî/wê bikarhênerê re nehatiye şandin. + Xêra xwe ji bo xwendinê wekî bikarhênerê rast têbikeve. sent_message_summary: delete_button: Jê bibe + mark: + as_read: Peyam wek xwendî hate nîşankirin + as_unread: Peyam wek nexwendî hate nîşankirin + delete: + deleted: Payam hate jêbirin site: + index: + js_1: Tu an gerokek ku piştgiriyê nade JavaScriptê bi kar tînî an jî JavaScript + hatiye neçalakkirin. + js_2: OpenStreetMap ji bo nîşandana nexşeya xwe ya şemetok JavaScriptê bi kar + tîne. + permalink: Lînka daîmî + shortlink: Lînka kurt + createnote: Notek binivîse + license: + copyright: Mafê daneriyê ya OpenStreetMapê û beşdarên me, di bin lîsansa vekirî + de ne + remote_failed: Sererastkirin bi ser neket - jê piştrast be ku JOSM an jî Merkaartor + hatiye sazkirin û vebijêrka jidûrve kontrolê hatiye aktîvkirin edit: + not_public: Te sereratkirinên xwe wek ji herkesî re vekirî eyar nekir. + not_public_description: Heta ku hûn vê yekê bikin hûn ê nikaribin nexşeyê biguherînin. + Sererastkirinên xwe ji ser rûpela %{user_page} dikarî wek ji herkesê re vekirî + eyar bikî. user_page_link: rûpela bikarhêner + anon_edits_link_text: Hîn bibe ku ev rewş çima wisa bûye. + flash_player_required: Ji bo ku edîtora OpenStreetMap Flashê yê bi navê Potlatch + bi kar bînî, ihtîyaca te bi Flash playerê heye. Tu dikarî Flash + Playerê ji ser Adobe.com'ê daxînî. Ji bo sererastkirina OpenStreetMapê + gelek vebijêrkên din + jî hene. + potlatch_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo di Potlatchê + de qeyd bikî, divê gava ku guherandinê xwe di moda zindî de dikî, rê an jî + nuqteya ku vêga heyî bibijêrî, û heke bişkokek qeydkirinê hebe bitikînî ser + qeyd bike'yê.) + potlatch2_not_configured: Potlach 2 nehate vesazkirin - ji bo zêdetir agahiyan + xêra xwe binêre https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo ku di + Potlatch 2'ê de qeyd bikî bitikîne ser qeyd bike'yê.) + id_not_configured: iD nehatiye mîhengkirin + no_iframe_support: Geroka te piştgiriyê nade iframe'yên HTML ku ji bo nişandana + vê taybetmendiyê lazim e. + sidebar: + search_results: Encamên lêgerînê + close: Bigire search: search: Lêbigere + get_directions: Tarîfa riyê bistîne + get_directions_title: Di navbera du nuqteyan de rê nîşanî min bide + from: Ji + to: Ji bo where_am_i: Ev li ku ye? + where_am_i_title: Bi motora lêgerînê wê cihê ku tu lê yî tesbît bike submit_text: Here + reverse_directions_text: Aliyê ters key: table: entry: + motorway: Otorê + main_road: Rêya sereke + trunk: Rêya sereke + primary: Rêya bi dereceya yekem + secondary: Rêya bi dereceya duyem + unclassified: Rêya nesinifandî + track: Rêya ji xweliyê + bridleway: Rêyên siwaran + cycleway: Rêya bisiklêtê + cycleway_national: Rêya bisiklêtê ya neteweyî + cycleway_regional: Rêya bisiklêtê ya herêmî + cycleway_local: Rêya bisiklêtê ya mehelî + footway: Rêya peyayan + rail: Rêhesin + subway: Metro + tram: + - Rêya trênê yê bi xeta teng + - tramway + cable: + - Teleferîk + - teleferîk + runway: + - Pîsta balafirgehê + - rêya balafirgehê yê çûnûhatinê + apron: + - Aprona balafirgehê + - termînal + admin: Sînorê îdarî + forest: Daristan + wood: Daristan + golf: Cihê golfê + park: Park + resident: Cihê îkametê + common: + - Erda mişterek + - mêrg + retail: Saheya Perakendeyê (Maxazayan) + industrial: Cihê endustriyê + commercial: Herêma bazirganiyê + heathland: Erdê qeraç + lake: + - Gol + - mexzen + farm: Cotgeh + brownfield: Erdê vala cemetery: Gorristan + allotments: Bax û bostan + pitch: Saheya sporê + centre: Navenda sporê + reserve: Herêma muhefezekirî ya tebîetê + military: Qada eskerî school: - Dibistan + - zanîngeh + building: Avahiya girîng + station: Stasyona trênê + summit: + - Lûtke + - lûtke + tunnel: Xeta qutqutî = tûnel + bridge: Xeta reş = pir + private: Têketina taybet + destination: Cihê gihiştinê + construction: Rêyên di merheleya çêkirinê de ne + bicycle_shop: Bisiklêtfiroş + bicycle_parking: Parka bisiklêtê + toilets: Tiwalet richtext_area: edit: Biguherîne preview: Pêşdîtin markdown_help: + title_html: |- + Bi Markdown + hate analîzkirin + headings: Sernivîs + heading: Sernivîs + subheading: Sernivîsa binî + unordered: Lîsta nerêzkirî + ordered: Lîsta rêzkirî + first: Hêmana yekem + second: Hêmana duyem link: Girêdan text: Nivîs image: Wêne + alt: Nivîsa alternatîv url: URL trace: + visibility: + private: Xisûsî (tenê wekî nuqteyên anonîm û nerêzkirî tê belavkirin) + public: Giştî (di lîsta şopandinê de û wekî anonîm, bi nuqteyên nerêzkirî têne + xuyan) edit: edit: biguherîne + owner: 'Xweyî:' description: 'Danasîn:' + tags: Etîketː trace_form: description: 'Danasîn:' visibility_help: Ev tê çi wateyê? @@ -713,20 +1656,48 @@ ku-Latn: user: login: password: 'Şîfre:' + remember: Min bi bîr bîne + lost password link: Te şîfreya xwe winda kir? + login_button: Têkeve + register now: Vê gavê xwe qeyd bike + with username: Gelo jixwe hesabekî te heye? Eger hebe, xêra xwe navê xwe yê + bikarhêneriyê û şîfreya xwe binivîse û têkeveː + with external: Wek alternatîv, ji bo têketinê yek ji van sepanan bi kar bîneː + new to osm: Tu di OpenStreetMapê de nû yî? + openid_logo_alt: Têketina bi OpenID'yê auth_providers: + openid: + title: Bi OpenID'yê têkeve + alt: Têketina bi URL'yek OpenID'yê google: title: Bi Google têkeve + alt: Têketina bi OpenID ya Googlê facebook: title: Bi Facebookê têkeve alt: Bi hesabekî Facebookê têkeve windowslive: + title: Bi Windows Live'ê têkeve alt: Bi hesabê xwe yê Windows Liveê têkeve + github: + title: Bi GitHub'ê têkeve + wikipedia: + title: Bi Wîkîpediyayê têkeve + alt: Bi hesabekî Wîkîpediyayê têkeve yahoo: title: Bi Yahooyê têkeve + wordpress: + title: Bi Wordpressê têkeve + aol: + title: Bi AOL'ê têkeve + logout: + title: Derkeve + heading: Ji OpenStreetMapê derkeve + logout_button: Derkeve reset_password: password: 'Şîfre:' flash changed: Şîfreya te hate guhertin. new: + title: Xwe Qeyd Bike password: Şîfre terms: consider_pd_why: Ev çi ye? @@ -734,6 +1705,13 @@ ku-Latn: france: Frensa italy: Îtalya view: + my diary: Rojnivîska min + my edits: Guhertinên min + my traces: Şopên min + my notes: Notên min + my messages: Peyamên min + my profile: Profîla min + my settings: Hevyazên min my comments: Şîroveyên min status: 'Rewş:' description: Danasîn @@ -745,6 +1723,7 @@ ku-Latn: your location: Cihê te friend: Heval account: + my settings: Hevyazên min openid: link text: Ev çi ye? public editing: @@ -753,6 +1732,8 @@ ku-Latn: contributor terms: link text: Ev çi ye? image: 'Wêne:' + latitude: 'Hêlîpan:' + longitude: 'Hêlîlar:' confirm_resend: failure: Bikarhêner %{name} nehate dîtin. list: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 9458c758f..51055a42a 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -275,9 +275,12 @@ lb: prefix: aerialway: cable_car: Kabelwon + pylon: Mast + t-bar: Schlepplift aeroway: aerodrome: Fluchhafen gate: Paart + hangar: Hangar helipad: Helikopterlandeplaz runway: Start- a Landepist terminal: Terminal @@ -305,27 +308,22 @@ lb: crematorium: Crematoire dentist: Zänndokter doctors: Dokteren - dormitory: Studentewunnengen drinking_water: Drénkwaasser driving_school: Fahrschoul embassy: Ambassade - emergency_phone: Noutruff-Telefon - fire_hydrant: Hydrant fire_station: Pompjeeën fountain: Sprangbur fuel: Benzin grave_yard: Kiirfecht - gym: Fitnessstudio hospital: Klinik ice_cream: Glace kindergarten: Spillschoul library: Bibliothéik - market: Maart marketplace: Maartplaz monastery: Klouschter - nursery: Crèche office: Büro parking: Parking + parking_space: Parkplaz(en) pharmacy: Apdikt police: Police post_box: Bréifboîte @@ -334,7 +332,6 @@ lb: prison: Prisong pub: Bistro public_building: Ëffentlecht Gebai - reception_area: Rezeptiounsberäich recycling: Recycling-Center restaurant: Restaurant retirement_home: Altersheim @@ -376,11 +373,13 @@ lb: emergency: defibrillator: Defibrillator phone: Noutruff-Telefon + "yes": Urgence highway: bridleway: Wee fir Päerd bus_guideway: Busspur bus_stop: Busarrêt construction: Autobunn (am Bau) + corridor: Couloir elevator: Lift footway: Fousswee ford: Fuert @@ -397,6 +396,7 @@ lb: secondary_link: Niewestrooss speed_camera: Radar fir d'Vitesse ze moossen steps: Trap + stop: Stoppschëld street_lamp: Stroosseluucht tertiary: Kleng Strooss "yes": Strooss @@ -419,6 +419,7 @@ lb: tomb: Graf tower: Tuerm wreck: Wrack + "yes": Historesch Plaz junction: "yes": Kräizung landuse: @@ -438,7 +439,6 @@ lb: residential: Wunngéigend vineyard: Wéngert leisure: - club: Club garden: Gaart golf_course: Golfterrain ice_rink: Äispist @@ -452,14 +452,26 @@ lb: swimming_pool: Schwämm "yes": Fräizäit man_made: + bridge: Bréck + bunker_silo: Bunker + chimney: Kamäin + crane: Kran + gasometer: Gasometer lighthouse: Liichttuerm + mast: Mast + mine: Minn pipeline: Pipeline + surveillance: Iwwerwaachung tower: Tuerm + water_tower: Waassertuerm + water_well: Buer + windmill: Wandmillen works: Fabrik military: airfield: Militärfluchhafen barracks: Kasär bunker: Bunker + "yes": Militär mountain_pass: "yes": Pass an de Bierger natural: @@ -497,8 +509,6 @@ lb: travel_agent: Reesbüro "yes": Büro place: - block: Block - airport: Fluchhafen city: Stad country: Land county: Bezierk @@ -508,12 +518,13 @@ lb: island: Insel islet: Insel locality: Plaz - moor: Mouer municipality: Gemeng neighbourhood: Noperschaft postcode: Postcode + quarter: Quartier region: Regioun sea: Mier + square: Plaz subdivision: Ënnerdeelung town: Stad village: Duerf @@ -522,7 +533,6 @@ lb: abandoned: Fréier Eisebunn construction: Eisebunn (am Bau) disused: Fréier Eisebunn - historic_station: Historesch Eisebunnsstatioun junction: Eisebunnskräizung miniature: Miniatur-Eisebunn platform: Zuchquai @@ -534,6 +544,7 @@ lb: antiques: Antiquitéitegeschäft bakery: Bäckerei bicycle: Vëlosgeschäft + bookmaker: Wettbüro books: Bichergeschäft boutique: Boutique butcher: Metzlerei @@ -552,21 +563,24 @@ lb: furniture: Miwwelgeschäft gallery: Galerie hairdresser: Coiffeur - insurance: Versécherungsbüro jewelry: Bijouterie laundry: Botzerei + lottery: Lotterie market: Maart + massage: Massage music: Museksgeschäft optician: Optiker pet: Déierebuttek pharmacy: Apdikt photo: Fotosgeschäft + seafood: Mieresfriichten second_hand: Secondhand-Geschäft shoes: Schonggeschäft sports: Sportsgeschäft supermarket: Supermarché tailor: Schneider travel_agency: Reesbüro + tyres: Peuenhändler "yes": Geschäft tourism: apartment: Appartement @@ -1277,9 +1291,10 @@ lb: merge_left_without_exit: Lénks areien op %{name} fork_left_without_exit: Um Ënn vun der Strooss lénks ofbéien op %{name} via_point_without_exit: (iwwer de Punkt) - roundabout_without_exit: Am Kreesverkéier huelt %{name} + roundabout_without_exit: Am Kreesverkéier huelt d'Ausfaart op %{name} leave_roundabout_without_exit: Aus dem Kreesverkéier erausgoen - %{name} stay_roundabout_without_exit: Am Kreesverkéier bleiwen - %{name} + start_without_exit: Bei %{name} ufänken turn_left_with_exit: Am Kreesverkéier lénks ofbéien op %{name} slight_left_with_exit: Am Kreesverkéier liicht no lénks op %{name} ofbéien turn_right_with_exit: Am Kreesverkéier riets ofbéien op %{name} diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 9d5c7cc7e..f1f7a5991 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -7,6 +7,7 @@ # Author: Garas # Author: Macofe # Author: Mantak111 +# Author: Manvydasz # Author: Matasg # Author: Pauliuz # Author: Pdxx @@ -352,7 +353,7 @@ lt: map_image: Žemėlapio vaizdas (rodo standartinį sluoksnį) embeddable_html: Pritaikomas HTML licence: Licencija - export_details: OpenStreetMap duomenų licencija - Open + export_details: OpenStreetMap duomenų licencija - Open Data Commons Open Database License (ODbL). too_large: advice: 'Jei aukščiau pateiktas eksportas nepavyko, pabandykite vieną iÅ¡ žemiau @@ -393,14 +394,14 @@ lt: geocoder: search: title: - latlon: Vidiniai rezultatai + latlon: Vidiniai rezultatai uk_postcode: NPEMap / FreeThe Postcode rezultatai - ca_postcode: Geocoder.CA rezultatai - osm_nominatim: OpenStreetMap + ca_postcode: Geocoder.CA rezultatai + osm_nominatim: OpenStreetMap Nominatim rezultatai geonames: GeoNames rezultatai - osm_nominatim_reverse: Rezultatai iÅ¡ OpenStreetMap + osm_nominatim_reverse: Rezultatai iÅ¡ OpenStreetMap Nominatim geonames_reverse: Rezultatai iÅ¡ GeoNames search_osm_nominatim: @@ -416,6 +417,7 @@ lt: apron: Oro uosto aikÅ¡telė gate: Vartai helipad: Sraigtasparnių aikÅ¡telė + parking_position: Stovėjimo Pozicija runway: Pakilimo takas taxiway: Riedėjimo takas terminal: Terminalas @@ -450,37 +452,31 @@ lt: crematorium: Krematoriumas dentist: Dantistas doctors: Gydytojai - dormitory: Bendrabutis drinking_water: Geriamas vanduo driving_school: Vairavimo mokykla embassy: Ambasada - emergency_phone: Pagalbos telefonas fast_food: Greitas maistas ferry_terminal: Keltų terminalas - fire_hydrant: Hidrantas fire_station: Gaisrinė food_court: Savitarnos kavinė fountain: Fontanas fuel: Degalinė gambling: LoÅ¡imas grave_yard: Kapinės - gym: Sveikatingumo centras / sporto salė - health_centre: Sveikatingumo centras hospital: Ligoninė hunting_stand: Medžiotojų bokÅ¡telis ice_cream: Ledai kindergarten: Vaikų darželis library: Biblioteka - market: Turgus marketplace: Turgavietė monastery: Vienuolynas motorcycle_parking: Motociklų stovėjimo aikÅ¡telė nightclub: Naktinis klubas - nursery: Seselės kabinetas nursing_home: Slaugos namai office: Biuras parking: Stovėjimo aikÅ¡telė parking_entrance: Ä®važiavimas į stovėjimo aikÅ¡telę + parking_space: Stovėjimo Vieta pharmacy: Vaistinė place_of_worship: Maldos namai police: Policija @@ -490,7 +486,6 @@ lt: prison: Kalėjimas pub: Aludė public_building: Visuomeninis pastatas - reception_area: Priėmimo zona recycling: Perdirbimo punktas restaurant: Restoranas retirement_home: Senelių namai @@ -551,6 +546,7 @@ lt: bus_guideway: Bėginio autobuso linija bus_stop: Autobusų stotelė construction: Statomas kelias + corridor: Koridorius cycleway: Dviračių takas elevator: Liftas emergency_access_point: Skubios prieigos punktas @@ -577,6 +573,7 @@ lt: services: Automagistralės paslaugos speed_camera: Greičio kamera steps: Laiptai + stop: Stop Ženklas street_lamp: Gatvės žibintas tertiary: Trečios reikÅ¡mės kelias tertiary_link: Trečios reikÅ¡mės kelias @@ -586,7 +583,6 @@ lt: trunk: Magistralinis kelias trunk_link: Magistralinis kelias unclassified: Neklasifikuotas kelias - unsurfaced: Kelias be dangos "yes": Kelias historic: archaeological_site: Archeologinė vieta @@ -614,6 +610,7 @@ lt: wayside_cross: Pakelės kryžius wayside_shrine: Koplytstulpis wreck: Nuskendęs laivas + "yes": Istorinė Vieta junction: "yes": SandÅ«ra landuse: @@ -651,9 +648,9 @@ lt: leisure: beach_resort: PajÅ«rio kurortas bird_hide: paukščių stebėjimo vieta - club: Klubas common: Bendra žemė dog_park: Å unų parkas + firepit: Laužavietė fishing: Žvejybos zona fitness_centre: Sveikatingumo centras fitness_station: Fitneso treniruočių vieta @@ -678,15 +675,25 @@ lt: water_park: Vandens parkas "yes": Laisvalaikis man_made: + bridge: Tiltas + bunker_silo: Bunkeris + chimney: Kaminas + crane: Kranas lighthouse: Å vyturys + monitoring_station: Stebėjimo Stotis pipeline: Vamzdynas + surveillance: Stebėjimas tower: BokÅ¡tas + watermill: Vandens MalÅ«nas + water_tower: Vandens BokÅ¡tas + water_well: Å ulinys works: Gamykla "yes": Žmogaus sukurta military: airfield: Karinis aerodromas barracks: Kareivinės bunker: Bunkeris + "yes": Karinis mountain_pass: "yes": Kalnų perėja natural: @@ -732,11 +739,14 @@ lt: accountant: Buhalteris administrative: Administracija architect: Architektas + association: Asociacija company: Bendrovė + educational_institution: Å vietimo Ä®staiga employment_agency: Ä®darbinimo agentÅ«ra estate_agent: Nekilnojamojo turto agentas government: Vyriausybinė tarnyba insurance: Draudimo įstaiga + it: IT Ofisas lawyer: Advokatas ngo: NGO įstaiga telecommunication: Telekomunikacijų tarnyba @@ -744,9 +754,8 @@ lt: "yes": Biuras place: allotments: Kolektyviniai sodai - block: Blokas - airport: Oro uostas city: Miestas + city_block: Miesto Blokas country: Å alis county: Apskritis farm: Ūkis @@ -757,7 +766,6 @@ lt: islet: Salelė isolated_dwelling: Vienkiemis locality: Vietovė - moor: Dažnai užliejama vieta municipality: Savivaldybė neighbourhood: Rajonas postcode: PaÅ¡to kodas @@ -774,10 +782,8 @@ lt: abandoned: Apleistas geležinkelis construction: Statomas geležinkelis disused: Nebenaudojamas geležinkelis - disused_station: Nebenaudojama geležinkelio stotis funicular: Funikulierius halt: Traukinio Stotelė - historic_station: Istorinė geležinkelio stotis junction: Geležinkelio mazgas level_crossing: Pervaža light_rail: Lengvasis geležinkelis @@ -803,6 +809,7 @@ lt: beauty: Grožio salonas beverages: Gėrimų parduotuvė bicycle: Dviračių parduotuvė + bookmaker: Žymė books: Knygynas boutique: Butikas butcher: Mėsininkas @@ -841,12 +848,14 @@ lt: hairdresser: Kirpykla hardware: AparatÅ«ros parduotuvė hifi: Hi-Fi - insurance: Draudimas + interior_decoration: Interjero Dekoracija jewelry: Juvelyrikos parduotuvė kiosk: Kioskas laundry: Skalbykla + lottery: Loterija mall: Prekybos centras market: Turgus + massage: Masažas mobile_phone: Mobiliųjų telefonų parduotuvė motorcycle: Motociklų parduotuvė music: Muzikos prekių parduotuvė @@ -854,21 +863,23 @@ lt: optician: Optikas organic: EkologiÅ¡kų maisto produktų parduotuvė outdoor: Lauko parduotuvė + paint: Dažų Parduotuvė pet: Naminių gyvÅ«nėlių parduotuvė pharmacy: Vaistinė photo: Foto prekių parduotuvė - salon: Salonas second_hand: Dėvėtų parduotuvė shoes: Batų parduotuvė - shopping_centre: Prekybos centras sports: Sporto prekių parduotuvė stationery: RaÅ¡tinės reikmenys supermarket: Prekybos centras tailor: Siuvėjas + ticket: Bilietų Parduotuvė + tobacco: Tabako Parduotuvė toys: Žaislų parduotuvė travel_agency: Kelionių agentÅ«ra + tyres: Padangų Parduotuvė video: Video parduotuvė - wine: Licencijuota parduotuvė + wine: Vyno Parduotuvė "yes": Parduotuvė tourism: alpine_hut: Kalnų trobelė @@ -923,7 +934,7 @@ lt: level10: Priemiesčio riba description: title: - osm_nominatim: Vietovė nustatyta pagal OpenStreetMap + osm_nominatim: Vietovė nustatyta pagal OpenStreetMap Nominatim geonames: Vietovė nustatyta pagal GeoNames types: @@ -958,8 +969,8 @@ lt: intro_text: OpenStreetMap yra pasaulio žemėlapis, kuriamas žmonių, tokių kaip jÅ«s. Jis atviras ir laisvas - naudojamas pagal atvirą licenciją. intro_2_create_account: sukurti naudotojo paskyrą - partners_html: Serveris palaikomas %{ucl}, %{ic} ir %{bytemark}, ir kiti %{partners}. - partners_ucl: UCL VR centras + partners_html: Serveris palaikomas %{ucl}, %{bytemark}, %{ic} ir kiti %{partners}. + partners_ucl: UCL partners_ic: Imperial College London partners_bytemark: Bytemark serveris partners_partners: partneriai @@ -1196,7 +1207,7 @@ lt: description: Pagalba kompanijoms ir organizacijoms pereinant į OpenStreetMap paremtus žemėlapius ir kitas paslaugas. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: NarÅ¡ykite OSM detalios dokumentacijos wiki. about_page: @@ -1455,7 +1466,7 @@ lt: get_directions_title: Rasti marÅ¡ruto nurodymus tarp dviejų taÅ¡kų from: IÅ¡ to: Iki - where_am_i: Kur aÅ¡ dabar? + where_am_i: Kur tai yra? where_am_i_title: ApibÅ«dinti dabartinę poziciją naudojant paieÅ¡kos variklį submit_text: Rodyti key: @@ -1975,12 +1986,12 @@ lt: email never displayed publicly: (niekada vieÅ¡ai nerodomas) external auth: 'IÅ¡orinė autentikacija:' openid: - link: http://wiki.OpenStreetMap.org/wiki/OpenID + link: https://wiki.OpenStreetMap.org/wiki/OpenID link text: kas tai? public editing: heading: 'VieÅ¡as keitimas:' enabled: Ä®jungtas. Nėra anoniminis ir gali keisti duomenis. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: kas tai? disabled: IÅ¡jungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra anonimiÅ¡ki. diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 01b217821..48d7e21fa 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -412,6 +412,7 @@ lv: aerodrome: Lidlauks apron: Perons gate: Vārti + hangar: Angārs helipad: Helikopteru nolaiÅ¡anās laukums runway: Skrejceļš taxiway: Manevrēšanas ceļš @@ -447,33 +448,26 @@ lv: crematorium: Krematorija dentist: Zobārsts doctors: Ārsti - dormitory: KopmÄ«tnes drinking_water: Dzeramais Å«dens driving_school: BraukÅ¡anas skola embassy: VēstniecÄ«ba - emergency_phone: Avārijas telefons fast_food: Bistro ferry_terminal: Prāmju termināls - fire_hydrant: Hidrants fire_station: Ugunsdzēsēju depo food_court: Ēstuves fountain: StrÅ«klaka fuel: Degviela gambling: Azartspēles grave_yard: Kapsēta - gym: Fitnesa centrs / Sporta zāle - health_centre: VeselÄ«bas centrs hospital: SlimnÄ«ca hunting_stand: MedÄ«bu tornis ice_cream: Saldējums kindergarten: Bērnudārzs library: Bibliotēka - market: Tirgus marketplace: Tirgus monastery: Klosteris motorcycle_parking: Motociklu stāvvieta nightclub: Naktsklubs - nursery: Pirmsskolas mācÄ«bu iestāde nursing_home: Pansionāts office: Birojs parking: Autostāvvieta @@ -487,7 +481,6 @@ lv: prison: Cietums pub: Krogs public_building: Sabiedriskā ēka - reception_area: UzņemÅ¡anas zona recycling: Pārstrādes punkts restaurant: Restorāns retirement_home: Pansionāts @@ -583,7 +576,6 @@ lv: trunk: MaÄ£istrālais ceļš trunk_link: MaÄ£istrālais ceļš unclassified: Neklasificēts ceļš - unsurfaced: Ceļš bez seguma "yes": Ceļš historic: archaeological_site: ArheoloÄ£isku izrakumu vieta @@ -648,7 +640,6 @@ lv: leisure: beach_resort: Pludmales kÅ«rorts bird_hide: Putnu Slēptuve - club: Klubs common: KoplietoÅ¡anas zeme dog_park: Suņu laukums fishing: Zvejas apgabals @@ -675,6 +666,8 @@ lv: water_park: Ūdens atrakciju parks "yes": AtpÅ«tas vieta man_made: + beehive: BiÅ¡u strops + chimney: Skurstenis lighthouse: Bāka pipeline: Cauruļvads tower: Tornis @@ -741,8 +734,6 @@ lv: "yes": Birojs place: allotments: Mazdārziņi - block: Bloks - airport: Lidosta city: Pilsēta country: Valsts county: Apgabals @@ -754,7 +745,6 @@ lv: islet: Saliņa isolated_dwelling: Izolēta Mājvieta locality: Vieta - moor: TÄ«relis municipality: PaÅ¡valdÄ«ba neighbourhood: Pilsētas rajons postcode: Pasta indekss @@ -771,10 +761,8 @@ lv: abandoned: Pamests dzelzceļš construction: Dzelzceļš bÅ«vniecÄ«bas stadijā disused: Nelietots dzelzceļš - disused_station: Nelietota dzelzceļa stacija funicular: TroÅ¡u dzelzceļš halt: Vilciena pietura - historic_station: Vēsturiska dzelzceļa stacija junction: Dzelzceļa mezgls level_crossing: VienlÄ«meņa kurstojums light_rail: Tramvaja sliedes @@ -838,7 +826,6 @@ lv: hairdresser: Frizētava hardware: SaimniecÄ«bas veikals hifi: Hi-Fi - insurance: ApdroÅ¡ināšana jewelry: Juvelierizstrādājumu veikals kiosk: Kiosks laundry: Veļas mazgātava @@ -854,10 +841,8 @@ lv: pet: Zooveikals pharmacy: Aptieka photo: Fotoveikals - salon: Salons second_hand: Lietoto preču veikals shoes: Apavu veikals - shopping_centre: IepirkÅ¡anās centrs sports: Sporta veikals stationery: Kancelejas preču veikals supermarket: Lielveikals @@ -865,7 +850,7 @@ lv: toys: Rotaļlietu veikals travel_agency: TÅ«risma aÄ£entÅ«ra video: Video veikals - wine: Alkohola Veikals + wine: VÄ«na veikals "yes": Veikals tourism: alpine_hut: Kalnu bÅ«da diff --git a/config/locales/mk.yml b/config/locales/mk.yml index b932dcc5e..af5653875 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -344,7 +344,7 @@ mk: map_image: Слика на картата (прикажува стандарден слој) embeddable_html: HTML-код за вметнување licence: Лиценца - export_details: Податоците на OpenStreetMap се нудат под Лиценцата + export_details: Податоците на OpenStreetMap се нудат под Лиценцата за отворени бази на Складиштето на отворени податоци (ODbL, Open Data Commons Open Database License). too_large: @@ -384,14 +384,14 @@ mk: geocoder: search: title: - latlon: Внатрешни исходни ставки + latlon: Внатрешни исходни ставки uk_postcode: Исход од NPEMap / FreeThe Postcode - ca_postcode: Исход од Geocoder.CA - osm_nominatim: Исход од OpenStreetMap + ca_postcode: Исход од Geocoder.CA + osm_nominatim: Исход од OpenStreetMap Nominatim geonames: Исход од GeoNames - osm_nominatim_reverse: Исход од OpenStreetMap + osm_nominatim_reverse: Исход од OpenStreetMap Nominatim geonames_reverse: Исход од GeoNames search_osm_nominatim: @@ -401,12 +401,19 @@ mk: chair_lift: Клупна жичница drag_lift: Влечна жичница gondola: Кабинска жичница + platter: Скилифт + pylon: Жичен јарбол station: Гондолска станица + t-bar: Влечен лифт aeroway: aerodrome: Аеродром + airstrip: Леталиште apron: Рампа gate: Порта + hangar: Хангар helipad: Хелиодром + holding_position: Задржна положба + parking_position: Оставна положба runway: Писта taxiway: Рулажна патека terminal: Терминал @@ -441,37 +448,32 @@ mk: crematorium: Крематориум dentist: Забар doctors: Доктори - dormitory: Студентски дом drinking_water: Пивка вода driving_school: Автошкола embassy: Амбасада - emergency_phone: Итен телефон fast_food: Брза храна ferry_terminal: Траектска станица - fire_hydrant: Противпожарен хидрант fire_station: Пожарна food_court: Штандови за брза храна fountain: Фонтана fuel: Гориво gambling: Коцкање grave_yard: Гробишта - gym: Фитнес/вежбалница - health_centre: Здравствен центар + grit_bin: Пескарница hospital: Болница hunting_stand: Ловечка кула ice_cream: Сладолед kindergarten: Градинка library: Библиотека - market: Пазар marketplace: Пазариште monastery: Манастир motorcycle_parking: Паркиралиште за мотоцикли nightclub: Ноќен клуб - nursery: Јасли nursing_home: Старечки дом office: Канцеларија parking: Паркиралиште parking_entrance: Влез во паркиралиште + parking_space: Паркинг-место pharmacy: Аптека place_of_worship: Верски објект police: Полиција @@ -481,7 +483,6 @@ mk: prison: Затвор pub: Пивница public_building: Јавен објект - reception_area: Рецепција recycling: Рециклирање restaurant: Ресторан retirement_home: Старечки дом @@ -506,6 +507,7 @@ mk: village_hall: Месна заедница waste_basket: Корпа за отпадоци waste_disposal: Депонија + water_point: Водоводен приклучок youth_centre: Младински центар boundary: administrative: Административна граница @@ -514,6 +516,7 @@ mk: protected_area: Заштитено подрачје bridge: aqueduct: Аквадукт + boardwalk: Шеталиште suspension: Висечки мост swing: Вртечки мост viaduct: Вијадукт @@ -533,25 +536,31 @@ mk: "yes": Занаетчиски дуќан emergency: ambulance_station: Итна помош + assembly_point: Собиралиште defibrillator: Дефибрилатор landing_site: Место за итно слетување phone: Итен телефон + water_tank: Итен водосклад + "yes": Итна помош highway: abandoned: Напуштен автопат bridleway: Коњски пат bus_guideway: Автобуски шини bus_stop: Автобуска постојка construction: Автопат во изградба + corridor: Премин cycleway: Велосипедска патека elevator: Лифт emergency_access_point: Прва помош footway: Тротоар ford: Брод + give_way: Знак за предност living_street: Маалска улица milestone: Милјоказ motorway: Автопат motorway_junction: Клучка motorway_link: Приклучен пат + passing_place: Минувалиште path: Патека pedestrian: Пешачка патека platform: Платформа @@ -568,6 +577,7 @@ mk: services: Крајпатен сервис speed_camera: Брзиноловец steps: Скалила + stop: Знак за запирање street_lamp: Улична светилка tertiary: Третостепен пат tertiary_link: Третостепен пат @@ -576,8 +586,8 @@ mk: trail: Патека trunk: Магистрала trunk_link: Магистрала + turning_loop: Повратен јазол unclassified: Некласификуван пат - unsurfaced: Неасфалтиран пат "yes": Пат historic: archaeological_site: Археолошки локалитет @@ -596,6 +606,7 @@ mk: manor: Велепоседнички дом memorial: Споменик mine: Рудник + mine_shaft: Рудничко окно monument: Споменик roman_road: Римски пат ruins: Рушевини @@ -605,6 +616,7 @@ mk: wayside_cross: Крајпатен крст wayside_shrine: Крајпатен параклис wreck: Бродолом + "yes": Историско место junction: "yes": Раскрсница landuse: @@ -642,9 +654,9 @@ mk: leisure: beach_resort: Крајбрежно одморалиште bird_hide: Набљудувалиште за птици - club: Клуб common: Општествена земја dog_park: Парк за кучиња + firepit: Огниште fishing: Рибарење fitness_centre: Центар за фитнес fitness_station: Технички преглед @@ -669,15 +681,46 @@ mk: water_park: Аквапарк "yes": Разонода man_made: + adit: Помошно окно + beacon: Светилник + beehive: Пчеларник + breakwater: Бранобран + bridge: Мост + bunker_silo: Бункер + chimney: Оџак + crane: Кран + dolphin: Пристан. дирек + dyke: Ров + embankment: Кеј + flagpole: Јарбол + gasometer: Гасомер + groyne: Брежна препрека + kiln: Печка lighthouse: Светилник + mast: Јарбол + mine: Рудник + mineshaft: Рудничко окно + monitoring_station: Надгледна станица + petroleum_well: Нафтен извор + pier: Пристан. мост pipeline: Цевковод + silo: Силос + storage_tank: Резервоар + surveillance: Надзор tower: Кула + wastewater_plant: Пречистителна станица + watermill: Воденица + water_tower: Водокула + water_well: Бунар + water_works: Водоводна станица + windmill: Ветерница works: Фабрика "yes": Вештачки military: airfield: Воено слетувалиште barracks: Касарна bunker: Бункер + "yes": Војска mountain_pass: "yes": Планински превој natural: @@ -723,11 +766,14 @@ mk: accountant: Сметководител administrative: Управа architect: Архитект + association: Здружение company: Фирма + educational_institution: Образовна установа employment_agency: Агенција за вработување estate_agent: Агенција за недвижности government: Владина служба insurance: Служба за осигурување + it: Информатичка служба lawyer: Адвокат ngo: НВО-канцеларија telecommunication: Телекомуникациска канцеларија @@ -735,9 +781,8 @@ mk: "yes": Канцеларија place: allotments: Парцели - block: Блок - airport: Аеродром city: Град + city_block: Градски блок country: Земја county: Округ farm: Фарма @@ -748,12 +793,13 @@ mk: islet: Островче isolated_dwelling: Зафрлено живееалиште locality: Месност - moor: Пустара municipality: Општина neighbourhood: Соседство postcode: Поштенски број + quarter: Четврт region: Област sea: Море + square: Плоштад state: Покраина subdivision: Админ. подрачје suburb: Населба @@ -765,10 +811,8 @@ mk: abandoned: Напуштена железничка линија construction: Железничка линија во изградба disused: Напуштена железничка линија - disused_station: Напуштена железничка станица funicular: Искачница halt: Железничка постојка - historic_station: Историска железничка станица junction: Железнички јазол level_crossing: Надвозник light_rail: Лека железница @@ -794,6 +838,7 @@ mk: beauty: Козметика beverages: Пијалоци bicycle: Продавница за велосипеди + bookmaker: Бележник books: Книжарница boutique: Бутик butcher: Месарница @@ -832,12 +877,16 @@ mk: hairdresser: Фризер hardware: Алат и опрема hifi: Аудиосистеми - insurance: Осигурително + houseware: Продавница за покуќнина + interior_decoration: Внатрешно уредување jewelry: Јувелир kiosk: Трафика + kitchen: Кујнска продавница laundry: Пералница + lottery: Лотарија mall: Трговски центар market: Пазар + massage: Масажа mobile_phone: Мобиларница motorcycle: Моторцикли music: Музички дуќан @@ -845,21 +894,27 @@ mk: optician: Оптичар organic: Здрава храна outdoor: Продавница на отворено + paint: Бои и лакови + pawnbroker: Заложница pet: Домашни миленици pharmacy: Аптека photo: Фотографски дуќан - salon: Салон + seafood: Морска храна second_hand: Половна роба shoes: Обувки - shopping_centre: Трговски центар sports: Спортски дуќан stationery: Прибор и репроматеријали supermarket: Супермаркет tailor: Кројач + ticket: Билетарница + tobacco: Тутунарница toys: Продавница за играчки travel_agency: Туристичка агенција + tyres: Автогуми + vacant: Празна продавница + variety_store: Сештарница video: Видеотека - wine: Алкохолни пијалоци + wine: Винска продавница "yes": Дуќан tourism: alpine_hut: Планинска куќарка @@ -883,6 +938,7 @@ mk: viewpoint: Видиковец zoo: Зоолошка tunnel: + building_passage: Премин на зграда culvert: Пропусен канал "yes": Тунел waterway: @@ -914,7 +970,7 @@ mk: level10: Населбена граница description: title: - osm_nominatim: Местоположба од OpenStreetMap + osm_nominatim: Местоположба од OpenStreetMap Nominatim geonames: Местоположба од GeoNames types: @@ -990,17 +1046,17 @@ mk: legal_babble: title_html: Авторски права и лиценца intro_1_html: "OpenStreetMap® има - отворени податоци под лиценцата Open - Data\nCommons Open Database License (ODbL) од фондацијата + отворени податоци под лиценцата Open + Data\nCommons Open Database License (ODbL) од фондацијата OpenStreetMap (OSMF)." intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате, предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници. Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот - правен текст." + правен текст." intro_3_html: |- Картографијата во нашите полиња на картите и нашата документација - се нудат под лиценцата Криејтив комонс Наведи извор-Сподели под исти услови 2.0 (CC-BY-SA). + се нудат под лиценцата Криејтив комонс Наведи извор-Сподели под исти услови 2.0 (CC-BY-SA). credit_title_html: Како да ја наведете OpenStreetMap credit_1_html: |- Задолжително наведувајте нè со “© Учесници на @@ -1008,7 +1064,7 @@ mk: credit_2_html: "Исто така мора јасно да истакнете дека податоците се нудат под \nЛиценцата за отворени бази, и, доколку ги користите нашите полиња на картите, дека\nкартографијата е под лиценцата CC-BY-SA. Ова може да го сторите со ставање - на врска\nдо оваа страница + на врска\nдо оваа страница за авторство. \nДруга можност (задолжителна ако го распространувате OSM во \nподаточен облик) е непосредно да го наведете името на лиценцата и да ставите врска. \nВо медиумите каде врските не се можни are not possible (на @@ -1024,7 +1080,7 @@ mk: more_title_html: Повеќе информации more_1_html: |- Повеќе за употребата на нашите податоци и како да нè наведете ќе најдете на лиценцната страница. + href="https://osmfoundation.org/Licence">лиценцната страница. more_2_html: |- Иако OpenStreetMap работи со отворени податоци, ние не можеме да понудиме бесплатни извршници (API) за карти на трети лица. @@ -1038,23 +1094,23 @@ mk: и други извори, меѓу кои се: contributors_at_html: |- Австрија: Содржи податоци од - Град Виена (под - CC BY), - Покраина Предарлска и - Покраина Тирол (под CC-BY AT со исправки). + Град Виена (под + CC BY), + Покраина Предарлска и + Покраина Тирол (под CC-BY AT со исправки). contributors_ca_html: |- Canada: Содржи податоци од GeoBase®, GeoGratis (© Министерство за природни ресурси на Канада), CanVec (© Министерство за природни ресурси на Канада), and StatCan (Географско одделение, Статистичка служба на Канада). contributors_fi_html: |- Финска: Содржи податоци од топографската база и други ресурси на Државната геодетска служба на Финска, под лиценцата - NLSFI. + NLSFI. contributors_fr_html: |- Франција: Содржи податоци од Генералната даночна управа. contributors_nl_html: |- Холандија: Содржи © податоци од AND, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Нов Зеланд: Содржи податоци од Катастарската служба на Нов Зеланд. Крунски авторски права. @@ -1074,7 +1130,7 @@ mk: contributors_footer_1_html: |- Повеќе информации за овие и други извори искористени за подобрување на OpenStreetMap ќе најдете на страницата Учесници на викито на OpenStreetMap. + href="https://wiki.openstreetmap.org/wiki/Contributors">Учесници на викито на OpenStreetMap. contributors_footer_2_html: |- Употребата на податоците на OpenStreetMap не подразбира дека добавувачот на изворните податоци го застапува или рекламира OpenStreetMap, дава било каква гаранција, или @@ -1086,13 +1142,13 @@ mk: изречна дозвола од имателите на тие права. infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте ја\nпроцедурата + href=\"https://www.osmfoundation.org/wiki/License/Takedown_procedure\">процедурата \nза отстранување или поднесете жалба на \nоваа наменска страница." trademarks_title_html: Заштитни знаци trademarks_1_html: OpenStreetMap, логото со лупа и „State of the Map“ („Состојба на картата“) се заштитни знаци на задолжбината OpenStreetMap. Ако имате прашања - во врска со употребата на знаците, пишете ѝ на Работната + во врска со употребата на знаците, погл. Работната група за лиценци. welcome_page: title: Добре дојдовте! @@ -1124,8 +1180,8 @@ mk: paragraph_1_html: "OpenStreetMap има само малку формални правила, но очекуваме сите учесници да соработуваат и општат со заедницата. Доколку имате на ум други активности освен рачно уредување, прочитајте и проследете го упатството - \nУвоз - и \nАвтоматизирани + \nУвоз + и \nАвтоматизирани уредувања." questions: title: Имате прашања? @@ -1158,7 +1214,7 @@ mk: title: Други проблеми explanation_html: "Ако сте загрижени за тоа како се користат нашите податоци или во врска со содржините, повеќе правни информации ќе добиете на\nстраницата - за авторски права или обратете се кај соодветната \nработна + за авторски права или обратете се кај соодветната \nработна група на OSMF." help_page: title: Помош @@ -1170,7 +1226,7 @@ mk: title: Добре дојдовте на OSM description: Започнете со овој брз водич низ основите на OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Почетен курс description: Напатствија за почетници, напишани од заедницата. help: @@ -1193,7 +1249,7 @@ mk: description: Помош за претпријатија и организации кои преоѓаат на карти на OpenStreetMap и други услуги. wiki: - url: http://wiki.openstreetmap.org/wiki/Mk:Main_Page + url: https://wiki.openstreetmap.org/wiki/Mk:Main_Page title: wiki.openstreetmap.org description: Прелистајте ја подробната документација за OSM на викито. about_page: @@ -1216,8 +1272,8 @@ mk: во ГИС, технолози што работат со опслужувачите на OSM, \nхуманитарни работници што картираат подрачја погодени \nод катастрофи и разни други.\nПовеќе за заедницата ќе дознаете на блогот на OpenStreetMap,\nкорисничките дневници,\nблоговите - на заедницата и страниците на\nФондацијата + href='%{diary_path}'>корисничките дневници,\nблоговите + на заедницата и страниците на\nФондацијата OSM website." open_data_title: Отворени податоци open_data_html: |- @@ -1226,13 +1282,15 @@ mk: под истата лиценца. Повеќе ќе најдете на страницата Авторски права и лиценцирање. legal_title: Правни работи legal_html: "Ова мрежно место и многу други поврзани услуги со кои раководи \nЗадолжбината OpenStreetMap (OSMF) \nво + href='https://osmfoundation.org/'>Задолжбината OpenStreetMap (OSMF) \nво име на заедницата. Употребата на сите услуги што ги нуди OSMF подлежи на нашите - \nПравила - за прифатлива употреба и Правилата - за заштита на личните податоци\n
\nВе молиме контактирајте + \nПравила + за прифатлива употреба и Правилата + за заштита на личните податоци\n
\nВе молиме контактирајте ја OSMF \nако имате прашања во врска со лиценцирањето, авторките права и - други правни прашања и проблеми." + други правни прашања и проблеми.\n
\nOpenStreetMap, логото со лупа и „Состојба + на картата“ се заштитни + знаци на OSMF." partners_title: Партнери notifier: diary_comment_notification: @@ -1266,7 +1324,7 @@ mk: more_info_1: Повеќе информации за проблеми при увозот на GPX податотеки, и како да more_info_2: 'ги избегнете ,ќе најдете на:' - import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=mk + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=mk success: subject: '[OpenStreetMap] Успешен увоз на GPX-податотека' loaded_successfully: успешно се вчита со %{trace_points} од вкупно можни %{possible_points} @@ -1441,14 +1499,14 @@ mk: user_page_link: корисничка страница anon_edits_link_text: Дознајте зошто ова е така. flash_player_required: Ќе ви треба Flash-програм за да го користите Potlatch - - Flash-уредник за OpenStreetMap. Можете да го - преземете Flash Player од Adobe.com. Имате и неколку + — Flash-уредник за OpenStreetMap. Можете да го + преземете Flash Player од Adobe.com. Имате и неколку други можности за уредување на OpenStreetMap. potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или стиснете на „зачувај“ ако го имате тоа копче.) - potlatch2_not_configured: Potlatch 2 не е поставен - погледајте ја страницата - http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: Potlatch 2 не е поставен — погледајте ја страницата + https://wiki.openstreetmap.org/wiki/The_Rails_Port potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch 2 се врши со стискање на „зачувај“.) id_not_configured: Не му се зададени поставки на уредувачкиот програм „iD“ @@ -1466,6 +1524,7 @@ mk: where_am_i: Каде е ова? where_am_i_title: Опишете ја тековната местоположба со помош на пребарувачот submit_text: Дај + reverse_directions_text: Смени насока key: table: entry: @@ -1540,7 +1599,7 @@ mk: edit: Уреди preview: Преглед markdown_help: - title_html: Парсирано со Markdown + title_html: Расчленето со Markdown headings: Наслови heading: Наслов subheading: Поднаслов @@ -1583,7 +1642,7 @@ mk: save_button: Зачувај промени visibility: 'Видливост:' visibility_help: што значи ова? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk trace_form: upload_gpx: 'Подгни GPX -одатотека:' description: 'Опис:' @@ -1591,10 +1650,10 @@ mk: tags_help: одделено со запирка visibility: 'Видливост:' visibility_help: што значи ова? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk upload_button: Подигни help: Помош - help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=mk + help_url: https://wiki.openstreetmap.org/wiki/Upload?uselang=mk trace_header: upload_trace: Подигни трага see_all_traces: Погледајте ги сите траги @@ -1654,7 +1713,7 @@ mk: description: Прелистување на скороподигнати ГПС-траги tagged_with: ' означено со %{tags}' empty_html: Тука сè уште нема ништо. Подигнете нова - трага или дознајте повеќе за ГПС-трагите на нивната + трага или дознајте повеќе за ГПС-трагите на нивната викстраница. delete: scheduled_for_deletion: Трагата е закажана за бришење @@ -1864,12 +1923,12 @@ mk:

За разлика од некои други карти, OpenStreetMap во целост ја изработуваат луѓе како вас. Секој слободно може да врши поправки, да ја подновува, да ја презема и користи.

Регистрирајте се за да почнете со ваше учество. Ќе ви испратиме потврда за сметката по е-пошта.

license_agreement: Кога ќе ја потврдите вашата сметка, ќе треба да се согласите - со условите + со условите за учесници. email address: 'Е-пошта:' confirm email address: 'Потврдете ја е-поштата:' not displayed publicly: Вашата адреса нема да се прикажува јавно. Повеќе информации - за ова ќе најдете во Правилата за заштита на личните податоци. display name: 'Име за приказ:' @@ -1885,7 +1944,7 @@ mk: terms accepted: Ви благодариме што ги прифативте новите услови за учество! terms declined: Жалиме што не се согласувате со новите Услови за учество. Повеќе информации ќе најдете на оваа страница. - terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk + terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk terms: title: Услови на учество heading: Услови на учество @@ -1895,11 +1954,11 @@ mk: consider_pd: Покрај горенаведената согласност, сметам дека мојот придонес е во јавна сопственост consider_pd_why: Што е ова? - consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain?uselang=mk + consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain?uselang=mk guidance: 'Информации што ќе ви помогнат да ги разберете овие услови: a краток опис и некои неформали преводи' agree: Се согласувам - declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk + declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk decline: Одбиј you need to accept or decline: Прочитајте ги новите Услови за учество, а потоа согласете се или одбијте ги. @@ -1993,12 +2052,12 @@ mk: email never displayed publicly: (никогаш не се прикажува јавно) external auth: 'Надворешна заверка:' openid: - link: http://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk + link: https://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk link text: што е ова? public editing: heading: 'Јавно уредување:' enabled: Овозможено. Сега не е анонимно и може да се уредуваат податоци. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: што е ова? disabled: Оневозможено и не може да се уредуваат податоци, сите претходни уредувања се анонимни. @@ -2009,7 +2068,7 @@ mk: порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, стиснете на копчето подолу. По преодот на 0.6 API, само јавни корисници можат - да уредуваат податоци на карти. (дознајте + да уредуваат податоци на карти. (дознајте зошто).
  • Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.
  • Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.
@@ -2021,7 +2080,7 @@ mk: и прифатите новите Услови за учество agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавна сопственост. - link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk link text: што е ова? profile description: 'Опис за профилот:' preferred languages: 'Претпочитани јазици:' @@ -2029,7 +2088,7 @@ mk: image: 'Слика:' gravatar: gravatar: Користи Gravatar - link: http://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk + link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk link text: што е ова? disabled: Граватарот е исклучен. enabled: Вашиот граватар е вклучен. @@ -2395,8 +2454,16 @@ mk: instructions: continue_without_exit: Продолжете на %{name} slight_right_without_exit: Малку надесно на %{name} - offramp_right_without_exit: На десниот исклучок, свртете на %{name} - onramp_right_without_exit: Исклучете се десно, одејќи на %{name} + offramp_right_without_exit: На излезот десно, исклучете се на %{name} + offramp_right_with_directions: На излезот десно, свртете кон %{directions} + offramp_right_with_name_and_directions: На излезот десно, свртете на %{name} + кон %{directions} + offramp_right_without_directions: Свртете на излезот десно + onramp_right_without_exit: На влезот десно приклучете се на %{name} + onramp_right_with_directions: Свртете на влезот десно кон %{directions} + onramp_right_with_name_and_directions: На влезот десно приклучете се на %{name}, + кон %{directions} + onramp_right_without_directions: Свртете во влезот десно endofroad_right_without_exit: На крајот од патот свртете десно на %{name} merge_right_without_exit: Навлезете десно во %{name} fork_right_without_exit: На разгранокот свртете десно на %{name} @@ -2406,7 +2473,15 @@ mk: sharp_left_without_exit: Остро налево на %{name} turn_left_without_exit: Свртете лево на %{name} offramp_left_without_exit: На левиот исклучок, свртете на %{name} - onramp_left_without_exit: Исклучете се лево, одејќи на %{name} + offramp_left_with_directions: На излезот лево, свртете кон %{directions} + offramp_left_with_name_and_directions: На излезот лево, свртете на %{name} + кон %{directions} + offramp_left_without_directions: Свртете на излезот лево + onramp_left_without_exit: На влезот лево приклучете се на %{name} + onramp_left_with_directions: Свртете на влезот лево кон %{directions} + onramp_left_with_name_and_directions: На влезот лево приклучете се на %{name}, + кон %{directions} + onramp_left_without_directions: Свртете во влезот лево endofroad_left_without_exit: На крајот од патот свртете лево на %{name} merge_left_without_exit: Навлезете лево во %{name} fork_left_without_exit: На разгранокот свртете лево на %{name} diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 67009b6fe..6f0fdd4b0 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -359,13 +359,13 @@ mr: geocoder: search: title: - latlon: निकाल अंतर्गत + latlon: निकाल अंतर्गत uk_postcode: निकालNPEMap / FreeThe Postcode ca_postcode: निकाल जिओकोडर.सीए - osm_nominatim: निकाल ओपनस्ट्रीटमॅप + osm_nominatim: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम geonames: निकाल जिओनेम्स - osm_nominatim_reverse: निकाल ओपनस्ट्रीटमॅप + osm_nominatim_reverse: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम geonames_reverse: निकाल जिओनेम्स search_osm_nominatim: @@ -409,30 +409,23 @@ mr: crematorium: दहनभूमी dentist: दंतवैद्य doctors: डॉक्टर - dormitory: शयनागार drinking_water: पिण्याचे पाणी driving_school: चालन-शाळा embassy: दूतावास - emergency_phone: संकटकालीन दूरध्वनी fast_food: जलदान्न ferry_terminal: होडी अग्र - fire_hydrant: अग्नि जलोत्सर्गी fire_station: अग्निशमन केंद्र food_court: भोजन आवार fountain: कारंजे fuel: इंधन grave_yard: दफनभूमी - gym: व्यायामशाळा - health_centre: आरोग्य केंद्र hospital: रुग्णालय hunting_stand: मचाण ice_cream: आईसक्रिम kindergarten: बालवाडी library: ग्रंथालय - market: बाजार marketplace: बाजार nightclub: रात्री क्लब - nursery: बालवाडी nursing_home: शुश्रुषागृह office: कार्यालय parking: वाहनतळ @@ -445,7 +438,6 @@ mr: prison: कारागृह pub: मद्यपानगृह public_building: सार्वजनिक इमारत - reception_area: स्वागत क्षेत्र recycling: पुनश्चक्रण केंद्र restaurant: उपाहारगृह retirement_home: आरामगृह @@ -521,7 +513,6 @@ mr: trunk: महामार्ग trunk_link: महामार्ग unclassified: अवर्गीकृत रस्ता - unsurfaced: कच्चा रस्ता historic: archaeological_site: पुरातत्त्व स्थळ battlefield: युद्धक्षेत्र @@ -647,7 +638,6 @@ mr: travel_agent: प्रवास अभिकरण "yes": कार्यालय place: - airport: विमानतळ city: शहर country: देश county: तालुका @@ -659,7 +649,6 @@ mr: islet: द्वीपक isolated_dwelling: विलग रहिवास locality: मोहल्ला - moor: जीर्ण जमिन municipality: नगरपालिका neighbourhood: परिसर postcode: पोस्टसंकेत @@ -675,10 +664,8 @@ mr: abandoned: त्यक्त लोहमार्ग construction: निर्माणाधीन लोहमार्ग disused: अनुपयोगीत रेल्वे - disused_station: अनुपयोगीत रेल्वे स्थानक funicular: रज्जुलोहमार्ग halt: रेल्वे स्थानक - historic_station: ऐतिहासिक रेल्वे स्थानक junction: लोहमार्ग संधिस्थान level_crossing: समतल मार्गपारण light_rail: हलकी रेल्वे @@ -740,7 +727,6 @@ mr: grocery: किराणा दुकान hairdresser: केशकर्तनालय hardware: हार्डवेअर भांडार - insurance: विमा jewelry: आभूषण दुकान kiosk: टपरी laundry: धुलाई केंद्र @@ -756,10 +742,8 @@ mr: pet: पाळीवप्राणी दुकान pharmacy: औषधालय photo: फोटो दुकान - salon: केशकर्तनालय second_hand: वापरलेल्या वस्तूंचे दुकान shoes: जोडे दुकान - shopping_centre: खरेदी केंद्र sports: क्रिडा दुकान stationery: लेखनसामग्री दुकान supermarket: सुपरमार्केट @@ -818,7 +802,7 @@ mr: level10: उपनगर सिमा description: title: - osm_nominatim: स्थान ओपनस्ट्रीटमॅप + osm_nominatim: स्थान ओपनस्ट्रीटमॅप नॉमिनॅटिम मार्फत geonames: स्थान जिओनेम्स मार्फत types: @@ -1339,7 +1323,7 @@ mr: title: खाते संपादा my settings: माझ्या मांडण्या openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: हे काय आहे? public editing: enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 14231c8ec..a81254008 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -436,33 +436,26 @@ ms: crematorium: Bakar Mayat dentist: Doktor Gigi doctors: Doktor - dormitory: Asrama drinking_water: Air Minuman driving_school: Sekolah Memandu embassy: Kedutaan - emergency_phone: Telefon Kecemasan fast_food: Makanan Segera ferry_terminal: Terminal Feri - fire_hydrant: Pili Bomba fire_station: Balai Bomba food_court: Medan Selera fountain: Air Pancutan fuel: Minyak gambling: Pusat Perjudian grave_yard: Perkuburan - gym: Pusat Senaman / Gim - health_centre: Pusat Kesihatan hospital: Hospital hunting_stand: Pondok Memburu ice_cream: Aiskrim kindergarten: Tadika library: Perpustakaan - market: Pasar marketplace: Tempat Pasar monastery: Rumah Ibadah motorcycle_parking: Tempatletak motorsikal nightclub: Kelab Malam - nursery: Tabika nursing_home: Rumah Penjagaan office: Pejabat parking: Letak Kereta @@ -476,7 +469,6 @@ ms: prison: Penjara pub: Pab public_building: Bangunan Awam - reception_area: Sambut Tetamu recycling: Kitar Semula restaurant: Kedai Makan retirement_home: Rumah Persaraan @@ -570,7 +562,6 @@ ms: trunk: Jalan Utama trunk_link: Jalan Utama unclassified: Jalan Tidak Terkelas - unsurfaced: Jalan Tanpa Turapan "yes": Jalan Raya historic: archaeological_site: Tapak Kaji Purba @@ -634,7 +625,6 @@ ms: leisure: beach_resort: Peranginan Pantai bird_hide: Kurungan Burung - club: Kelab common: Tanah Awam dog_park: Taman Anjing fishing: Tempat Memancing @@ -725,8 +715,6 @@ ms: travel_agent: Agensi Pelancongan "yes": Pejabat place: - block: Blok - airport: Lapangan Terbang city: Bandar country: Negara county: Kaunti @@ -738,7 +726,6 @@ ms: islet: Anak Pulau isolated_dwelling: Kediaman Terpencil locality: Lokaliti - moor: Mur municipality: Perbandaran neighbourhood: Kejiranan postcode: Poskod @@ -755,10 +742,8 @@ ms: abandoned: Landasan Keretapi Terbiar construction: Landasan Keretapi dalam Pembinaan disused: Landasan Keretapi yang Tidak Digunakan Lagi - disused_station: Stesen Keretapi yang Tidak Digunakan Lagi funicular: Landasan Keretapi Funikular halt: Perhentian Keretapi - historic_station: Stesen Keretapi Bersejarah junction: Simpang Landasan Keretapi level_crossing: Lintasan Keretapi Rata light_rail: Rel Ringan @@ -822,7 +807,6 @@ ms: hairdresser: Kedai Dandan Rambut hardware: Kedai Barang Besi hifi: Hi-Fi - insurance: Insurans jewelry: Kedai Barang Kemas kiosk: Gerai laundry: Dobi @@ -838,10 +822,8 @@ ms: pet: Kedai Haiwan pharmacy: Farmasi photo: Kedai Foto - salon: Salon second_hand: Kedai Barangan Terpakai shoes: Kedai Kasut - shopping_centre: Pusat Beli-Belah sports: Kedai Sukan stationery: Kedai Alat Tulis supermarket: Pasar Raya diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 70631a9cc..f5978b69e 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -453,33 +453,26 @@ nb: crematorium: Krematorium dentist: Tannlege doctors: Leger - dormitory: Sovesal drinking_water: Drikkevann driving_school: Kjøreskole embassy: Ambassade - emergency_phone: Nødtelefon fast_food: Hurtigmat ferry_terminal: Ferjeterminal - fire_hydrant: Brannhydrant fire_station: Brannstasjon food_court: Serveringssteder fountain: Fontene fuel: Drivstoff gambling: Gambling grave_yard: Gravlund - gym: Treningssenter - health_centre: Helsesenter hospital: Sykehus hunting_stand: Jaktbod ice_cream: Iskrem kindergarten: Barnehage library: Bibliotek - market: Marked marketplace: Markedsplass monastery: Kloster motorcycle_parking: Motorsykkelparkering nightclub: Nattklubb - nursery: Førskole nursing_home: Pleiehjem office: Kontor parking: Parkeringsplass @@ -493,7 +486,6 @@ nb: prison: Fengsel pub: Pub public_building: Offentlig bygning - reception_area: ResepsjonsomrÃ¥de recycling: Resirkuleringspunkt restaurant: Restaurant retirement_home: Gamlehjem @@ -589,7 +581,6 @@ nb: trunk: Hovedvei trunk_link: Hovedvei unclassified: Uklassifisert vei - unsurfaced: Uklassifisert vei "yes": Vei historic: archaeological_site: Arkeologisk plass @@ -654,7 +645,6 @@ nb: leisure: beach_resort: Strandsted bird_hide: FugletÃ¥rn - club: Klubb common: Allmenning dog_park: Hundepark fishing: FiskeomrÃ¥de @@ -747,8 +737,6 @@ nb: "yes": Kontor place: allotments: Jordlapper - block: Blokk - airport: Flyplass city: By country: Land county: Fylke @@ -760,7 +748,6 @@ nb: islet: Holme isolated_dwelling: Enslig bosted locality: Plass - moor: Fjellhei municipality: Kommune neighbourhood: Naboskap postcode: Postnummer @@ -777,10 +764,8 @@ nb: abandoned: Forlatt jernbane construction: Jernbane under konstruksjon disused: Nedlagt jernbane - disused_station: Nedlagt jernbanestasjon funicular: Kabelbane halt: Togstopp - historic_station: Historisk jernbanestasjon junction: Jernbanekryss level_crossing: Planovergang light_rail: Bybane @@ -844,7 +829,6 @@ nb: hairdresser: Frisør hardware: Jernvarehandel hifi: Hi-Fi - insurance: Forsikring jewelry: Gullsmed kiosk: Kiosk laundry: Vaskeri @@ -860,10 +844,8 @@ nb: pet: Dyrebutikk pharmacy: Apotek photo: Fotobutikk - salon: Salong second_hand: Bruktbutikk shoes: Skobutikk - shopping_centre: Kjøpesenter sports: Sportsbutikk stationery: Papirbutikk supermarket: Supermarked diff --git a/config/locales/nds.yml b/config/locales/nds.yml index fc6d019a0..feb0bc0e4 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -148,28 +148,22 @@ nds: crematorium: Krematorium dentist: Tähndokter doctors: Dokter - dormitory: Studentenhuus drinking_water: Drinkwater driving_school: Fohrschool embassy: Baadschop - emergency_phone: Noodtelefoon fast_food: Fast Food ferry_terminal: Fährterminal - fire_hydrant: Hydrant fire_station: Füürwehr fountain: Fontään fuel: Tanksteed grave_yard: Karkhoff - gym: Fitnesscenter hospital: Krankenhuus hunting_stand: Hoogstand ice_cream: Iesladen kindergarten: Kinnergoorn library: Bökeree - market: Markt marketplace: Marktplatz nightclub: Nachtclub - nursery: Kita nursing_home: Pleeghuus office: Kontoor parking: Parkplatz @@ -284,7 +278,6 @@ nds: water: Water wood: Woold place: - airport: Flegerhaven city: Stadt country: Land county: Distrikt @@ -294,7 +287,6 @@ nds: houses: Hüüs island: Eiland islet: lütt Eiland - moor: Moor municipality: Gemeen sea: See state: Staat @@ -326,7 +318,6 @@ nds: gift: Geschenkladen greengrocer: Gröönhöker hairdresser: Putzbüdel - insurance: Versekerung jewelry: Juwelier kiosk: Kiosk laundry: Wäscheree @@ -336,7 +327,6 @@ nds: newsagent: Kiosk optician: Optiker photo: Fotoladen - salon: Salon shoes: Schohladen supermarket: Supermarkt toys: Speeltüügladen diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 210c65be5..1a6f0f6c2 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1,6 +1,7 @@ # Messages for Nepali (नेपाली) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Drjpoudel # Author: Krish Dulal # Author: Nirjal stha # Author: Njsubedi @@ -200,7 +201,7 @@ ne: wiki_link: key: '%{key} संकेतको लागि विकि विवरण पृष्ठ' tag: '%{key}=%{value} संकेतको लागि विकि विवरण पृष्ठ' - wikidata_link: '%{page} वस्तु Wikidata मा' + wikidata_link: '%{page} वस्तु विकिडेटा मा' wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख' telephone_link: '%{phone_number} मा फोन गर्नुहोस्' note: @@ -453,33 +454,26 @@ ne: crematorium: श्मशान dentist: दाँतको डाक्टर doctors: डाक्टर - dormitory: छात्रावास drinking_water: पिउने पानी driving_school: ड्राइभिङ स्कूल embassy: दूतावास - emergency_phone: आकस्मिक फोन fast_food: चमेना गृह ferry_terminal: फेरी टर्मिनल - fire_hydrant: अग्नि नियन्त्रक fire_station: अग्नि नियन्त्रण स्टेसन् food_court: खाजा घर fountain: पानीको फोहोरा fuel: इन्धन gambling: जुवाघर grave_yard: श्मशान घाट - gym: जिमखाना - health_centre: स्वास्थ्य केन्द्र hospital: अस्पताल hunting_stand: शिकार क्षेत्र ice_cream: बरफ kindergarten: बाल आश्रम library: पुस्तकालय - market: बजार marketplace: बजार क्षेत्र monastery: चैत्य motorcycle_parking: मोटर साइकल पार्किङ nightclub: रात्री क्लब - nursery: नर्सरी nursing_home: नर्सिङ होम office: कार्यलय parking: पार्किङ @@ -493,7 +487,6 @@ ne: prison: कारागार pub: पब public_building: सार्वजनिक भवन - reception_area: रिसेप्सन क्षे्त्र recycling: पुनः प्रयोग विन्दु restaurant: रेस्टुरेन्ट retirement_home: बृद्ध आश्रम @@ -577,7 +570,6 @@ ne: street_lamp: सडक बत्ती track: ट्रयाक trail: गोरेटो बाटो - unsurfaced: नछापिएको मार्ग "yes": सडक historic: bunker: बङ्कर @@ -610,7 +602,6 @@ ne: retail: खुद्रा road: सडक क्षेत्र leisure: - club: कल्ब garden: बगैँचा park: उद्यान resort: रिसोर्ट @@ -657,8 +648,6 @@ ne: travel_agent: ट्राभल एजेन्सी "yes": कार्यलय place: - block: खण्ड - airport: हवाइ अड्डा city: शहर country: देश county: ईलाका @@ -679,7 +668,6 @@ ne: "yes": स्थानहरू railway: abandoned: परित्यक्त रेलमार्ग - historic_station: ऐतिहासिक रेलमार्ग स्टेसन junction: रेलमार्ग जङ्सन shop: bakery: बेकरी @@ -718,7 +706,6 @@ ne: hairdresser: नाइ पसल hardware: हार्डवेयर पसल hifi: हाइ-फाइ - insurance: बीमा jewelry: गहना पसल mall: सपिङ मल market: बजार @@ -729,9 +716,7 @@ ne: optician: अप्टिसियन pet: पाल्तु पसल pharmacy: औषधी पसल - salon: सलोन shoes: जुत्ता पसल - shopping_centre: किनमेल केन्द्र sports: खेलकुद सामग्री पसल tailor: सुचीकार toys: खेलौना पसल @@ -1160,13 +1145,13 @@ ne: remove_friend: button: साथीबाट हटाउने filter: - not_an_administrator: यो कार्य गर्न तपाईं प्रवन्धक हुनुपर्छ . + not_an_administrator: यो कार्य गर्न तपाईं प्रबन्धक हुनुपर्छ . list: title: प्रयोगकर्ताहरू heading: प्रयोगकर्ताहरू user_role: filter: - not_an_administrator: प्रवन्धकहरूले भूमिका व्यवस्थापन गर्न सक्छन् र तपाईं प्रवन्धक + not_an_administrator: प्रबन्धकहरूले भूमिका व्यवस्थापन गर्न सक्छन् र तपाईं प्रबन्धक हैन । not_a_role: '`%{role}'' मान्य भूमिका हैन ।' already_has_role: प्रयोगकर्ता सँग %{role} भूमिका पहिले देखि नै छ। diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 4215a1d09..a7b2af2ca 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -54,19 +54,19 @@ nl: language: Taal message: Bericht node: Node - node_tag: Nodelabel + node_tag: Nodetag notifier: Melder old_node: Oude node - old_node_tag: Oud nodelabel + old_node_tag: Oude nodetag old_relation: Oude relatie old_relation_member: Oud relatielid - old_relation_tag: Oud relatielabel + old_relation_tag: Oude relatietag old_way: Oude weg old_way_node: Oude node op een weg - old_way_tag: Oud weglabel + old_way_tag: Oude weg-tag relation: Relatie relation_member: Relatielid - relation_tag: Relatielabel + relation_tag: Relatietag session: Sessie trace: Track tracepoint: Trackpunt @@ -76,7 +76,7 @@ nl: user_token: Gebruikersnummer way: Weg way_node: Wegnode - way_tag: Weglabel + way_tag: Weg-tag attributes: diary_comment: body: Tekst @@ -164,6 +164,8 @@ nl: title_comment: Set wijzigingen %{id} - %{comment} join_discussion: Meld u aan om mee te praten discussion: Overleg + still_open: Wijzigingenset is nog open – overleg gaat open van zodra de wijzigingenset + afgesloten wordt. node: title: 'Node: %{name}' history_title: 'Nodegeschiedenis: %{name}' @@ -220,10 +222,10 @@ nl: load_data: Gegevens laden loading: Bezig met laden… tag_details: - tags: Labels + tags: Tags wiki_link: - key: De wikipagina die het label %{key} beschrijft - tag: De wikipagina die het label %{key}=%{value} beschrijft + key: De wikipagina die de tag %{key} beschrijft + tag: De wikipagina die de tag %{key}=%{value} beschrijft wikidata_link: Het item %{page} op Wikidata wikipedia_link: De pagina %{page} op Wikipedia telephone_link: '%{phone_number} bellen' @@ -380,7 +382,7 @@ nl: embeddable_html: HTML-code licence: Licentie export_details: OpenStreetMapgegevens zijn gelicenseerd onder de licentie Open Data Commons Open + href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database (ODbL). too_large: advice: 'Als het exporteren mislukt, overweeg dan een van de onderstaande @@ -420,14 +422,14 @@ nl: geocoder: search: title: - latlon: Resultaten van intern + latlon: Resultaten van intern uk_postcode: Resultaten van NPEMap / FreeThe Postcode - ca_postcode: Resultaten van Geocoder.CA - osm_nominatim: Resultaten van OpenStreetMap + ca_postcode: Resultaten van Geocoder.CA + osm_nominatim: Resultaten van OpenStreetMap Nominatim geonames: Resultaten van GeoNames - osm_nominatim_reverse: Resultaten van OpenStreetMap + osm_nominatim_reverse: Resultaten van OpenStreetMap Nominatim geonames_reverse: Resulaten van GeoNames search_osm_nominatim: @@ -477,36 +479,29 @@ nl: crematorium: Crematorium dentist: Tandarts doctors: Dokter - dormitory: Studentenhuis drinking_water: Drinkwater driving_school: Rijschool embassy: Ambassade - emergency_phone: Noodtelefoon fast_food: Fast food ferry_terminal: Veerterminal - fire_hydrant: Brandkraan fire_station: Brandweer food_court: Foodcourt fountain: Fontein fuel: Brandstof gambling: Gokken grave_yard: Begraafplaats - gym: Fitnesscentrum - health_centre: Gezondheidscentrum hospital: Ziekenhuis hunting_stand: Jachttoren ice_cream: IJs kindergarten: Kleuterschool library: Bibliotheek - market: Markt marketplace: Marktplein monastery: Klooster motorcycle_parking: Motorfietsparkeerplaats nightclub: Nachtclub - nursery: Peuterspeelzaal nursing_home: Verpleeghuis office: Kantoor - parking: Parkeren + parking: Parking parking_entrance: Ingang parkeerplaats pharmacy: Apotheek place_of_worship: Religieuze samenkomstplaats @@ -517,7 +512,6 @@ nl: prison: Gevangenis pub: Café public_building: Openbaar gebouw - reception_area: Receptie recycling: Recyclingpunt restaurant: Restaurant retirement_home: Bejaardenhuis @@ -613,7 +607,6 @@ nl: trunk: Autosnelweg trunk_link: Autoweg unclassified: Ongeclassificeerde weg - unsurfaced: Onverharde weg "yes": Weg historic: archaeological_site: Archeologische vindplaats @@ -678,7 +671,6 @@ nl: leisure: beach_resort: Badplaats bird_hide: Nestplaats - club: Club common: Meent dog_park: Hondenpark fishing: Visgrond @@ -771,8 +763,6 @@ nl: "yes": Kantoor place: allotments: Volkstuinen - block: Blokkades - airport: Luchthaven city: Plaats country: Land county: District @@ -784,7 +774,6 @@ nl: islet: Eilandje isolated_dwelling: Geïsoleerde woning locality: Plaats - moor: Veen municipality: Gemeente neighbourhood: Wijk postcode: Postcode @@ -801,10 +790,8 @@ nl: abandoned: Vervallen spoorweg construction: Spoor in aanbouw disused: Ongebruikte spoorweg - disused_station: Ongebruikt spoorwegstation funicular: Kabelspoorweg halt: Treinhalte - historic_station: Historisch spoorwegstation junction: Spoorwegkruising level_crossing: Spoorwegovergang light_rail: Lightrail @@ -868,7 +855,6 @@ nl: hairdresser: Kapper hardware: Gereedschappenwinkel hifi: Hi-fi - insurance: Verzekering jewelry: Juwelier kiosk: Kioskwinkel laundry: Wasserij @@ -884,10 +870,8 @@ nl: pet: Dierenwinkel pharmacy: Apotheek photo: Fotowinkel - salon: Schoonheidssalon second_hand: Kringloopwinkel shoes: Schoenenzaak - shopping_centre: Winkelcentrum sports: Sportwinkel stationery: Kantoorartikelenwinkel supermarket: Supermarkt @@ -950,7 +934,7 @@ nl: level10: Wijkgrens description: title: - osm_nominatim: Locatie van OpenStreetMap + osm_nominatim: Locatie van OpenStreetMap Nominatim geonames: Locatie van GeoNames types: @@ -1028,17 +1012,17 @@ nl: OpenStreetMap® is open data, vrijgegeven onder de Open Data Commons Open Database License (ODbL) door de OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF). intro_2_html: |- Het staat u vrij onze gegevens te kopiëren, te distribueren, weer te geven en aan te passen, zo lang u OpenStreetMap en haar auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt, mag u het resultaat enkel onder dezelfde licentie distribueren. In de - volledige juridische + volledige juridische tekst worden uw rechten en verantwoordelijkheden uitgelegd. intro_3_html: |- De cartografie in onze kaarttegels en onze documentatie zijn - vrijgegeven onder de licentie Creative + vrijgegeven onder de licentie Creative Commons Naamsvermelding-Gelijk delen 2.0 (CC BY-SA). credit_title_html: Hoe OpenStreetMap te vermelden credit_1_html: |- @@ -1047,7 +1031,7 @@ nl: credit_2_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat de cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen - naar\nde auteursrechtenpagina. + naar\nde auteursrechtenpagina. \nU kunt ook direct verwijzen naar de licentie(s). Dat laatste is verplicht als u OSM in gegevensvorm distribueert. In media waar\nhyperlinks niet mogelijk zijn, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen @@ -1063,7 +1047,7 @@ nl: title: Voorbeeld naamsvermelding more_title_html: Meer informatie more_1_html: Lees meer over het gebruik van onze gegevens, en hoe u OpenStreetMap - moet vermelden, op de licentiepagina + moet vermelden, op de licentiepagina van de OSMF more_2_html: |- Hoewel OpenStreetMap open data is, kunnen we geen gratis @@ -1078,9 +1062,9 @@ nl: en andere bronnen, waaronder: contributors_at_html: |- Oostenrijk: bevat gegevens van de - Stad Wenen (onder - CC BY), Land Vorarlberg en - Land Tirol (onder CC BY-AT met aanvullingen). + Stad Wenen (onder + CC BY), Land Vorarlberg en + Land Tirol (onder CC BY-AT met aanvullingen). contributors_ca_html: |- Canada: Bevat gegevens van GeoBase®, GeoGratis (© Department of Natural @@ -1089,13 +1073,13 @@ nl: Statistics Canada). contributors_fi_html: 'Finland: bevat gegevens van de topografische database van het nationaal kadaster van Finland en andere gegevensverzamelingen, - onder de licentie NLSFI.' + onder de licentie NLSFI.' contributors_fr_html: |- Frankrijk: Bevat gegevens van Direction Générale des Impôts. contributors_nl_html: |- Nederland: Bevat © Gegevens van AND, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Nieuw-Zeeland: Bevat gegevens van Land Information New Zealand. Crown Copyright voorbehouden. @@ -1115,7 +1099,7 @@ nl: contributors_footer_1_html: |- Voor meer gegevens over deze en andere bronnen die gebruikt zijn voor het verbeteren van OpenStreetMap, kunt u de pagina met Bijdragers + href="https://wiki.openstreetmap.org/wiki/Contributors">pagina met Bijdragers op de OpenStreetMap Wiki raadplegen. contributors_footer_2_html: |- Opname van gegevens in OpenStreetMap betekent niet dat de originele @@ -1129,12 +1113,12 @@ nl: infringement_2_html: |- Als u van mening bent dat auteursrechtelijk beschermd en niet vrij gelicenseerd materiaal ongeoorloofd aan de database van OpenStreetMap of aan deze website is toegevoegd, raadpleeg dan - onze verwijderprocedure - of meld het direct en formeel via onze online claimpagina. + onze verwijderprocedure + of meld het direct en formeel via onze online claimpagina. trademarks_title_html: Handelsmerken trademarks_1_html: OpenStreetMap, het vergrootglaslogo en State of the Map zijn geregistreerde handelsmerken van de OpenStreetMap Foundation. Als u vragen - hebt over uw gebruik van deze merken, stuur dan uw vragen dan naar de Licentiewerkgroep. + hebt over uw gebruik van deze merken, stuur dan uw vragen dan naar de Licentiewerkgroep. welcome_page: title: Welkom! introduction_html: Welkom bij OpenStreetMap, de open en te bewerken kaart van @@ -1159,16 +1143,15 @@ nl: restaurant of een boom. way_html: Een weg (way) is een lijn of gebied, zoals een weg, een rivier, een meer of een gebouw. - tag_html: Een label (tag) is een eigenschap over een node of - een weg, zoals de naam van een restaurant of de maximum snelheid voor een - weg. + tag_html: Een tag is een eigenschap over een node of een weg, + zoals de naam van een restaurant of de maximumsnelheid op een weg. rules: title: Regels! paragraph_1_html: "OpenStreetMap heeft weinig formele regels, maar we verwachten dat alle deelnemers samenwerken en communiceren met de gemeenschap. Als u - van plan bent andere activiteiten te ontwikkelen dan met de hand bewerkingen - maken, lees en volg dan de richtlijnen op Imports - en \nGeautomatiseerde + van plan bent andere activiteiten uit te voeren dan met de hand bewerkingen + maken, lees en volg dan de richtlijnen voor Imports + en \nGeautomatiseerde bewerkingen." questions: title: Nog vragen? @@ -1204,7 +1187,7 @@ nl: explanation_html: |- Als je vragen hebt over hoe onze gegevens worden gebruikt of over de inhoud, raadpleeg dan onze auteursrechtenpagina voor meer juridische informatie, of neem contact op met de betreffende - OSMF-werkgroep. + OSMF-werkgroep. help_page: title: Hulp krijgen introduction: Er zijn verschillende bronnen om meer te leren over OpenStreetMap, @@ -1216,7 +1199,7 @@ nl: description: Begin met dit snelle stappenplan dat de basis van OpenSteetMap uitlegt. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding + url: https://wiki.openstreetmap.org/wiki/NL:Beginnershandleiding title: Handleiding voor beginners description: Handleiding voor beginners, onderhouden door de gemeenschap. help: @@ -1240,7 +1223,7 @@ nl: description: Hulp voor bedrijven en organisaties om over te schakelen op OpenStreetMap-gebaseerde kaarten en andere diensten. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: In de wiki kijken voor diepgaande documentatie over OSM about_page: @@ -1257,7 +1240,12 @@ nl: community_driven_title: Communitygedreven community_driven_html: |- De gemeenschap van OpenStreetMap is divers, gepassioneerd en wordt elke dag groter. Onder onze bijdragers zitten mensen die kaarten maken als hobby, GIS-professionals, IT-specialisten die de servers van OSM draaiende houden, filantropen die rampgebieden in kaart brengen en nog veel meer. - Bekijk de gebruikersdagboeken of de gemeenschapsblogs voor meer informatie over de gemeenschap of de website van de OSM Foundation. + Bekijk de + OpenStreetMap-blog, + gebruikersdagboeken, + gemeenschapsblogs, + en de website van de OSM Foundation + voor meer informatie over de gemeenschap. open_data_title: Open data open_data_html: 'OpenStreetMap is open data: u mag de gegevens gebruiken voor ieder doel, als u de naam van OpenStreetMap en haar bijdragers maar vermeldt. @@ -1266,11 +1254,11 @@ nl: over Auteursrechten en Licentie voor details.' legal_title: Juridisch legal_html: "Deze site en tal van andere diensten worden formeel beheerd door - \nOpenStreetMap Foundation (OSMF) + \nOpenStreetMap Foundation (OSMF) \nnamens de gemeenschap. Het gebruik van alle door OSMF aangeboden diensten - is onderworpen\naan ons \nBeleid - voor aanvaardbaar gebruik en ons Privacybeleid.\n
- \nNeem contact op met de OSMF + is onderworpen\naan ons \nBeleid + voor aanvaardbaar gebruik en ons Privacybeleid.\n
+ \nNeem contact op met de OSMF \nals u vragen of problemen hebt in verband met licenties, auteursrechten of andere juridische zaken." partners_title: Partners @@ -1486,13 +1474,13 @@ nl: user_page_link: gebruikerspagina anon_edits_link_text: Lees waarom dit het geval is. flash_player_required: U hebt Flash-player nodig om Potlatch, de OpenStreetMap - Flash-editor te gebruiken. U kunt Flash-player + Flash-editor te gebruiken. U kunt Flash-player van Adobe.com downloaden. Er zijn ook andere opties om OpenStreetMap te bewerken. potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen. Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt als u in livemodus bewerkt, of klikt u op de knop Opslaan. - potlatch2_not_configured: Potlatch 2 is niet ingesteld - zie http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: Potlatch 2 is niet ingesteld – zie https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 voor meer informatie potlatch2_unsaved_changes: U hebt wijzigingen die nog niet zijn opgeslagen. Om op te slaan in Potlatch 2 moet u op "Opslaan" klikken. @@ -1585,7 +1573,7 @@ nl: edit: Bewerken preview: Voorvertoning markdown_help: - title_html: Verwerkt met Markdown + title_html: Verwerkt met Markdown headings: Kopjes heading: Kopje subheading: Onderkop @@ -1696,7 +1684,7 @@ nl: description: Recente GPS-trackuploads bekijken tagged_with: ' gelabeld met %{tags}' empty_html: Hier is nog niets te zien. Upload een nieuwe - trace of kom meer te weten over GPS tracen op de wikipagina. + trace of kom meer te weten over GPS tracen op de wikipagina. delete: scheduled_for_deletion: Trace staat op de lijst voor verwijdering make_public: @@ -1907,13 +1895,13 @@ nl: html: |-

In tegenstelling tot andere kaarten, is OpenStreetMap volledig gemaakt door mensen net als u en iedereen kan correcties maken, en de kaart bijwerken of downloaden en gebruiken.

Registreer u om te beginnen met bijdragen. We sturen een e-mail om uw registratie te bevestigen.

- license_agreement: Als u een gebruiker aan wilt maken, moet u akkoord gaan met - de voorwaarden + license_agreement: Als u een gebruiker wil aanmaken, moet u akkoord gaan met + de voorwaarden voor bijdragen. email address: 'E-mailadres:' confirm email address: 'E-mailadres bevestigen:' - not displayed publicly: Uw adres wordt niet openbaar gemaakt, zie ons Privacybeleid + not displayed publicly: Uw adres wordt niet openbaar gemaakt, zie ons privacybeleid voor meer informatie. display name: 'Weergavenaam:' display name description: Uw openbare gebruikersnaam. U kunt deze later in uw @@ -1972,7 +1960,7 @@ nl: diary: Dagboek edits: Bewerkingen traces: Traces - notes: Opmerkingen bij kaarten + notes: Opmerkingen bij kaart remove as friend: Vriend verwijderen add as friend: Vriend toevoegen mapper since: 'Mapper sinds:' @@ -2034,12 +2022,12 @@ nl: email never displayed publicly: (nooit openbaar gemaakt) external auth: 'Externe verificatie:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: wat is dit? public editing: heading: 'Bewerkingen openbaar:' enabled: Ingeschakeld. U bent niet anoniem en u kunt bewerken. - enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: wat is dit? disabled: Uitgeschakeld. U kunt niet bewerken en al uw eerdere bewerkingen zijn anoniem. @@ -2050,8 +2038,8 @@ nl: u geen berichten sturen of uw locatie zien. Om uw bewerkingen weer te kunnen geven en andere gebruikers in staat te stellen in contact met u te komen, kunt u op de onderstaande knop klikken. Sinds de overgang naar versie - 0.6 van de API kunnen alleen publieke gebruikers de kaartgegevens bewerken - (meer informatie).
  • Uw + 0.6 van de API kunnen alleen publieke gebruikers de kaartgegevens bewerken. + (Meer informatie).
    • Uw e-mailadres wordt niet publiek gemaakt door uw bewerkingen publiek te maken.
    • Deze handeling kan niet ongedaan gemaakt worden en alle nieuwe gebrukers zijn nu standaard publiek.
    @@ -2172,6 +2160,8 @@ nl: not_a_role: '"%{role}" is geen geldige rol.' already_has_role: De gebruiker heeft de rol %{role} al. doesnt_have_role: De gebruiker heeft de rol %{role} niet. + not_revoke_admin_current_user: Kan administratorrol van de huidige gebruiker + niet laten vallen. grant: title: Toekennen rechten bevestigen heading: Toekennen rechten bevestigen @@ -2335,8 +2325,8 @@ nl: cancel: Annuleren image: Afbeelding link: Koppeling of HTML - long_link: Koppeling - short_link: Korte koppeling + long_link: Link + short_link: Korte link geo_uri: Geo-URI embed: HTML custom_dimensions: Aangepaste afmetingen instellen @@ -2366,14 +2356,14 @@ nl: base: standard: Standaard cycle_map: Fietskaart - transport_map: Transport Map + transport_map: Transportkaart hot: Humanitarian layers: header: Kaartlagen - notes: Opmerkingen bij kaarten + notes: Opmerkingen bij kaart data: Kaartgegevens gps: Openbare GPS-traces - overlays: Overlays inschakelen om fouten in de kaart te kunnen identificeren + overlays: Overlays inschakelen om fouten in de kaart te helpen identificeren title: Lagen copyright: © bijdragers OpenStreetMap donate_link_text: @@ -2397,9 +2387,10 @@ nl: new: intro: Een fout gezien of ontbreekt er iets? Laat het andere kaartmakers weten zodat wij het kunnen oplossen. Verplaats de markering naar de correcte positie - en beschrijf het probleem. Vul hier alstublieft geen persoonlijke informatie - of informatie van auteursrechtelijk beschermde kaarten of mappenlijsten - in. + en beschrijf het probleem. + advice: Deze melding is publiek en kan gebruikt worden om de kaart bij te + werken. Vul hier dus geen persoonlijke informatie in, en ook geen informatie + uit kaarten of telefoonboeken waar auteursrechtelijke bescherming op rust. add: Opmerking toevoegen show: anonymous_warning: In deze opmerking staan reacties van anonieme gebruikers @@ -2412,13 +2403,16 @@ nl: edit_help: Verplaats de kaar en zoom in op een plaats die u wilt bewerken. Klik er daarna op. directions: + ascend: Bergop engines: - graphhopper_bicycle: Fietsen (GraphHopper) - graphhopper_foot: Lopen (GraphHopper) - mapquest_bicycle: Fietsen (MapQuest) + graphhopper_bicycle: Fiets (GraphHopper) + graphhopper_car: Auto (GraphHopper) + graphhopper_foot: Te voet (GraphHopper) + mapquest_bicycle: Fiets (MapQuest) mapquest_car: Auto (MapQuest) - mapquest_foot: Lopen (MapQuest) + mapquest_foot: Te voet (MapQuest) osrm_car: Auto (OSRM) + descend: Bergaf directions: Routebeschrijving distance: Afstand errors: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 8b6bcaceb..ff7b1100a 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -415,33 +415,26 @@ nn: crematorium: Krematorium dentist: Tannlege doctors: Legar - dormitory: Sovesal drinking_water: Drikkevatn driving_school: Køyreskule embassy: Ambassade - emergency_phone: Nødtelefon fast_food: Hurtigmat ferry_terminal: Ferjeterminal - fire_hydrant: Brannhydrant fire_station: Brannstasjon food_court: Serveringsstadar fountain: Fontene fuel: Drivstoff gambling: Gambling grave_yard: Gravlund - gym: Treningssenter - health_centre: Helsesenter hospital: Sjukehus hunting_stand: Jaktbod ice_cream: Iskrem kindergarten: Barnehage library: Bibliotek - market: Marknad marketplace: Marknadsplass monastery: Kloster motorcycle_parking: Motorsykkelparkering nightclub: Nattklubb - nursery: Førskule nursing_home: Pleieheim office: Kontor parking: Parkeringsplass @@ -455,7 +448,6 @@ nn: prison: Fengsel pub: Pub public_building: Offentleg bygning - reception_area: OppsamlingsomrÃ¥de recycling: Resirkuleringspunkt restaurant: Restaurant retirement_home: Gamleheim @@ -551,7 +543,6 @@ nn: trunk: Hovedveg trunk_link: Hovedveg unclassified: Uklassifisert veg - unsurfaced: Veg utan dekke "yes": Veg historic: archaeological_site: Arkeologisk plass @@ -616,7 +607,6 @@ nn: leisure: beach_resort: Badestrand bird_hide: FugletÃ¥rn - club: Klubb common: Allmenning dog_park: Hundepark fishing: FiskeomrÃ¥de @@ -709,8 +699,6 @@ nn: "yes": Kontor place: allotments: Kolonihagar - block: Blokk - airport: Flyplass city: By country: Land county: Fylke @@ -722,7 +710,6 @@ nn: islet: Holme isolated_dwelling: Ensleg bostad locality: Plass - moor: Myr municipality: Kommune neighbourhood: Nabolag postcode: Postnummer @@ -739,10 +726,8 @@ nn: abandoned: Forlatt jernbane construction: Jernbane under konstruksjon disused: Nedlagt jernbane - disused_station: Nedlagt jernbanestasjon funicular: Kabelbane halt: Togstopp - historic_station: Historisk jernbanestasjon junction: Jernbanekryss level_crossing: Planovergang light_rail: Bybane @@ -806,7 +791,6 @@ nn: hairdresser: Frisør hardware: Jernvarehandel hifi: Hi-fi - insurance: Forsikring jewelry: Gullsmed kiosk: Kiosk laundry: Vaskeri @@ -822,10 +806,8 @@ nn: pet: Dyrebutikk pharmacy: Apotek photo: Fotobutikk - salon: Salong second_hand: Bruktbutikk shoes: Skobutikk - shopping_centre: Kjøpesenter sports: Sportsbutikk stationery: Papirbutikk supermarket: Supermarked diff --git a/config/locales/oc.yml b/config/locales/oc.yml index d62ed528d..7e9566021 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -340,7 +340,7 @@ oc: map_image: Imatge de mapa (aficha un calc normal) embeddable_html: HTML incorporable. licence: Licéncia - export_details: Las donadas d’OpenStreetMap son publicadas jos la licéncia + export_details: Las donadas d’OpenStreetMap son publicadas jos la licéncia Open Data Commons ­– Basa de donadas Dobèrta (ODbL). too_large: advice: 'Se l’expòrt çaisús fracassa, envisatjatz l’utilizacion d’una de las @@ -381,14 +381,14 @@ oc: geocoder: search: title: - latlon: Resultats intèrnes + latlon: Resultats intèrnes uk_postcode: Resultats dempuèi NPEMap / FreeThe Postcode - ca_postcode: Resultats dempuèi Geocoder.CA - osm_nominatim: Resultats de OpenStreetMap + ca_postcode: Resultats dempuèi Geocoder.CA + osm_nominatim: Resultats de OpenStreetMap Nominatim geonames: Resultats dempuèi GeoNames - osm_nominatim_reverse: Resultats de OpenStreetMap + osm_nominatim_reverse: Resultats de OpenStreetMap Nominatim geonames_reverse: Resultats de GeoNames search_osm_nominatim: @@ -398,12 +398,19 @@ oc: chair_lift: Telesèti drag_lift: Telesquí gondola: Telecabina + platter: Montaplat + pylon: Pilòne station: Gara de telecabina + t-bar: Montabarra en T aeroway: aerodrome: Aerodròm + airstrip: Pista d’aterrissatge apron: Taulièr gate: Pòrta + hangar: Envan helipad: Elipòrt + holding_position: Posicion d’espèra + parking_position: Plaça de parcatge runway: Pista taxiway: Via de manòbra terminal: Terminal @@ -438,37 +445,32 @@ oc: crematorium: Crematòri dentist: Dentista doctors: Mètges - dormitory: Dormitòri drinking_water: Aiga potabla driving_school: Escòla de conduita embassy: Ambaissada - emergency_phone: Telefòn d'urgéncia fast_food: Restauracion rapida ferry_terminal: Terminal de ferry - fire_hydrant: Boca d'incendi fire_station: Casèrna dels pompièrs food_court: Airal de restauracion fountain: Font fuel: Carburant gambling: Jòcs d'azard grave_yard: Cementèri - gym: Fitness /gimnastica - health_centre: Centre de santat + grit_bin: Nauc de sal hospital: Espital hunting_stand: Taulièr de tir ice_cream: Crema glaçada kindergarten: Jardin infantil library: Bibliotèca - market: Mercat marketplace: Plaça del mercat monastery: Mostièr motorcycle_parking: Parcatge de bicicleta nightclub: Discotèca - nursery: Grépia nursing_home: Ostal de santat office: Burèu parking: Parcatge parking_entrance: Entrada del parcatge + parking_space: Plaça de parcatge pharmacy: Farmàcia place_of_worship: Luòc de culte police: Polícia @@ -478,7 +480,6 @@ oc: prison: Preson pub: Bar public_building: Bastiment public - reception_area: Zòna de recepcion recycling: Punt de reciclatge restaurant: Restaurant retirement_home: Ostal de retirada @@ -503,6 +504,7 @@ oc: village_hall: Sala comunala waste_basket: Escobilhièr waste_disposal: Eliminacion de degalhs + water_point: Punt d'aiga youth_centre: Centre per la joventud boundary: administrative: Limit administratiu @@ -511,6 +513,7 @@ oc: protected_area: Zòna protegida bridge: aqueduct: Aqüeducte + boardwalk: Passejada suspension: Pont penjat swing: Pont virant viaduct: Viaducte @@ -530,25 +533,31 @@ oc: "yes": Botiga d'artesanat emergency: ambulance_station: Depaus d'ambulància + assembly_point: Punt d'acampada defibrillator: Desfibrillador landing_site: Terren d’aterrissatge d’urgéncia phone: Telefòn d'urgéncia + water_tank: Cistèrna d'aiga d'urgéncia + "yes": Urgéncia highway: abandoned: Autorota abandonada bridleway: Camin per cavalièrs bus_guideway: Via de bus guidada bus_stop: Arrèst de bus construction: Autorota en construccion + corridor: Corredor cycleway: Pista ciclabla elevator: Ascensor emergency_access_point: Punt d'accès d'urgéncia footway: Camin pietonièr ford: Ga + give_way: Panèl de cedar lo passatge living_street: Carrièra en zòna de rencontre milestone: Bòrna quilometrica motorway: Autorota motorway_junction: Joncion d'autorota motorway_link: Rota autorotièra + passing_place: Endreit de passatge path: Camin pedestrian: Camin pietonièr platform: Plataforma @@ -565,6 +574,7 @@ oc: services: Servicis autorotièrs speed_camera: Radar de velocitat steps: Escalièr + stop: Panèl d'arrèst street_lamp: Lampadari tertiary: Rota terciària tertiary_link: Rota terciària @@ -573,8 +583,8 @@ oc: trail: Pista trunk: Via exprèssa trunk_link: Via exprèssa + turning_loop: Virada en bocla unclassified: Rota menora - unsurfaced: Rota sens revestiment "yes": Rota historic: archaeological_site: Site arqueologic @@ -593,6 +603,7 @@ oc: manor: Castelet memorial: Memorial mine: Mina + mine_shaft: Potz de mina monument: Monument roman_road: Via romana ruins: Roïnas @@ -602,6 +613,7 @@ oc: wayside_cross: Calvari wayside_shrine: Orador wreck: Varatge + "yes": Site istoric junction: "yes": Interseccion/Caireforc landuse: @@ -639,9 +651,9 @@ oc: leisure: beach_resort: Estacion belneara bird_hide: Obsevatòri ornitologic - club: Club common: Terrens comunals dog_park: Parc canin + firepit: Fogal fishing: Zòna de pesca fitness_centre: Utilizacion de las tèrras fitness_station: Taulièr de percors de santat @@ -666,15 +678,46 @@ oc: water_park: Pargue aqüatic "yes": Lésers man_made: + adit: Galariá d'accès + beacon: Far + beehive: Bornhon + breakwater: Copa-ondada + bridge: Pont + bunker_silo: Bunker + chimney: Chemenèia + crane: Grua + dolphin: Pòste d’amarratge + dyke: Dique + embankment: Terraplen + flagpole: Mat + gasometer: Gasomètre + groyne: Espiga de plaja + kiln: Forn de terralha lighthouse: Far + mast: Pilòne + mine: Mina + mineshaft: Potz de mina + monitoring_station: Estacion de susvelhança + petroleum_well: Potz petrolifèr + pier: Peirada pipeline: Pipeline + silo: Sièja + storage_tank: Cistèrna d'emmagazinatge + surveillance: Susvelhança tower: Torre + wastewater_plant: Estacion de tractament de las aigas usadas + watermill: Molina + water_tower: Castèl d'aiga + water_well: Potz + water_works: Sistèma idrolic + windmill: Molin de vent works: Usina "yes": Creat per l'òme military: airfield: Terren d'aviacion militara barracks: Casèrna bunker: Bunker + "yes": Armada mountain_pass: "yes": Còl de montanha natural: @@ -720,11 +763,14 @@ oc: accountant: Comptable administrative: Administracion architect: Arquitècte + association: Associacion company: Societat + educational_institution: Institucion educativa employment_agency: Agéncia per l'emplec estate_agent: Agent immobilièr government: Agéncia governamentala insurance: Burèu d'assegurança + it: Burèu d'informacion lawyer: Avocat ngo: Burèu d'una ONG telecommunication: Burèus de telecomunicacion @@ -732,9 +778,8 @@ oc: "yes": Burèu place: allotments: Òrts familials - block: Blòt - airport: Aeropòrt city: Vila + city_block: Illa d'ostals country: País county: Comtat farm: Bòria @@ -745,12 +790,13 @@ oc: islet: Illòt isolated_dwelling: Abitacion isolada locality: Localitat - moor: Maura municipality: Municipalitat neighbourhood: Quartièr postcode: Còdi postal + quarter: Quartièr region: Region sea: Mar + square: Plaça state: Estat / província subdivision: Subdivision suburb: Quartier @@ -762,10 +808,8 @@ oc: abandoned: Via ferrada abandonada construction: Via ferrada en construccion disused: Via ferrada desafectada - disused_station: Gara desafectada funicular: Via de funicular halt: Arrèst de tren - historic_station: Arrèst de tren istoric junction: Jonccion ferroviària level_crossing: Passatge de nivèl light_rail: Pichona via ferrada @@ -791,6 +835,7 @@ oc: beauty: Magazin de produits de beutat beverages: Magazin de bevendas bicycle: Magazin de bicicletas + bookmaker: Ostal d'escomesas books: Librariá boutique: Botiga butcher: Carnissièr @@ -829,12 +874,15 @@ oc: hairdresser: Cofaire hardware: Quicalhariá hifi: Magazin Hi-Fi - insurance: Assegurança + interior_decoration: Decoracion d'interior jewelry: Joielariá kiosk: Quiòsque + kitchen: Magasin de cosina laundry: Bugadariá + lottery: Lotariá mall: Galariá mercanda market: Mercat + massage: Massatge mobile_phone: Magazin de telefòns mobils motorcycle: Magazin de mòto music: Magazin de musica @@ -842,19 +890,24 @@ oc: optician: Optician organic: Magazin bio outdoor: Magazin d'activitats d'aire liure + paint: Galariá de pintrura + pawnbroker: Prestaire per gatges pet: Animalariá pharmacy: Farmàcia photo: Magazin de fotografia - salon: Salon second_hand: Botiga d’ocasions shoes: Magazin de cauçaduras - shopping_centre: Centre comercial sports: Magazin d'espòrt stationery: Papetariá supermarket: Supermercat tailor: Sartre + ticket: Bilhetariá + tobacco: Burèu de tabat toys: Magazin de joguets travel_agency: Agéncia de viatge + tyres: Magasin de pneumatics + vacant: Comèrci vacant + variety_store: Magasin de varietats video: Magazin de vidèos wine: Cavista "yes": Botiga @@ -880,6 +933,7 @@ oc: viewpoint: Punt de vista zoo: Zoo tunnel: + building_passage: Passatge de bastiment culvert: Pontet "yes": Tunèl waterway: @@ -911,7 +965,7 @@ oc: level10: Limit de la banlèga description: title: - osm_nominatim: Localizacion dempuèi OpenStreetMap + osm_nominatim: Localizacion dempuèi OpenStreetMap Nominatim geonames: Localizacion dempuèi GeoNames types: @@ -986,17 +1040,18 @@ oc: legal_babble: title_html: Copyright e Licéncia intro_1_html: |- - OpenStreetMap es un ensemble de donadas dobèrtas, disponiblas jos licéncia liura Open Data Commons Open Database License (ODbL). + OpenStreetMap® es un ensemble de donadas dobèrtas, disponiblas jos licéncia liura Open Data Commons Open Database License (ODbL) alprèp de la Fondacion OpenStreetMap (OSMF). intro_2_html: |2- Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas, a condicion que creditetz OpenStreetMap e sos contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas, las podètz distribuir sonque jos la meteissa licéncia. Lo - tèxte + tèxte legal complet detalha vòstres dreits e responsabilitats. intro_3_html: Nòstres carrèus de rendut cartografics, e tanben de nòstra documentacion, - son disponibles jos la licéncia Creative + son disponibles jos la licéncia Creative Commons paternitat – partiment a l’identic 2.0 (CC-BY-SA). credit_title_html: Cossí creditar OpenStreetMap credit_1_html: Demandam que vòstre crèdit compòrta la mencion « © los contributors @@ -1010,7 +1065,7 @@ oc: more_title_html: Per trobar mai d’informacions more_1_html: |- Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la FAQ legala. + href="https://osmfoundation.org/Licence">FAQ legala. contributors_title_html: Nòstres contributors contributors_fr_html: |- França : conten de donadas de la @@ -1058,7 +1113,7 @@ oc: title: Autras preocupacions explanation_html: "Se sètz preocupat pel biais que nòstras donadas son utilizadas o sus lor contengut, consultatz nòstra\npagina de dreit - d’autor per d'informacions mai legalas, o contactar lo \ngrop + d’autor per d'informacions mai legalas, o contactar lo \ngrop de trabalh OSMF apropriat." help_page: title: Obténer d’ajuda @@ -1070,7 +1125,7 @@ oc: title: Benvenguda a OSM description: Començar amb aqueste guida rapid que cobrís las basas d'OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/OC:Guida_del_debutant + url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant title: Guida per debutants description: Guida pels debutants mantengut per la comunautat. help: @@ -1089,7 +1144,7 @@ oc: switch2osm: title: switch2osm wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Percorrètz lo wiki per la documentacion aprigondida d’OSM about_page: @@ -1100,9 +1155,13 @@ oc: ferroviàrias e plan mai encara, pertot dins lo mond. local_knowledge_title: Coneissença locala community_driven_title: Menat per la comunautat - 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. - Per ne saber mai sus la comunautat, consultatz los annuaris d’utilizaires, los blogs comunautaris e lo site web de la Fondacion OSM. + 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 \nannuaris + d’utilizaires, \nlos blogs comunautaris + e lo site web de la Fondacion OSM." open_data_title: Donadas liuras legal_title: Juridic partners_title: Partenaris @@ -1299,9 +1358,10 @@ oc: get_directions_title: Trobatz d'itineraris entre dos punts from: De to: A - where_am_i: Ont soi ? + where_am_i: Ont es aquò ? where_am_i_title: Descriu la posicion actuala en utilizant lo motor de recèrca submit_text: Validar + reverse_directions_text: Inversar las direccions key: table: entry: @@ -1376,7 +1436,7 @@ oc: edit: Modificar preview: Apercebut markdown_help: - title_html: Analisat amb Markdown + title_html: Analisat amb Markdown headings: Títols heading: Títol subheading: Sostítol @@ -1477,7 +1537,7 @@ oc: description: Percórrer las darrièras traças GPS telecargadas tagged_with: ' balisat amb %{tags}' 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 + traça novèla o per ne saber mai sul traçatge GPS, consultatz la pagina wiki. delete: scheduled_for_deletion: Pista prevista per la supression @@ -1767,12 +1827,12 @@ oc: email never displayed publicly: (pas jamai afichat publicament) external auth: 'Autenticacion extèrna:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: qu’es aquò ? public editing: heading: 'Modificacion publica :' enabled: Activat. Pas anonim e pòt modificar las donadas. - enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: qu’es aquò ? disabled link text: perqué pòdi pas modificar ? public editing note: @@ -2098,7 +2158,17 @@ oc: continue_without_exit: Contunhar sus %{name} slight_right_without_exit: Viratz leugièrament a dreita sus %{name} offramp_right_without_exit: Prene la sortida a dreita sus %{name} + offramp_right_with_directions: Prene la via de racòrdament a dreita cap a + %{directions} + offramp_right_with_name_and_directions: Prene la via de racòrdament a dreita + sus %{name}, cap a %{directions} + offramp_right_without_directions: Prene la via de racòrdament a dreita onramp_right_without_exit: Virar a dreita cap a la sortida sus %{name} + onramp_right_with_directions: Virar a dreita sus la via de racòrdament cap + a %{directions} + onramp_right_with_name_and_directions: Virar a dreita sus la via de racòrdament + sus %{name}, cap a %{directions} + onramp_right_without_directions: Virar a dreita sus la via de racòrdament endofroad_right_without_exit: A la fin de la rota, virar a dreita sus %{name} merge_right_without_exit: Rejónher a dreita sus %{name} fork_right_without_exit: A la bifurcacion, virar a dreita sus %{name} @@ -2108,17 +2178,27 @@ oc: sharp_left_without_exit: Viratz vivament a esquèrra sus %{name} turn_left_without_exit: Viratz a esquèrra cap a %{name} offramp_left_without_exit: Prene la sortida d'esquèrra fins a %{name} + offramp_left_with_directions: Prene la via de racòrdament a esquèrra cap a + %{directions} + offramp_left_with_name_and_directions: Prene la via de racòrdament a esquèrra + sus %{name}, cap a %{directions} + offramp_left_without_directions: Prene la via de racòrdament a esquèrra onramp_left_without_exit: Virar a esquèrra cap a la sortida sus %{name} + onramp_left_with_directions: Virar a esquèrra sus la via de racòrdament cap + a %{directions} + onramp_left_with_name_and_directions: Virar a esquèrra sus la via de racòrdament + sus %{name}, cap a %{directions} + onramp_left_without_directions: Virar a esquèrra sus la via de racòrdament endofroad_left_without_exit: A la fin de la rota, virar a esquèrra cap a %{name} merge_left_without_exit: Rejónher a esquèrra sus %{name} fork_left_without_exit: A la bifurcacion, virar a esquèrra sus %{name} slight_left_without_exit: Viratz leugièrament a esquèrra sus %{name} via_point_without_exit: (pel punt) follow_without_exit: Seguir %{name} - roundabout_without_exit: A la rotonda, prenètz %{name} + roundabout_without_exit: A la rotonda, prenètz cap a %{name} leave_roundabout_without_exit: Sortir de la rotonda %{name} stay_roundabout_without_exit: Seguir la rotonda - %{name} - start_without_exit: Comença a la fin de %{name} + start_without_exit: Començar en %{name} destination_without_exit: Atenhètz la destinacion against_oneway_without_exit: Remontatz a contrasens sus %{name} end_oneway_without_exit: Fin del sens unic a %{name} diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 523c45e89..ba517d151 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -261,33 +261,26 @@ pa: crematorium: ਸ਼ਮਸ਼ਾਨ ਘਾਟ dentist: ਦੰਦਾਂ ਦਾ ਡਾਕਟਰ doctors: ਡਾਕਟਰ - dormitory: ਸਰਾਂ drinking_water: ਪੀਣ ਦਾ ਪਾਣੀ driving_school: ਡਰਾਈਵਿੰਗ ਸਕੂਲ embassy: ਸਫ਼ਾਰਤਖ਼ਾਨਾ - emergency_phone: ਐਮਰਜੈਂਸੀ ਫ਼ੋਨ fast_food: ਫ਼ਾਸਟ ਫ਼ੂਡ ferry_terminal: ਫ਼ੈਰੀ ਟਰਮੀਨਲ - fire_hydrant: ਅੱਗ-ਬੁਝਾਊ ਨਲਕਾ fire_station: ਅੱਗ-ਬੁਝਾਊ ਸਟੇਸ਼ਨ food_court: ਖਾਣਾ ਦਰਬਾਰ fountain: ਫ਼ੁਹਾਰਾ fuel: ਤੇਲ gambling: ਜੂਆ grave_yard: ਕਬਰਿਸਤਾਨ - gym: ਜਿਮ/ਦਰੁਸਤੀ ਕੇਂਦਰ - health_centre: ਸਿਹਤ ਕੇਂਦਰ hospital: ਹਸਪਤਾਲ hunting_stand: ਸ਼ਿਕਾਰ ਸਟੈਂਡ ice_cream: ਆਈਸ ਕਰੀਮ kindergarten: ਬਾਲਵਾੜੀ library: ਪੁਸਤਕਾਲਾ - market: ਮੰਡੀ marketplace: ਮੰਡੀ ਦੀ ਥਾਂ monastery: ਮੱਠ motorcycle_parking: ਮੋਟਰਸਾਈਕਲ ਪਾਰਕਿੰਗ nightclub: ਰਾਤ ਦਾ ਕਲੱਬ - nursery: ਨਰਸਰੀ nursing_home: ਨਰਸਿੰਗ ਹੋਮ office: ਦਫ਼ਤਰ parking: ਪਾਰਕਿੰਗ @@ -301,7 +294,6 @@ pa: prison: ਜੇਲ੍ਹ pub: ਪਬ public_building: ਜਨਤਕ ਇਮਾਰਤ - reception_area: ਸਵਾਗਤ ਖੇਤਰ recycling: ਰੀਸਾਈਕਲ ਬਿੰਦੂ restaurant: ਰੈਸਟੋਰੈਂਟ retirement_home: ਸੇਵਾ-ਮੁਕਤੀ ਘਰ @@ -444,7 +436,6 @@ pa: village_green: ਪੇਂਡੂ ਹਰਿਆਵਲ vineyard: ਅੰਗੂਰਾਂ ਦਾ ਬਾਗ਼ leisure: - club: ਕਲੱਬ common: ਸ਼ਾਮਲਾਟ dog_park: ਕੁੱਤਾ ਪਾਰਕ fishing: ਮੱਛੀ-ਖੋਜ ਇਲਾਕਾ @@ -525,8 +516,6 @@ pa: travel_agent: ਟਰੈਵਲ ਏਜੰਸੀ "yes": ਦਫ਼ਤਰ place: - block: ਬਲਾਕ - airport: ਹਵਾਈ ਅੱਡਾ city: ਸ਼ਹਿਰ country: ਮੁਲਕ county: ਰਾਜ @@ -538,7 +527,6 @@ pa: islet: ਛੋਟਾ ਟਾਪੂ isolated_dwelling: ਇਕੱਲਾ ਘਰ locality: ਮੁਹੱਲਾ - moor: ਮੂਰ municipality: ਨਗਰਪਾਲਿਕਾ neighbourhood: ਗੁਆਂਢ postcode: ਡਾਕ-ਕੋਡ @@ -555,9 +543,7 @@ pa: abandoned: ਛੱਡਿਆ ਹੋਇਆ ਰੇਲਵੇ construction: ਉਸਾਰੀ ਹੇਠ ਰੇਲਵੇ disused: ਵਰਤੋਂ ਤੋਂ ਬਾਹਰ ਰੇਲਵੇ - disused_station: ਵਰਤੋਂ ਤੋਂ ਮੁਕਤ ਰੇਲਵੇ ਸਟੇਸ਼ਨ halt: ਟਰੇਨ ਸਟਾਪ - historic_station: ਇਤਿਹਾਸਕ ਰੇਲਵੇ ਸਟੇਸ਼ਨ junction: ਰੇਲਵੇ ਜੰਕਸ਼ਨ level_crossing: ਲੈਵਲ ਕਰਾਸਿੰਗ light_rail: ਹਲਕੀ ਰੇਲ @@ -614,7 +600,6 @@ pa: hairdresser: ਵਾਲ ਤਿਆਰ ਕਰਨ ਵਾਲਾ hardware: ਹਾਰਡਵੇਅਰ ਸਟੋਰ hifi: ਹਾਈ-ਫ਼ਾਈ - insurance: ਬੀਮਾ jewelry: ਗਹਿਣਿਆਂ ਦੀ ਦੁਕਾਨ kiosk: ਖੋਖਾ laundry: ਧੋਬੀਘਾਟ @@ -630,9 +615,7 @@ pa: pet: ਪਾਲਤੂ ਜਾਨਵਰਾਂ ਦੀ ਦੁਕਾਨ pharmacy: ਦਵਾਖ਼ਾਨਾ photo: ਤਸਵੀਰਾਂ ਦੀ ਦੁਕਾਨ - salon: ਦੀਵਾਨਖ਼ਾਨਾ shoes: ਜੁੱਤੀਆਂ ਦੀ ਦੁਕਾਨ - shopping_centre: ਖ਼ਰੀਦਦਾਰੀ ਕੇਂਦਰ sports: ਖੇਡਾਂ ਦੀ ਦੁਕਾਨ stationery: ਸਟੇਸ਼ਨਰੀ ਦੀ ਦੁਕਾਨ supermarket: ਸੁਪਰਮਾਰਕਿਟ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index f654405ac..362f6c530 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -5,6 +5,7 @@ # Author: Ajank # Author: Alan ffm # Author: Andrzej aa +# Author: Anwar2 # Author: BdgwksxD # Author: BeginaFelicysym # Author: Chrumps @@ -220,9 +221,9 @@ pl: note: Uwaga redacted: redaction: Poprawka %{id} - message_html: Ten %{type} w wersji %{version} nie może zostać wyświetlony, ponieważ - został poprawiony. Proszę zapoznać się z %{redaction_link}, aby uzyskać więcej - informacji. + message_html: '%{type} w wersji %{version} nie może zostać wyświetlony z powodu + ocenzurowania. Proszę zapoznać się z %{redaction_link}, aby uzyskać więcej + informacji.' type: node: węzeł way: linia @@ -389,7 +390,7 @@ pl: map_image: Obraz mapy (standardowa warstwa) embeddable_html: Kod HTML do osadzenia licence: Licencja - export_details: Dane OpenStreetMap udostępnione są na licencji Open + export_details: Dane OpenStreetMap udostępnione są na licencji Open Data Commons Open Database License (ODbL). too_large: advice: 'Jeśli eksportowanie się nie uda, proszę rozważyć użycie jednego z @@ -429,14 +430,14 @@ pl: geocoder: search: title: - latlon: Wyniki z Internal + latlon: Wyniki z Internal uk_postcode: Wyniki z NPEMap / FreeThe Postcode - ca_postcode: Wyniki z Geocoder.CA + ca_postcode: Wyniki z Geocoder.CA osm_nominatim: Wyniki z OpenStreetMap Nominatim geonames: Wyniki z GeoNames - osm_nominatim_reverse: Wyniki z OpenStreetMap + osm_nominatim_reverse: Wyniki z OpenStreetMap Nominatim geonames_reverse: Wyniki z GeoNames search_osm_nominatim: @@ -448,6 +449,7 @@ pl: drag_lift: Wyciąg orczykowy gondola: Kolej gondolowa station: Stacja wyciągu krzesełkowego + t-bar: Wyciąg orczykowy aeroway: aerodrome: Lotnisko apron: Płyta postojowa @@ -487,37 +489,31 @@ pl: crematorium: Krematorium dentist: Gabinet dentystyczny doctors: Lekarze - dormitory: Akademik/internat drinking_water: Źródło wody pitnej driving_school: Szkoła nauki jazdy embassy: Ambasada - emergency_phone: Telefon alarmowy fast_food: Bar (fast food) ferry_terminal: Terminal promowy - fire_hydrant: Hydrant fire_station: Remiza strażacka food_court: Współdzielone miejsce do spożywania posiłków fountain: Fontanna fuel: Stacja paliw gambling: Hazard grave_yard: Cmentarz przykościelny - gym: Centrum Fitness / Sala Gimnastyczna - health_centre: Ośrodek zdrowia hospital: Szpital hunting_stand: Ambona myśliwska ice_cream: Lodziarnia kindergarten: Przedszkole/żłobek library: Biblioteka - market: Targowisko marketplace: Plac targowy monastery: Klasztor motorcycle_parking: Parking dla motocykli nightclub: Klub nocny - nursery: Żłobek nursing_home: Dom opieki office: Biuro parking: Parking parking_entrance: Wjazd na parking + parking_space: Miejsce parkingowe pharmacy: Apteka place_of_worship: Miejsce kultu police: Policja lub straż miejska/gminna @@ -527,7 +523,6 @@ pl: prison: Więzienie/areszt pub: Pub public_building: Budynek publiczny - reception_area: Recepcja recycling: Miejsce recyklingu restaurant: Restauracja retirement_home: Dom seniora @@ -552,6 +547,7 @@ pl: village_hall: Urząd gminy waste_basket: Kosz na śmieci waste_disposal: Śmietnik + water_point: Punkt Wody youth_centre: Centrum młodzieżowe boundary: administrative: Granica gminy @@ -560,6 +556,7 @@ pl: protected_area: Obszar chroniony bridge: aqueduct: Akwedukt + boardwalk: Promenada suspension: Most wiszący swing: Most obrotowy viaduct: Most wieloprzęsłowy @@ -588,11 +585,13 @@ pl: bus_guideway: Droga dla autobusów bus_stop: Przystanek autobusowy construction: Droga w trakcie budowy + corridor: Korytarz cycleway: Droga rowerowa elevator: Winda emergency_access_point: Miejsce zbiórki ewakuacyjnej footway: Droga dla pieszych ford: Bród + give_way: Znak drogowy "Ustąp pierwszeństwa przejazdu" living_street: Strefa zamieszkania (znak D-40) milestone: Słupek pikietażowy motorway: Autostrada @@ -614,6 +613,7 @@ pl: services: Miejsce Obsługi Podróżnych speed_camera: Fotoradar steps: Schody + stop: Znak drogowy "Stop" street_lamp: Lampa uliczna tertiary: Droga trzeciorzędna tertiary_link: Droga trzeciorzędna - łącznik @@ -623,7 +623,6 @@ pl: trunk: Droga główna/ekspresowa trunk_link: Droga główna/ekspresowa – dojazd unclassified: Droga czwartorzędna - unsurfaced: Droga polna lub leśna "yes": Droga historic: archaeological_site: Stanowisko archeologiczne @@ -688,7 +687,6 @@ pl: leisure: beach_resort: Strzeżona plaża bird_hide: Ukryj ptaki - club: Klub common: Błonie dog_park: Park dla psów fishing: Łowisko @@ -715,9 +713,23 @@ pl: water_park: Park wodny "yes": Rekreacja man_made: + adit: Szyb + beehive: Ul + breakwater: Falochron + bridge: Most + chimney: Komin + crane: Å»uraw (dźwig) + dyke: Grobla lighthouse: Latarnia morska + mine: Kopalnia + pier: Molo/pomost pipeline: Rurociąg tower: Wieża + wastewater_plant: Oczyszczalnia ścieków + watermill: Młyn wodny + water_tower: Wieża ciśnień + water_well: Studnia + water_works: Wodociągi works: Fabryka "yes": Sztuczny military: @@ -781,8 +793,6 @@ pl: "yes": Biuro place: allotments: Ogródki działkowe - block: Blok - airport: Lotnisko city: Miasto country: Kraj county: Powiat @@ -794,12 +804,12 @@ pl: islet: Wysepka isolated_dwelling: Pojedynczy dom-gospodarstwo locality: Miejsce nazwane - moor: Wrzosowisko municipality: Gmina neighbourhood: Sąsiedztwo postcode: Kod pocztowy region: Rejon sea: Morze + square: Plac state: Województwo/stan/prowincja subdivision: Dzielnica suburb: Osiedle @@ -811,10 +821,8 @@ pl: abandoned: Dawna linia kolejowa construction: Budowana linia kolejowa disused: Nieczynna linia kolejowa - disused_station: Nieczynna stacja kolejowa funicular: Kolejka linowa halt: Przystanek kolejowy - historic_station: Historyczna stacja kolejowa junction: Węzeł kolejowy level_crossing: Przejazd kolejowy light_rail: Lekka kolej @@ -878,7 +886,6 @@ pl: hairdresser: Fryzjernia hardware: Sklep ze sprzętem hifi: Hi-Fi - insurance: Agent ubezpieczeniowy jewelry: Sklep z biżuterią kiosk: Kiosk laundry: Pralnia @@ -891,21 +898,22 @@ pl: optician: Optyk organic: Sklep z produktami organicznymi outdoor: Sklep turystyczny + pawnbroker: Lombard pet: Sklep ze zwierzętami pharmacy: Apteka photo: Sklep fotograficzny - salon: Salon + seafood: Owoce morza second_hand: Lumpeks shoes: Sklep obuwniczy - shopping_centre: Centrum handlowe sports: Sklep sportowy stationery: Sklep papierniczy supermarket: Supermarket tailor: Krawiec toys: Sklep z zabawkami travel_agency: Biuro podróży + vacant: Sklep zamknięty video: Sklep filmowy - wine: Winiarnia + wine: Sklep z winami "yes": Sklep tourism: alpine_hut: Chata alpejska @@ -960,7 +968,7 @@ pl: level10: Granica przedmieścia description: title: - osm_nominatim: Położenie według OpenStreetMap + osm_nominatim: Położenie według OpenStreetMap Nominatim geonames: Położenie według Geonames types: @@ -1037,8 +1045,8 @@ pl: legal_babble: title_html: Prawa autorskie i licencja intro_1_html: |- - OpenStreetMap® to projekt open data, rozpowszechniany na licencji Open Data Commons Open Database License (ODbL) przez OpenStreetMap Foundation (OSMF). + OpenStreetMap® to projekt open data, rozpowszechniany na licencji Open Data Commons Open Database License (ODbL) przez OpenStreetMap Foundation (OSMF). intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik @@ -1229,7 +1237,7 @@ pl: description: Pomoc firmom i organizacjom w przejściu do mapy OpenStreetMap i inne usługi. wiki: - url: http://wiki.openstreetmap.org/wiki/Pl:Main_Page + url: https://wiki.openstreetmap.org/wiki/Pl:Main_Page title: Wiki OpenStreetMap description: Zapoznaj się z wiki, aby uzyskać szczegółową dokumentację OSM. about_page: @@ -1249,8 +1257,8 @@ pl: Aby dowiedzieć się więcej na temat wspólnoty, odwiedź Blog OpenStreetMap, blogi użytkowników, - blogi społeczności oraz - stronę OSM Polska. + blogi społeczności oraz + stronę OSM Polska. open_data_title: Otwarte dane open_data_html: 'OpenStreetMap to otwarte dane: możesz używać ich jak tylko chcesz pod warunkiem, że dodasz, że pochodzą one z OpenStreetMap i jego członków. @@ -1898,7 +1906,7 @@ pl: html:

    W przeciwieństwie do innych map, OpenStreetMap jest całkowicie tworzone przez ludzi takich jak ty. Wszyscy mogą tu wprowadzać poprawki i aktualizacje oraz pobierać i używać map za darmo.

    - license_agreement: Zakładając konto użytkownika wyrażasz zgodę na Warunki + license_agreement: Zakładając konto użytkownika wyrażasz zgodę na Warunki uczestnictwa. email address: 'Adres e-mail:' confirm email address: 'Potwierdzenie adresu e-mail:' @@ -2028,12 +2036,12 @@ pl: email never displayed publicly: (nie jest wyświetlany publicznie) external auth: 'Zewnętrzne uwierzytelnienie:' openid: - link: http://wiki.openstreetmap.org/wiki/PL:OpenID + link: https://wiki.openstreetmap.org/wiki/PL:OpenID link text: co to jest? public editing: heading: 'Edycje publiczne:' enabled: Włączone. Nie anonimowy i uprawniony do edycji danych. - enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits enabled link text: co to jest? disabled: Wyłączone i nieuprawniony do edycji danych, wszystkie wcześniejsze edycje są anonimowe. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 771aceb1d..13c550aca 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -380,8 +380,8 @@ pt-BR: map_image: Imagem do Mapa (exibe a camada padrão) embeddable_html: HTML para embutir licence: Licença - export_details: Os dados do OpenStreetMap são sujeitos à licença Open - Data Commons Open Database License (ODbL). + export_details: Os dados do OpenStreetMap encontram-se sob a licença + Open Data Commons Open Database (ODbL). too_large: advice: 'Se a exportação acima falhar, considere o uso de uma das fontes listadas abaixo:' @@ -421,14 +421,14 @@ pt-BR: geocoder: search: title: - latlon: Resultados Internos + latlon: Resultados internos uk_postcode: Resultados do NPEMap / FreeThe Postcode - ca_postcode: Resultados do Geocoder.CA - osm_nominatim: Resultados do OpenStreetMap + ca_postcode: Resultados de Geocoder.CA + osm_nominatim: Resultados de OpenStreetMap Nominatim geonames: Resultados do GeoNames - osm_nominatim_reverse: Resultados do OpenStreetMap + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim geonames_reverse: Resultados do GeoNames search_osm_nominatim: @@ -439,12 +439,19 @@ pt-BR: chair_lift: Telecadeira drag_lift: Telesquis gondola: Telecabine + platter: Telesqui + pylon: Pilone station: Estação Teleférica + t-bar: Telesqui de barra de metal em T aeroway: aerodrome: Aeródromo + airstrip: Pista de pouso apron: Pátio de Aeródromo gate: Portão + hangar: Hangar helipad: Heliponto + holding_position: Posição de estabelecimento + parking_position: Posição de estacionamento runway: Pista de pouso taxiway: Pista de Taxiamento terminal: Terminal de Aeródromo @@ -479,37 +486,32 @@ pt-BR: crematorium: Crematório dentist: Dentista doctors: Consultório médico - dormitory: Dormitório drinking_water: Fonte de Água Potável driving_school: Escola de Condutores embassy: Embaixada - emergency_phone: Telefone de Emergência fast_food: Fast-Food ferry_terminal: Terminal de Balsas - fire_hydrant: Hidrante fire_station: Posto de Bombeiros food_court: Praça de Alimentação fountain: Chafariz fuel: Posto de Combustível gambling: Casa de Jogos grave_yard: Cemitério Paroquial - gym: Academia de Ginástica - health_centre: Centro de Saúde + grit_bin: Caixa de sal-gema hospital: Hospital hunting_stand: Estande de Caça ice_cream: Sorveteria kindergarten: Escola Infantil library: Biblioteca - market: Mercado marketplace: Mercado/Feira monastery: Monastério motorcycle_parking: Estacionamento de Motocicletas nightclub: Danceteria - nursery: Creche/Berçário nursing_home: Clínica Geriátrica office: Escritório parking: Estacionamento parking_entrance: Entrada de Estacionamento + parking_space: Espaço para estacionamento pharmacy: Drogaria place_of_worship: Lugar de Prática Religiosa police: Delegacia de Polícia @@ -519,7 +521,6 @@ pt-BR: prison: Prisão pub: Pub public_building: Edifício Público - reception_area: Área de Recepção recycling: Posto de Reciclagem restaurant: Restaurante retirement_home: Lar de Idosos @@ -544,6 +545,7 @@ pt-BR: village_hall: Prefeitura waste_basket: Cesto de Lixo waste_disposal: Ponto de Entrega de Lixo + water_point: Ponto de água youth_centre: Centro Juvenil boundary: administrative: Limite Administrativo @@ -552,6 +554,7 @@ pt-BR: protected_area: Área Protegida bridge: aqueduct: Aqueduto + boardwalk: Passeio à beira mar suspension: Ponte Suspensa swing: Ponte Giratória viaduct: Viaduto @@ -571,25 +574,31 @@ pt-BR: "yes": Loja de Artesanato emergency: ambulance_station: Posto de Ambulâncias + assembly_point: Centro de agrupamento defibrillator: Desfibrilador landing_site: Local de Pouso de Emergência phone: Telefone de Emergência + water_tank: Tanque de água de emergência + "yes": Emergência highway: abandoned: Via Abandonada bridleway: Hipovia bus_guideway: Guiamento de Ônibus bus_stop: Ponto de Ônibus construction: Via em Construção + corridor: Corredor cycleway: Ciclovia elevator: Elevador emergency_access_point: Ponto de Resgate Emergencial footway: Caminho de Pedestre ford: Vau + give_way: Sinal de preferência de passagem living_street: Via de Espaço Compartilhado milestone: Marco motorway: Autoestrada motorway_junction: Saída de Trevo motorway_link: Ligação de Autoestrada + passing_place: Lugar de passagem path: Caminho Informal pedestrian: Calçadão platform: Plataforma @@ -606,6 +615,7 @@ pt-BR: services: Serviços de Estrada speed_camera: Controlador de Velocidade steps: Escada + stop: Sinal de parada street_lamp: Poste de Luz tertiary: Via Terciária tertiary_link: Ligação Terciária @@ -614,8 +624,8 @@ pt-BR: trail: Caminho trunk: Via Expressa trunk_link: Ligação de Via Expressa + turning_loop: Circuito reverso unclassified: Via Não Classificada - unsurfaced: Estrada Não Pavimentada "yes": Estrada historic: archaeological_site: Sítio Arqueológico @@ -634,6 +644,7 @@ pt-BR: manor: Casa Senhorial memorial: Monumento Comemorativo mine: Mina Histórica + mine_shaft: Mina subterrânea monument: Monumento Simbólico roman_road: Estrada Romana ruins: Ruína @@ -643,6 +654,7 @@ pt-BR: wayside_cross: Cruz de beira de estrada wayside_shrine: Capelinha de Beira de Estrada wreck: Naufrágio + "yes": Local Histórico junction: "yes": Entroncamento landuse: @@ -680,9 +692,9 @@ pt-BR: leisure: beach_resort: Estação Praiana bird_hide: Observatório de Pássaros - club: Clube common: Baldio Comunitário dog_park: Cachorródromo + firepit: Fogueira fishing: Área de Pesca fitness_centre: Academia de Ginástica fitness_station: Estação de Ginástica @@ -707,15 +719,46 @@ pt-BR: water_park: Parque Aquático "yes": Lazer man_made: + adit: Galeria de acesso + beacon: Baliza + beehive: Colmeia + breakwater: Quebra-mar + bridge: Ponte + bunker_silo: Búnquer + chimney: Chaminé + crane: Guindaste + dolphin: Posto de amarração + dyke: Represa + embankment: Aterro + flagpole: Mastro + gasometer: Gasômetro + groyne: Estacada + kiln: Estufa lighthouse: Farol + mast: Mastro + mine: Mina + mineshaft: Poços de mina + monitoring_station: Estação de Monitoramento + petroleum_well: Poço de petróleo + pier: Doca pipeline: Tubulação + silo: Silo + storage_tank: Reservatório + surveillance: Vigilância tower: Torre + wastewater_plant: Planta de águas residuais + watermill: Moinho de água + water_tower: Torre de água + water_well: Poço + water_works: Estação de tratamento de água + windmill: Moinho de vento works: Fábrica "yes": Edificação military: airfield: Aeródromo Militar barracks: Quartel bunker: Casamata + "yes": Militar mountain_pass: "yes": Passo de Montanha natural: @@ -761,11 +804,14 @@ pt-BR: accountant: Contador administrative: Escritório Administrativo architect: Arquiteto + association: Associação company: Empresa + educational_institution: Instituição educativa employment_agency: Agência de Emprego estate_agent: Agente Imobiliário government: Escritório Governamental insurance: Seguradora + it: Escritórios de informática lawyer: Advogado ngo: Escritório de ONG telecommunication: Escritório de Telecomunicações @@ -773,9 +819,8 @@ pt-BR: "yes": Escritório place: allotments: Horta Urbana - block: Quarteirão - airport: Aeroporto city: Cidade + city_block: Quarteirão country: País county: Condado farm: Fazenda @@ -786,12 +831,13 @@ pt-BR: islet: Ilhota isolated_dwelling: Moradia Isolada locality: Localidade - moor: Ancoradouro municipality: Município neighbourhood: Vizinhança postcode: Código Postal + quarter: Quarto region: Região sea: Mar + square: Bairro state: Estado subdivision: Subdivisão suburb: Bairro @@ -803,10 +849,8 @@ pt-BR: abandoned: Ferrovia Abandonada construction: Ferrovia em Construção disused: Ferrovia Inativa - disused_station: Estação Ferroviária Inativa funicular: Funicular halt: Parada de Trem - historic_station: Estação Ferroviária Histórica junction: Entroncamento Ferroviário level_crossing: Passagem em Nível light_rail: Ferrovia Metropolitana @@ -832,6 +876,7 @@ pt-BR: beauty: Salão de Beleza beverages: Loja de Bebidas Alcoólicas bicycle: Loja de Bicicletas + bookmaker: Casa de apostas books: Livraria boutique: Butique butcher: Açougue @@ -870,12 +915,16 @@ pt-BR: hairdresser: Cabeleireiro/Barbeiro hardware: Loja de Material de Construção hifi: Loja de Aparelhos Hi-Fi - insurance: Seguradora + houseware: Loja de utensílios domésticos + interior_decoration: Decoração de interiores jewelry: Joalheria kiosk: Quiosque Comercial + kitchen: Loja de cozinha laundry: Lavanderia + lottery: Loteria mall: Galeria Comercial market: Mercado + massage: Massagem mobile_phone: Loja de Celulares motorcycle: Loja de Motocicletas music: Loja de Música @@ -883,21 +932,27 @@ pt-BR: optician: Ótica organic: Loja de Produtos Orgânicos outdoor: Loja de Esportes de Aventura + paint: Lojas de pintura + pawnbroker: Penhor pet: Pet Shop pharmacy: Drogaria photo: Loja Fotográfica - salon: Salão de Beleza + seafood: Frutos do mar second_hand: Brechó shoes: Loja de Calçados - shopping_centre: Centro Comercial sports: Loja de Artigos Esportivos stationery: Papelaria supermarket: Supermercado tailor: Alfaiataria + ticket: Loja de ingressos + tobacco: Tabacaria toys: Loja de Brinquedos travel_agency: Agência de Viagens + tyres: Loja de pneus + vacant: Lojas vagas + variety_store: Loja de variedades video: Loja/Locadora de Vídeo - wine: Loja de Vinhos + wine: Venda de bebidas "yes": Loja tourism: alpine_hut: Abrigo de Montanha @@ -921,6 +976,7 @@ pt-BR: viewpoint: Mirante zoo: Jardim Zoológico tunnel: + building_passage: Passagem de construção culvert: Duto de Drenagem "yes": Túnel waterway: @@ -952,7 +1008,7 @@ pt-BR: level10: Limite de Bairro description: title: - osm_nominatim: Resultados do OpenStreetMap + osm_nominatim: Resultado de OpenStreetMap Nominatim geonames: Localização do GeoNames types: @@ -1030,30 +1086,32 @@ pt-BR: legal_babble: title_html: Direitos Autorais e Licença intro_1_html: |- - O OpenStreetMap possui dados abertos, sujeitos à Open Data - Commons Open Database License (ODbL). - intro_2_html: "Você é livre para copiar, distribuir, transmitir e adaptar nossos - dados,\ndesde que você referencie o OpenStreetMap e seus \ncontribuidores. - Se você alterar ou inovar a partir de nossos mapas, você\ndeve distribuir - o resultado somente sob a mesma licença. O\ntexto\nlegal - completo explica seus direitos e responsabilidades." - intro_3_html: |- - Nosso acervo cartográfico, bem como nossa documentação, são - sujeitos à licença Creative - Commons Atribuição – Compartilhamento pela mesma Licença 2.0 (CC-BY-SA). + O OpenStreetMap® é disponibilizado em dados abertos, sob a licença Open Data + Commons Open Database License (ODbL) pela Fundação OpenStreetMap (OSMF). + intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os nossos + dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. + Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado + apenas com a mesma licença. O texto + legal completo explica os seus direitos e responsabilidades. + intro_3_html: A cartografia nas nossas telas de mapas (imagens dos mapas) e + a nossa documentação são disponibilizadas sob a licença Creative + Commons Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA). credit_title_html: Como fazer atribuição ao OpenStreetMap credit_1_html: Requeremos que você faça atribuição citando “© contribuidores do OpenStreetMap”. - credit_2_html: "Você deve deixar claro que os dados são disponibilizados mediante - a licença \"Open\nDatabase Licence\", e se usar nosso acervo cartográfico, - que o mesmo é\nlicenciado como CC-BY-SA. Você pode proceder ligando a\nesta página.\nAlternativamente, - e obrigatoriamente, caso esteja distribuindo o OSM em \nforma de dados, você - pode denominar e ligar diretamente à(s) licença(s). Em veículos\nonde \"links\" - não são possíveis (p. ex.: impressos), sugerimos que você\nremeta seus leitores - ao endereço openstreetmap.org (talvez expandindo \n'OpenStreetMap' ao seu - endereço completo), ao opendatacommons.org, e,\nse for relevante, ao creativecommons.org." + credit_2_html: Também tem de indicar claramente que os dados estão disponíveis + sob a Open Database License (ODbL), e caso utilize as telas de mapas (imagens + dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA. Pode + fazer isto colocando uma hiperligação para esta + página sobre licença e direitos de autor. Como alternativa, e obrigatório + caso distribua o OpenStreetMap em formato de dados, pode indicar as licenças + e colocar hiperligações a apontar para as páginas das licenças. Em suportes + que não seja possível colocar hiperligações (por exemplo, obras impressas) + sugerimos que indique o endereço do sítio www.openstreetmap.org (talvez substituindo + ‘OpenStreetMap’ por este endereço web), para www.opendatacommons.org + e, caso se aplique, para www.creativecommons.org credit_3_html: |- Para um mapa eletrônico navegável, a atribuição deve aparecer no canto do mapa. Por exemplo: @@ -1062,8 +1120,8 @@ pt-BR: title: Exemplo de atribuição more_title_html: Descobrir mais more_1_html: |- - Leia mais sobre o uso de nossos dados e sobre como nos creditar, no Página de licença do OSMF. + Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria na página da licença da OSMF (em inglês). more_2_html: |- Embora o OpenStreetMap seja aberto, não podemos fornecer API de mapa gratuito para terceiros. @@ -1074,24 +1132,23 @@ pt-BR: Nossos contribuidores são milhares de indivíduos. Também incluímos dados, cujas licenças são abertas, de organismos nacionais de cartografia e de outras fontes, dentre elas: - contributors_at_html: "Áustria: Contém dados de \n Stadt - Wien (sob licença\n CC - BY), \nLand - Vorarlberg e \nLand Tirol (sob a licença CC-BY - AT com emendas)." + contributors_at_html: 'Áustria: Contém dados de Stadt + Wien (sob a licença CC + BY), Land + Vorarlberg e Land Tirol (sob a licença CC-BY + AT com emendas).' contributors_ca_html: "Canadá: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada)." - contributors_fi_html: |- - Finlândia: Dados do Continente do National Land Survey da Finland's Topographic Database - e outras bases de dados, em NLSFI Licença. + contributors_fi_html: "Finlândia: Contem dados do \nNational + Land Survey da Finland´s Topographic Database \nassim como de outras bases + de dados, sob a licença NLSFI." contributors_fr_html: |- França: Contém dados da Direction Générale des Impôts. - contributors_nl_html: |- - Holanda: Contém dados © AND, 2007 - (www.and.com) + contributors_nl_html: 'Países Baixos: Contém dados © AND, + 2007 (www.and.com)' contributors_nz_html: "Nova Zelândia: Contém dados do \n Land Information New Zealand. Crown Copyright reserved." contributors_si_html: 'Eslovênia: Possui dados da Autoridade @@ -1105,8 +1162,8 @@ pt-BR: Reino Unido: Contém dados da Ordnance Survey © Direitos da base e autorais da Crown 2010. contributors_footer_1_html: Para mais informações sobre estas e outras fontes - utilizadas para melhorar o OpenStreetMap, consulte a página - de contribuidores (em inglês) no wiki do OpenStreetMap. + utilizadas para melhorar o OpenStreetMap, consulte a página + de contribuidores (em inglês) na wiki do OpenStreetMap. contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia, ou \naceite qualquer responsabilidade." @@ -1115,17 +1172,16 @@ pt-BR: Os contribuidores do OSM são lembrados de nunca adicionar dados de quaisquer fontes com direitos autorais protegidos (ex.: Google Maps ou mapas impressos) sem permissão expressa dos seus detentores. - infringement_2_html: "Se você acredita que material protegido por direitos autorais - foi indevidamente\nincluído na base de dados do OpenStreetMap ou a este site, - por favor, proceda\nao nosso processo - de remoção (em inglês) ou registre uma ocorrência diretamente em nosso - \npágina online de registro de - ocorrências (em inglês)." + infringement_2_html: Se acredita que foi adicionado material protegido por direitos + de autor indevidamente à base de dados do OpenStreetMap, por favor consulte + o procedimento + para retirar dados protegidos (em inglês) ou preencha os dados diretamente + no formulário (em inglês). trademarks_title_html: Marcas registradas - trademarks_1_html: O OpenStreetMap e o logotipo da lupa são marcas registradas - da OpenStreetMap Foundation. Se tiver dúvidas sobre o uso das marcas, envie - suas questões para o Licence - Working Group. + trademarks_1_html: OpenStreetMap, o respetivo logótipo e State of the Map são + marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão sobre + a utilização das marcas, por favor consulte as nossas Normas + sobre Marcas Comerciais. welcome_page: title: Bem-vindo(a)! introduction_html: Bem-vindo(a) ao OpenStreetMap, o mapa livre e editável do mundo. @@ -1154,12 +1210,12 @@ pt-BR: como o nome de um restaurante ou o limite de velocidade de uma rodovia. rules: title: Regras! - paragraph_1_html: O OpenStreetMap tem poucas regras formais mas espera que todos - os participantes contribuam e se comuniquem com a comunidade. Se estiver pensando - em atividades que não sejam editar manualmente, lei a e siga as orientações - em Importações - e Edições - Automáticas. + paragraph_1_html: "O OpenStreetMap tem poucas regras formais mas espera-se que + todos os participantes colaborem e comuniquem com a comunidade. Se pretender + realizar ações em massa como importação de dados através de programas por + favor siga as instruções presentes em \nImportações + and \nEdições + Automatizadas." questions: title: Dúvidas? paragraph_1_html: |- @@ -1189,9 +1245,9 @@ pt-BR: Isto incluirá um marcador ao mapa, que você pode mover arrastando. Adicione a sua mensagem, clique em salvar, e outros utilizadores como você vão investigar. other_concerns: title: Outras preocupações - explanation_html: Se você se preocupa com o modo como os nossos dados estão - sendo usados ou sobre os seus conteúdos, consulte a nossa página - de direitos autorais para mais informações legais, ou contate o grupo + explanation_html: Se 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. help_page: title: Obtendo Ajuda @@ -1203,7 +1259,7 @@ pt-BR: title: Bem-vindo(a) ao OSM description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Pt-br:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide title: Introdução description: Guia para iniciantes mantido pela comunidade. help: @@ -1226,7 +1282,7 @@ pt-BR: description: Ajuda para empresas e organizações migrando para mapas baseados no OpenStreetMap e outros serviços. wiki: - url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page?setlang=pt + url: https://wiki.openstreetmap.org/wiki/Pt:Main_Page title: wiki.openstreetmap.org description: Navegue no wiki para ver a documentação do OSM com mais detalhes. about_page: @@ -1244,11 +1300,11 @@ pt-BR: community_driven_title: Impulsionado pela Comunidade community_driven_html: |- A comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente. - Entre os nossos contribuidores encontram-se mapeadores entusiastas, profissionais das áreas de sistemas geográficos, engenheiros que utilizam os servidores do OpenStreetMap, voluntários a mapear áreas afetadas por grandes desastres, e muitos mais. + Entre os nossos colaboradores encontra-se mapeadores entusiastas, profissionais das áreas de sistemas geográficos, engenheiros que utilizam os servidores do OSM, voluntários a mapear áreas afetadas por grandes desastres, e muitos mais. Para saber mais sobre a nossa comunidade, veja: - Blog do OpenStreetMap, - diários dos editores, - blogs da comunidade, e o site da Fundação OSM. + Blogue do OpenStreetMap, + diários dos utilizadores, + blogues da comunidade, e o sítio da Fundação OSM. open_data_title: Dados Abertos open_data_html: |- O OpenStreetMap é constituído por dados abertos: qualquer @@ -1257,14 +1313,16 @@ pt-BR: Se você alterar os dados ou criar algo com os dados, pode distribuir o produto resultante apenas sob a mesma licença. Consulte a página sobre direitos de autor e licenciamento para mais informações. legal_title: Jurídico - legal_html: "Esta página e vários outros serviços relacionados são formalmente - operados pela OpenStreetMap Foundation - (OSMF) em nome da comunidade. O uso de todos os serviços operados pela OSMF - está sujeito às nossas \nPolíticas - de Uso Aceitável e à nossa Política - de Privacidade\n
    \nPor favor contate - a OSMF se tiver perguntas sobre licenciamento, direitos autorais ou outras - questões e problemas legais." + legal_html: "Este site e outros serviços relacionados são formalmente geridos + pela \nFundação OpenStreetMap (OSMF) + \nem nome da comunidade. A utilização de todos os serviços operados pela OSMF + está sujeita\nàs nossas normas de Utilização + Aceitável e de Privacidade\n
    + \nPor favor contacte a OSMF + \nse tiver questões relacionadas com licenças, direitos de autor, questões legais + ou problemas.\n
    \nO OpenStreetMap, o logótipo da lupa e o State of the Map + são marcas + comerciais registadas da OSMF." partners_title: Parceiros notifier: diary_comment_notification: @@ -1481,14 +1539,15 @@ pt-BR: user_page_link: página de usuário anon_edits: (%{link}) anon_edits_link_text: Descubra se é esse o seu caso. - flash_player_required: Você precisa de um reprodutor de mídia Flash para usar - o Potlatch, o editor Flash do OpenStreetMap. Você pode baixar - o Flash Player da Adobe.com. Também há outras - opções disponíveis para editar o OpenStreetMap. + flash_player_required: Necessita do Flash instalado e ativado para usar o Potlatch, + o editor em Flash do OpenStreetMap. Pode descarregar + o Flash do sítio Adobe.com. Também + estão disponíveis outras opções para editar o OpenStreetMap. potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch, você deve deselecionar a linha ou ponto atual se estiver editando ao vivo, ou clicar em salvar se estiver editando offline. - potlatch2_not_configured: Potlatch 2 não foi configurado - veja http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor veja + https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações potlatch2_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch 2, você deve clicar em Salvar.) id_not_configured: iD não foi configurado @@ -1506,6 +1565,7 @@ pt-BR: where_am_i: Onde estou? where_am_i_title: Descrever a localidade atual usando o motor de busca submit_text: Ir + reverse_directions_text: Sentido contrário key: table: entry: @@ -1580,7 +1640,7 @@ pt-BR: edit: Editar preview: Pré-visualizar markdown_help: - title_html: Interpretado com o Markdown + title_html: Tabela de códigos (Markdown) headings: Títulos heading: Título subheading: Subtítulo @@ -1691,9 +1751,9 @@ pt-BR: public_traces_from: Trilhas de GPS públicas de %{user} description: Consultar últimos carregamentos de trilhas de GPS tagged_with: ' etiquetadas com %{tags}' - empty_html: Nada aqui ainda. Carregue uma nova trilha - ou aprenda mais sobre trilhas de GPS na página - wiki (em inglês). + empty_html: Ainda não enviou nenhum trilho GPS. Envie + um novo trilho GPS ou saiba mais sobre trilhos GPS na página + wiki. delete: scheduled_for_deletion: Trilha marcada para ser apagada make_public: @@ -1903,14 +1963,15 @@ pt-BR:

    Diferente de outros mapas, OpenStreetMap é completamente criado por pessoas como você, e é livre para todos arrumarem, atualizarem, baixarem e usarem.

    Inscreva-se para começar a contribuir. Enviaremos um e-mail para confirmar sua conta.

    - license_agreement: Quando você confirmar sua conta, você precisará concordar - com os Termos - do Contribuidor. + license_agreement: Quando confirmar a sua conta, será necessário aceitar os + termos + de colaboração. email address: 'Endereço de E-mail:' confirm email address: 'Confirme o Endereço de E-mail:' - not displayed publicly: Seu endereço não é exibido publicamente, veja a política de privacidade para mais informações + not displayed publicly: O seu endereço de IP não será visível publicamente. + Consulte a política + de privacidade para mais informação. display name: 'Nome de Exibição:' display name description: Seu nome de usuário disponível publicamente. Você pode mudá-lo depois nas preferências. @@ -2031,25 +2092,26 @@ pt-BR: email never displayed publicly: (nunca exibido publicamente) external auth: 'Autenticação externa:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID?uselang=pt-br + link: https://wiki.openstreetmap.org/wiki/OpenID link text: o que é isto? public editing: heading: 'Edição pública:' enabled: Ativado. Não é anônimo e pode editar dados. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits?setlang=pt + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: o que é isso? disabled: Desativado e não pode editar dados, todas as edições anteriores são anônimas. disabled link text: porque não posso editar? public editing note: heading: Edição pública - text: Atualmente suas edições são anônimas e ninguém pode lhe enviar mensagens - ou saber sua localização. Para mostrar o que você editou e permitir que - pessoas entrem em contato através do website, clique no botão abaixo. Desde - as mudanças na API 0.6, somente usuários públicos podem editar o mapa. - (Veja por quê).
    • O - seu endereço de e-mail não será revelado para o público.
    • Esta ação - não pode ser desfeita e todos os novos usuários são agora públicos por padrão.
    + text: Neste momento as suas edições são anónimas e as outras pessoas não lhe + podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições + e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte. + Desde a migração 0.6 da API, apenas os usuários com edições públicas + podem editar dados do mapa. (mais + informações).
    • Ao tornar as suas edições públicas o seu endereço + de e-mail não será revelado.
    • Esta ação não pode ser revertida e + todos os novos utilizadores têm as edições disponibilizadas publicamente.
    contributor terms: heading: 'Termos do Contribuidor:' agreed: Você aceitou os novos Termos do Contribuidor. @@ -2431,7 +2493,16 @@ pt-BR: continue_without_exit: Continuar em %{name} slight_right_without_exit: Curva suave à direita para %{name} offramp_right_without_exit: Pegue a via de acesso à direita na %{name} + offramp_right_with_directions: Conduza até a rampa do lado direito em direção + a %{directions} + offramp_right_with_name_and_directions: Conduza até a rampa do lado direito + para %{name}, em direção a %{directions} + offramp_right_without_directions: Conduza até a rampa do lado direito onramp_right_without_exit: Vire à direita, na via de acesso, na %{name} + onramp_right_with_directions: Vire à direita na rampa em direção a %{directions} + onramp_right_with_name_and_directions: Vire à direita na rampa para %{name}, + em direção a %{directions} + onramp_right_without_directions: Vire à direita na rampa endofroad_right_without_exit: No fim da estrada, vire à direita na %{name} merge_right_without_exit: Entre à direita na %{name} fork_right_without_exit: Na bifurcação, vire à direita na %{name} @@ -2441,17 +2512,26 @@ pt-BR: sharp_left_without_exit: Curva acentuada à esquerda para %{name} turn_left_without_exit: Vire à esquerda para %{name} offramp_left_without_exit: Pegue a via de acesso à esquerda na %{name} + offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção + a %{directions} + offramp_left_with_name_and_directions: Conduza até a tampa do lado esquerdo + para %{name}, em direção a %{directions} + offramp_left_without_directions: Conduza até a rampa do lado esquerdo onramp_left_without_exit: Vire à esquerda, na via de acesso, na %{name} + onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions} + onramp_left_with_name_and_directions: Vire à esquerda na rampa para %{name}, + em direção a %{directions} + onramp_left_without_directions: Vire à esquerda na rampa endofroad_left_without_exit: No fim da estrada, vire à esquerda na %{name} merge_left_without_exit: Entre à esquerda na %{name} fork_left_without_exit: Na bifurcação, vire à esquerda na %{name} slight_left_without_exit: Esquerda suave para %{name} via_point_without_exit: (ponto de passagem) follow_without_exit: Siga %{name} - roundabout_without_exit: Na rotatória pegue %{name} + roundabout_without_exit: Na rotatória, pegue a saída para %{name} leave_roundabout_without_exit: Saia da rotatória - %{name} stay_roundabout_without_exit: Mantenha-se na rotatória - %{name} - start_without_exit: Comece no final de %{name} + start_without_exit: Comece em %{name} destination_without_exit: Chegue ao destino against_oneway_without_exit: Vá contra o sentido da mão única em %{name} end_oneway_without_exit: Final de mão única em %{name} diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index ffaa24eb8..810ad220a 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -13,6 +13,7 @@ # Author: JasonZe # Author: Jgpacker # Author: Jgrocha +# Author: Jkb8 # Author: Luckas # Author: Macofe # Author: Malafaya @@ -365,8 +366,8 @@ pt-PT: map_image: Imagem (.jpg .pdf .svg .png .ps) apenas mapa padrão embeddable_html: HTML (mostra mapa interativo noutros sites) todos os mapas licence: Licença - export_details: Os dados do OpenStreetMap encontram-se sob a licença - Open Data Commons Open Database License (ODbL). + export_details: Os dados do OpenStreetMap encontram-se sob a licença + Open Data Commons Open Database (ODbL). too_large: advice: 'Se a exportação acima falhar, por favor, considere o uso de uma das fontes listadas abaixo:' @@ -407,14 +408,14 @@ pt-PT: geocoder: search: title: - latlon: Resultados Internos + latlon: Resultados internos uk_postcode: Resultados de NPEMap / FreeThe Postcode - ca_postcode: Resultados de Geocoder.CA - osm_nominatim: Resultados de OpenStreetMap + ca_postcode: Resultados de Geocoder.CA + osm_nominatim: Resultados de OpenStreetMap Nominatim geonames: Resultados de GeoNames - osm_nominatim_reverse: Resultados de OpenStreetMap + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim geonames_reverse: Resultados de GeoNames search_osm_nominatim: @@ -424,12 +425,19 @@ pt-PT: chair_lift: Teleférico drag_lift: Elevador de esqui gondola: Gôndola + platter: Telesqui + pylon: Pilone station: Estação de elevador de esqui + t-bar: Telesqui de barra de metal em T aeroway: aerodrome: Aeródromo + airstrip: Pista de aterragem apron: Plataforma de estacionamento gate: Portão + hangar: Hangar helipad: Heliponto + holding_position: Posição de estabelecimento + parking_position: Posição de estacionamento runway: Pista de Aterragem e Descolagem taxiway: Pista de taxiamento terminal: Terminal @@ -464,37 +472,32 @@ pt-PT: crematorium: Crematório dentist: Dentista doctors: Médicos - dormitory: Dormitório drinking_water: Água Potável driving_school: Escola de Condução embassy: Embaixada - emergency_phone: Telefone de Emergência fast_food: Fast-food ferry_terminal: Terminal de ferry - fire_hydrant: Boca de Incêndio fire_station: Quartel de Bombeiros food_court: Praça de Alimentação fountain: Fonte fuel: Combustível gambling: Jogos de Fortuna e Azar grave_yard: Cemitério - gym: Centro de Fitness / Ginásio - health_centre: Centro de Saúde + grit_bin: Caixa de sal-gema hospital: Hospital hunting_stand: Cabana de Caça ice_cream: Geladaria kindergarten: Jardim de infância library: Biblioteca - market: Mercado marketplace: Feira monastery: Mosteiro motorcycle_parking: Parque de Estacionamento de Motas nightclub: Clube Nocturno - nursery: Creche nursing_home: Lar de Idosos office: Escritório parking: Estacionamento parking_entrance: Entrada de Parque de Estacionamento + parking_space: Espaço para estacionamento pharmacy: Farmácia place_of_worship: Lugar de Oração police: Polícia @@ -504,7 +507,6 @@ pt-PT: prison: Prisão pub: Pub public_building: Edifício Público - reception_area: Área de Receção recycling: Ecoponto restaurant: Restaurante retirement_home: Casa de Retiro @@ -529,6 +531,7 @@ pt-PT: village_hall: Junta de Freguesia waste_basket: Caixote do Lixo waste_disposal: Contentor de Lixo + water_point: Ponto de água youth_centre: Casa da Juventude boundary: administrative: Divisão Administrativa @@ -537,6 +540,7 @@ pt-PT: protected_area: Área Protegida bridge: aqueduct: Aqueduto + boardwalk: Passadiço suspension: Ponte Suspensa swing: Ponte Giratória viaduct: Viaduto @@ -556,25 +560,31 @@ pt-PT: "yes": Loja de Artesanato emergency: ambulance_station: Central de Ambulâncias + assembly_point: Centro de agrupamento defibrillator: Desfibrilador landing_site: Lugar para Aterragem de Emergência phone: Telefone de Emergência + water_tank: Reservatório de água de emergência + "yes": Emergência highway: abandoned: Estrada Abandonada bridleway: Pista de Cavalos bus_guideway: Faixa para Autocarros Guiados bus_stop: Paragem de Autocarro construction: Estrada em Construção + corridor: Corredor cycleway: Ciclovia elevator: Elevador emergency_access_point: Ponto de Ccesso de Emergência footway: Caminho Pedonal ford: Vau + give_way: Sinal de preferência de passagem living_street: Zona de Coexistência milestone: Marco Quilométrico motorway: Autoestrada motorway_junction: Interseção e Saída de Autoestradas motorway_link: Nó de ligação a uma Autoestrada + passing_place: Lugar de passagem path: Trilho pedestrian: Passeio platform: Plataforma @@ -591,6 +601,7 @@ pt-PT: services: Serviços de Autoestrada speed_camera: Radar de Velocidade steps: Escadas + stop: Sinal de Stop street_lamp: Poste de Iluminação tertiary: Estrada Terciária tertiary_link: Nó de ligação a uma Estrada Terciária @@ -599,8 +610,8 @@ pt-PT: trail: Trilho trunk: Via Rápida trunk_link: Nó de ligação a uma Via Rápida + turning_loop: Circuito reverso unclassified: Estrada sem classificação oficial - unsurfaced: Estrada não pavimentada "yes": Estrada historic: archaeological_site: Sítio Arqueológico @@ -619,6 +630,7 @@ pt-PT: manor: Solar memorial: Memorial mine: Mina histórica + mine_shaft: Mina subterrânea monument: Monumento roman_road: Estrada Romana ruins: Ruínas @@ -628,6 +640,7 @@ pt-PT: wayside_cross: Cruzeiro wayside_shrine: Alminhas / Nicho / Capelinha wreck: Destroços + "yes": Sítio histórico junction: "yes": Cruzamento landuse: @@ -665,9 +678,9 @@ pt-PT: leisure: beach_resort: Resort de Praia bird_hide: Observatório de Áves - club: Clube common: Baldio dog_park: Parque para Cães + firepit: Fogueira fishing: Zona de Pesca fitness_centre: Ginásio (fitness) fitness_station: Ginásio @@ -692,15 +705,46 @@ pt-PT: water_park: Parque Aquático "yes": Lazer man_made: + adit: Galeria de acesso + beacon: Baluarte + beehive: Colmeia + breakwater: Quebra-mar + bridge: Ponte + bunker_silo: Búnquer + chimney: Chaminé + crane: Guindaste + dolphin: Posto de amarração + dyke: Represa + embankment: Aterro + flagpole: Mastro + gasometer: Gasómetro + groyne: Estacada + kiln: Estufa lighthouse: Farol + mast: Mastro + mine: Mina + mineshaft: Poços de mina + monitoring_station: Estação de monitorização + petroleum_well: Poço de petróleo + pier: Ponte-cais pipeline: Pipeline + silo: Silo + storage_tank: Reservatório + surveillance: Vigilância tower: Torre + wastewater_plant: Planta de tratamento de água + watermill: Moinho de água + water_tower: Torre de água + water_well: Poço + water_works: Estação de tratamento de água + windmill: Moinho de vento works: Fábrica "yes": Construção military: airfield: Aeródromo Militar barracks: Quartel bunker: Bunker + "yes": Militar mountain_pass: "yes": Passe de Montanha natural: @@ -746,11 +790,14 @@ pt-PT: accountant: Contabilista administrative: Administração architect: Arquiteto + association: Associação company: Empresa + educational_institution: Instituição educativa employment_agency: Agência de Emprego estate_agent: Imobiliária government: Edifício Governamental insurance: Agência de Seguros + it: Escritórios de informática lawyer: Advogado ngo: Escritório de ONG telecommunication: Escritório de Telecomunicações @@ -758,9 +805,8 @@ pt-PT: "yes": Escritório place: allotments: Horta Urbana / Comunitária - block: Bloco - airport: Aeroporto city: Capital de distrito + city_block: Quarteirão country: País county: Condado farm: Quinta @@ -771,12 +817,13 @@ pt-PT: islet: Ilheu isolated_dwelling: Casa Isolada locality: Localidade desabitada - moor: Carriço municipality: Município neighbourhood: Lugar postcode: Código Postal + quarter: Quarto region: Região sea: Mar + square: Bairro state: Estado subdivision: Subdivisão suburb: Subúrbio @@ -788,10 +835,8 @@ pt-PT: abandoned: Ferrovia Abandonada construction: Ferrovia sob Construção disused: Ferrovia Não Usada - disused_station: Estação Ferroviária Não Usada funicular: Funicular halt: Apeadeiro - historic_station: Estação Ferroviária Histórica junction: Entroncamento Ferroviário level_crossing: Passagem de Nível light_rail: Veículo leve sobre trilhos @@ -817,6 +862,7 @@ pt-PT: beauty: Loja de Produtos de Beleza beverages: Loja de Bebidas bicycle: Loja de Bicicletas + bookmaker: Casa de apostas books: Livraria boutique: Boutique butcher: Talho @@ -855,12 +901,16 @@ pt-PT: hairdresser: Cabeleireiro(a) hardware: Loja de Ferragens hifi: Hi-Fi - insurance: Seguros + houseware: Lojas de artigos para casa + interior_decoration: Decoração de interiores jewelry: Joalharia kiosk: Quiosque + kitchen: Loja de construção de cozinha laundry: Lavandaria + lottery: Lotaria mall: Centro Comercial market: Mercado + massage: Massagem mobile_phone: Loja de Telemóveis motorcycle: Loja de Motas music: Loja de instrumentos musicais @@ -868,21 +918,27 @@ pt-PT: optician: Oftalmologista organic: Loja de alimentos orgânicos outdoor: Loja de artigos para atividades ao ar livre + paint: Lojas de pintura + pawnbroker: Penhores pet: Loja de animais pharmacy: Farmácia photo: Loja de Fotografia - salon: Salão de beleza + seafood: Frutos do mar second_hand: Loja de segunda mão shoes: Sapataria - shopping_centre: Centro Comercial sports: Loja de Artigos Desportivos stationery: Papelaria supermarket: Supermercado tailor: Alfaiate + ticket: Loja de bilhetes + tobacco: Loja de tabaco toys: Loja de Brinquedos travel_agency: Agência de Viagens + tyres: Loja de pneus + vacant: Lojas vagas + variety_store: Lojas de variedades video: Videoclube - wine: Venda de Bebidas (Off License) + wine: Venda de bebidas "yes": Loja tourism: alpine_hut: Albergue de Montanha @@ -906,6 +962,7 @@ pt-PT: viewpoint: Miradouro zoo: Jardim zoológico tunnel: + building_passage: Passagem do edifício culvert: Conduta "yes": Túnel waterway: @@ -937,7 +994,7 @@ pt-PT: level10: Lugar description: title: - osm_nominatim: Resultado de OpenStreetMap + osm_nominatim: Resultado de OpenStreetMap Nominatim geonames: Resultado de GeoNames types: @@ -1012,24 +1069,24 @@ pt-PT: title_html: Licença e Direitos de autor intro_1_html: |- O OpenStreetMap® é disponibilizado em dados abertos, sob a licença Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) pela OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">Fundação OpenStreetMap (OSMF). intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os nossos dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado - apenas com a mesma licença. O texto + apenas com a mesma licença. O texto legal completo explica os seus direitos e responsabilidades. intro_3_html: A cartografia nas nossas telas de mapas (imagens dos mapas) e - a nossa documentação são disponibilizadas sob a licença Creative - Commons Atribuição - CompartilhaIgual 2.0 Genérica (CC BY-SA 2.0). + a nossa documentação são disponibilizadas sob a licença Creative + Commons Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA). credit_title_html: Como creditar o OpenStreetMap credit_1_html: É necessário indicar “© contribuidores do OpenStreetMap” ou caso seja mais adequado em inglês “© OpenStreetMap contributors”. credit_2_html: Também tem de indicar claramente que os dados estão disponíveis sob a Open Database License (ODbL), e caso utilize as telas de mapas (imagens dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA. Pode - fazer isto colocando uma hiperligação para esta + fazer isto colocando uma hiperligação para esta página sobre licença e direitos de autor. Como alternativa, e obrigatório caso distribua o OpenStreetMap em formato de dados, pode indicar as licenças e colocar hiperligações a apontar para as páginas das licenças. Em suportes @@ -1046,7 +1103,7 @@ pt-PT: more_title_html: Saber mais more_1_html: |- Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria na página da licença da OSMF (em inglês). + href="https://osmfoundation.org/Licence">página da licença da OSMF (em inglês). more_2_html: Apesar do OpenStreetMap ser uma plataforma de dados abertos, não podemos fornecer a terceiros uma API de mapas, livre de encargos. Veja a Política de Utilização @@ -1057,10 +1114,10 @@ pt-PT: contributors_intro_html: 'Os contribuidores do OpenStreetMap são milhares. Também são utilizados dados de agências cartográficas nacionais e outras fontes, entre elas:' - contributors_at_html: 'Áustria: Contém dados de Stadt - Wien (sob a licença CC - BY), Land - Vorarlberg e Land Tirol (sob a licença CC-BY + contributors_at_html: 'Áustria: Contém dados de Stadt + Wien (sob a licença CC + BY), Land + Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas).' contributors_ca_html: 'Canadá: Contém dados de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© @@ -1068,11 +1125,11 @@ pt-PT: Canada).' contributors_fi_html: "Finlândia: Contem dados do \nNational Land Survey da Finland´s Topographic Database \nassim como de outras bases - de dados, sob a licença NLSFI." + de dados, sob a licença NLSFI." contributors_fr_html: 'França: Contém dados provenientes da Direction Générale des Impôts.' contributors_nl_html: 'Países Baixos: Contém dados © AND, - 2007 (www.and.com)' + 2007 (www.and.com)' contributors_nz_html: 'Nova Zelândia: Contém dados provenientes de Land Information New Zealand. Crown Copyright reserved.' contributors_si_html: |- @@ -1086,7 +1143,7 @@ pt-PT: contributors_gb_html: 'Reino Unido: Contém dados do Ordnance Survey © Crown copyright and database right 2010-2012.' contributors_footer_1_html: Para mais informações sobre estas e outras fontes - utilizadas para melhorar o OpenStreetMap, consulte a página + utilizadas para melhorar o OpenStreetMap, consulte a página de contribuidores (em inglês) na wiki do OpenStreetMap. contributors_footer_2_html: ' A inclusão de dados no OpenStreetMap não implica que o fornecedor de dados originais apoie o OpenStreetMap, forneça qualquer @@ -1098,14 +1155,14 @@ pt-PT: dos direitos de autor. infringement_2_html: Se acredita que foi adicionado material protegido por direitos de autor indevidamente à base de dados do OpenStreetMap, por favor consulte - o procedimento + o procedimento para retirar dados protegidos (em inglês) ou preencha os dados diretamente no formulário (em inglês). trademarks_title_html: Marcas registadas trademarks_1_html: OpenStreetMap, o respetivo logótipo e State of the Map são - marcas registadas da OpenStreetMap Foundation. Se tiver alguma questão sobre - a utilização das marcas, por favor envie as suas questões para o Grupo - de Trabalho de Licenças. + marcas registadas da Fundação OpenStreetMap. Se tiver alguma questão sobre + a utilização das marcas, por favor consulte as nossas Normas + sobre Marcas Comerciais. welcome_page: title: Bem-vindo ! introduction_html: Bem-vindo ao OpenStreetMap, o mapa livre e editável do mundo. @@ -1137,8 +1194,8 @@ pt-PT: paragraph_1_html: "O OpenStreetMap tem poucas regras formais mas espera-se que todos os participantes colaborem e comuniquem com a comunidade. Se pretender realizar ações em massa como importação de dados através de programas por - favor siga as instruções presentes em \nImportações - and \nEdições + favor siga as instruções presentes em \nImportações + and \nEdições Automatizadas." questions: title: Tens perguntas ? @@ -1169,9 +1226,9 @@ pt-PT: Isto 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. other_concerns: title: Outras preocupações - 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 + explanation_html: Se 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. help_page: title: Obter Ajuda @@ -1183,7 +1240,7 @@ pt-PT: title: Bem vindo ao OpenStreetMap description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Pt:Beginners%27_guide title: Guia de Iniciantes description: Guia para iniciantes criado pela comunidade. help: @@ -1207,7 +1264,7 @@ pt-PT: description: Informações para empresas e organizações que queiram mudar para os mapas do OpenStreetMap e outros serviços. wiki: - url: http://wiki.openstreetmap.org/wiki/Pt:Main_Page + url: https://wiki.openstreetmap.org/wiki/Pt:Main_Page title: wiki.openstreetmap.org description: Navegue na wiki de documentação sobre o OpenStreetMap. about_page: @@ -1229,7 +1286,7 @@ pt-PT: Para saber mais sobre a nossa comunidade, veja: Blogue do OpenStreetMap, diários dos utilizadores, - blogues da comunidade, e o sítio da Fundação OSM. + blogues da comunidade, e o sítio da Fundação OSM. open_data_title: Dados Abertos open_data_html: |- O OpenStreetMap é constituído por dados abertos: qualquer @@ -1238,14 +1295,16 @@ pt-PT: Se você alterar os dados ou criar algo com os dados, pode distribuir o produto resultante apenas sob a mesma licença. Consulte a página sobre direitos de autor e licenciamento para mais informações. legal_title: Termos legais - legal_html: "Este site e outros serviços relacionados são formalmente geridos - pela \nOpenStreetMap Foundation (OSMF) + legal_html: "Este sítio e outros serviços relacionados são formalmente geridos + pela \nFundação OpenStreetMap (OSMF) \nem nome da comunidade. A utilização de todos os serviços operados pela OSMF - está sujeita às nossas normas de Utilização - Aceitável e de Privacidade\n
    - \nPor favor contacte a OSMF \nse - tiver questões relacionadas com licenças, direitos de autor, questões legais - ou problemas." + está sujeita\nàs nossas normas de Utilização + Aceitável e de Privacidade\n
    + \nPor favor contacte a OSMF + \nse tiver questões relacionadas com licenças, direitos de autor, questões legais + ou problemas.\n
    \nO OpenStreetMap, o logótipo da lupa e o State of the Map + são marcas + comerciais registadas da OSMF." partners_title: Parceiros notifier: diary_comment_notification: @@ -1459,14 +1518,14 @@ pt-PT: user_page_link: página de utilizador anon_edits_link_text: Descubra a que se deve isto. flash_player_required: Necessita do Flash instalado e ativado para usar o Potlatch, - o editor em Flash do OpenStreetMap. Pode descarregar - o Flash do site Adobe.com. Também + o editor em Flash do OpenStreetMap. Pode descarregar + o Flash do sítio Adobe.com. Também estão disponíveis outras opções para editar o OpenStreetMap. potlatch_unsaved_changes: Tem alterações por gravar (Para gravar no Potlatch, deve desselecionar o ponto ou linha atual, se estiver a editar no modo direto, ou clicar no botão gravar se este estiver disponível.) potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor veja - http://wiki.openstreetmap.org/wiki/The_Rails_Port + https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações potlatch2_unsaved_changes: Tem alterações que não foram gravadas. (Para gravar no Potlatch 2, deve clicar no botão Gravar.) id_not_configured: O editor iD não foi configurado @@ -1484,6 +1543,7 @@ pt-PT: where_am_i: Onde se encontra? where_am_i_title: Pesquisa a localização atual do mapa submit_text: Ir + reverse_directions_text: Sentido contrário key: table: entry: @@ -1558,7 +1618,7 @@ pt-PT: edit: Editar preview: Mostrar previsão markdown_help: - title_html: Tabela de códigos (Markdown) + title_html: Tabela de códigos (Markdown) headings: Cabeçalhos heading: Cabeçalho subheading: Sub-secção @@ -1671,7 +1731,7 @@ pt-PT: description: Ver trilhos GPS enviados recentemente tagged_with: ' etiquetado com %{tags}' empty_html: Ainda não enviou nenhum trilho GPS. Envie - um novo trilho GPS ou saiba mais sobre trilhos GPS na página + um novo trilho GPS ou saiba mais sobre trilhos GPS na página wiki. delete: scheduled_for_deletion: Trilho programado para eliminação @@ -1881,12 +1941,12 @@ pt-PT:

    Ao contrário de outros mapas, o OpenStreetMap é completamente criado por pessoas como você, e é disponibilizado gratuitamente para que qualquer pessoa possa corrigir, atualizar, descarregar e utilizar.

    Crie uma conta de utilizador para começar a colaborar. Enviaremos um email para confirmar a sua conta.

    license_agreement: Quando confirmar a sua conta, será necessário aceitar os - Termos - de Colaboração. + termos + de colaboração. email address: 'E-mail:' confirm email address: 'Confirmar E-mail:' not displayed publicly: O seu endereço de IP não será visível publicamente. - Consulte a política de privacidade para mais informação. display name: 'Nome de utilizador:' @@ -2009,12 +2069,12 @@ pt-PT: email never displayed publicly: (nunca é mostrado publicamente) external auth: 'Início de sessão externo:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: o que é isto? public editing: heading: 'Edição pública:' enabled: Ativado. Não anónimo e pode editar. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: o que é isto? disabled: Desativado e não pode editar. Todas as edições anteriores são anónimas. disabled link text: porque não posso editar? @@ -2023,11 +2083,12 @@ pt-PT: text: Neste momento as suas edições são anónimas e as outras pessoas não lhe podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte. - Desde a migração 0.6 da API, apenas utilizadores com edições públicas - podem editar dados do mapa. (mais + Desde a migração 0.6 da API, apenas os utilizadores com edições públicas + podem editar dados do mapa. (mais informações).
    • Ao tornar as suas edições públicas o seu endereço - de email não será revelado.
    • Esta ação não pode ser revertida e todos - os novos utilizadores têm as edições disponibilizadas publicamente.
    + de correio eletrónico não será revelado.
  • Esta ação não pode ser + revertida e todos os novos utilizadores têm as edições disponibilizadas + publicamente.
contributor terms: heading: 'Termos de Colaborador:' agreed: Aceitou os novos Termos de Colaborador. @@ -2418,7 +2479,16 @@ pt-PT: continue_without_exit: Continuar em %{name} slight_right_without_exit: Virar ligeiramente à direita para %{name} offramp_right_without_exit: Seguir a via de acesso à direita para %{name} + offramp_right_with_directions: Conduza até a rampa do lado direito em direção + a %{directions} + offramp_right_with_name_and_directions: Conduza até a rampa do lado direito + para %{name}, em direção a %{directions} + offramp_right_without_directions: Conduza até a rampa do lado direito onramp_right_without_exit: Virar à direita na via de acesso para %{name} + onramp_right_with_directions: Vire à direita na rampa em direção a %{directions} + onramp_right_with_name_and_directions: Vire à direita na rampa para %{name}, + em direção a %{directions} + onramp_right_without_directions: Vire à direita na rampa endofroad_right_without_exit: No fim da estrada, virar à direita para %{name} merge_right_without_exit: Encostar à via da direita para %{name} fork_right_without_exit: Na bifurcação virar à direita para %{name} @@ -2428,7 +2498,16 @@ pt-PT: sharp_left_without_exit: Curva acentuada à esquerda para %{name} turn_left_without_exit: Virar à esquerda para %{name} offramp_left_without_exit: Seguir a via de acesso à esquerda para %{name} + offramp_left_with_directions: Conduza até a rampa do lado esquerdo em direção + a %{directions} + offramp_left_with_name_and_directions: Conduza até a tampa do lado esquerdo + para %{name}, em direção a %{directions} + offramp_left_without_directions: Conduza até a rampa do lado esquerdo onramp_left_without_exit: Virar à esquerda na via de acesso para %{name} + onramp_left_with_directions: Vire à esquerda na rampa em direção a %{directions} + onramp_left_with_name_and_directions: Vire à esquerda na rampa para %{name}, + em direção a %{directions} + onramp_left_without_directions: Vire à esquerda na rampa endofroad_left_without_exit: No fim da estrada virar à esquerda para %{name} merge_left_without_exit: Encostar à via da esquerda para %{name} fork_left_without_exit: Na bifurcação virar à esquerda para %{name} diff --git a/config/locales/ro.yml b/config/locales/ro.yml index b0ccdde0f..1d26d55a2 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -417,31 +417,24 @@ ro: crematorium: Crematoriu dentist: Dentist doctors: Medici - dormitory: Cămin drinking_water: Cișmea driving_school: Școală de șoferi embassy: Ambasadă - emergency_phone: Telefon de urgență fast_food: Fast-food ferry_terminal: Terminal pentru feriboturi - fire_hydrant: Hidrant fire_station: Stație de pompieri fountain: Fântână fuel: Benzinărie grave_yard: Cimitir - gym: Sală de fitness / gimnastică - health_centre: Centru de sănătate hospital: Spital hunting_stand: Stand de vânătoare ice_cream: Înghețată kindergarten: Grădiniță library: Bibliotecă - market: Piață marketplace: Piață de mărfuri monastery: Mănăstire motorcycle_parking: Parcare pentru motociclete nightclub: Club de noapte - nursery: Creșă nursing_home: Azil de bătrâni office: Birou parking: Parcare @@ -455,7 +448,6 @@ ro: prison: Închisoare pub: Pub public_building: Clădire publică - reception_area: Zonă de recepție recycling: Punct de reciclare restaurant: Restaurant retirement_home: Casă de bătrâni @@ -540,7 +532,6 @@ ro: traffic_signals: Semafor trail: Potecă unclassified: Drum neclasificat - unsurfaced: Drum neasfaltat "yes": Drum historic: archaeological_site: Sit arheologic @@ -592,7 +583,6 @@ ro: vineyard: Podgorie leisure: beach_resort: Stațiune balneară - club: Club fishing: Zonă de pescuit garden: Grădină golf_course: Teren de golf @@ -658,7 +648,6 @@ ro: travel_agent: Agenție de turism "yes": Birou place: - airport: Aeroport city: Oraș country: Țară county: Județ @@ -669,7 +658,6 @@ ro: island: Insulă islet: Insuliță locality: Localitate - moor: Baltă municipality: Comună neighbourhood: Cartier postcode: Cod poștal @@ -686,10 +674,8 @@ ro: abandoned: Cale ferată abandonată construction: Cale ferată în construcție disused: Cale ferată dezafectată - disused_station: Gară dezafectată funicular: Funicular halt: Gară - historic_station: Gară istorică junction: Nod feroviar level_crossing: Trecere la nivel light_rail: Metrou @@ -728,7 +714,6 @@ ro: grocery: Magazin alimentar hairdresser: Coafor hifi: Hi-Fi - insurance: Asigurare jewelry: Bijuterie kiosk: Chioșc laundry: Spălătorie @@ -740,8 +725,6 @@ ro: organic: Magazin de alimente organice pet: Magazin de animale pharmacy: Farmacie - salon: Salon de frumusețe - shopping_centre: Centru comercial stationery: Magazin de papetărie supermarket: Supermarket toys: Magazin de jucării diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 89f37d930..361cbcf4c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -6,6 +6,7 @@ # Author: AZISS # Author: Aideih # Author: Aleksandr Dezhin +# Author: Alexander Istomin # Author: Alexey zakharenkov # Author: Amire80 # Author: Andrewsh @@ -40,12 +41,14 @@ # Author: MaxSem # Author: Mechano # Author: Mixaill +# Author: Movses # Author: Nemo bis # Author: Nitch # Author: Nzeemin # Author: Okras # Author: Perevod16 # Author: Putnik +# Author: Redredsonia # Author: Riliam # Author: Ruila # Author: Sanail @@ -193,8 +196,8 @@ ru: title_comment: Пакет правок %{id} — %{comment} join_discussion: Войдите в систему, чтобы присоединиться к обсуждению discussion: Обсуждение - still_open: Пакет правок ещё открыт - обсуждение будет доступно, как только - пакет правок будет закрыт. + still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет + правок будет закрыт. node: title: 'Точка: %{name}' history_title: 'История точки: %{name}' @@ -407,7 +410,7 @@ ru: map_image: Изображение карты (показывает стандартный слой) embeddable_html: Встраиваемый HTML licence: Лицензия - export_details: Данные OpenStreetMap распространяются по лицензии + export_details: Данные OpenStreetMap распространяются по лицензии Open Data Commons Open Database License (ODbL). too_large: advice: 'Если этот экспорт пройдёт неудачно, пожалуйста, попробуйте один из @@ -451,10 +454,10 @@ ru: uk_postcode: Результаты от NPEMap / FreeThe Postcode ca_postcode: Результаты от Geocoder.CA - osm_nominatim: Результаты от OpenStreetMap + osm_nominatim: Результаты от OpenStreetMap Nominatim geonames: Результаты от GeoNames - osm_nominatim_reverse: Результаты от OpenStreetMap + osm_nominatim_reverse: Результаты от OpenStreetMap Nominatim geonames_reverse: Результаты от GeoNames search_osm_nominatim: @@ -464,12 +467,19 @@ ru: chair_lift: Кресельный канатный подъёмник drag_lift: Якорный (бугельный) подъёмник gondola: Канатная дорога + platter: Бугельный подъёмник + pylon: Опора линии электропередач station: Станция канатного подъёмника + t-bar: Т-образные подъёмники-буксиры aeroway: aerodrome: Аэродром + airstrip: Взлётно-посадочная полоса apron: Перрон gate: Выход на посадку + hangar: Ангар helipad: Вертолётная площадка + holding_position: Место ожидания + parking_position: Позиция парковки runway: Взлётно-посадочная полоса taxiway: Рулёжная дорожка terminal: Терминал @@ -504,37 +514,32 @@ ru: crematorium: Крематорий dentist: Стоматология doctors: Врач - dormitory: Общежитие drinking_water: Питьевая вода driving_school: Автошкола embassy: Посольство - emergency_phone: Телефон экстренных служб fast_food: Фаст-фуд ferry_terminal: Паромная станция - fire_hydrant: Пожарный гидрант fire_station: Пожарная станция food_court: Ресторанный дворик fountain: Фонтан fuel: Заправка gambling: Игорный дом grave_yard: Место захоронения - gym: Фитнес-центр / Тренажёрный зал - health_centre: Оздоровительный центр + grit_bin: Контейнер с дорожной посыпкой hospital: Госпиталь hunting_stand: Охотничья вышка ice_cream: Мороженое kindergarten: Детский сад library: Библиотека - market: Рынок marketplace: Рынок monastery: Монастырь motorcycle_parking: Парковка для мотоциклов nightclub: Ночной клуб - nursery: Пансионат nursing_home: Дом престарелых office: Офис parking: Стоянка parking_entrance: Въезд на стоянку + parking_space: Парковка pharmacy: Аптека place_of_worship: Место поклонения police: Полиция @@ -544,7 +549,6 @@ ru: prison: Тюрьма pub: Паб public_building: Общественное здание - reception_area: Приёмная recycling: Место утилизации restaurant: Ресторан retirement_home: Дом престарелых @@ -569,6 +573,7 @@ ru: village_hall: Усадьба waste_basket: Урна waste_disposal: Мусорный бак + water_point: Набор воды youth_centre: Молодёжный центр boundary: administrative: Административная граница @@ -577,6 +582,7 @@ ru: protected_area: Охраняемая территория bridge: aqueduct: Акведук + boardwalk: Тротуар suspension: Подвесной мост swing: Поворотный мост viaduct: Виадук @@ -596,25 +602,31 @@ ru: "yes": Мастерская emergency: ambulance_station: Станция скорой медицинской помощи + assembly_point: Место сбора defibrillator: Дефибриллятор landing_site: Место аварийной посадки phone: Телефон экстренной связи + water_tank: Резервуары воды для пожаротушения + "yes": Для экстренных служб highway: abandoned: Заброшенная дорога bridleway: Дорожка для верховой езды bus_guideway: Автобусная полоса-рельс bus_stop: Автобусная остановка construction: Ремонт/строительство дороги + corridor: Проход через здание cycleway: Велодорожка elevator: Лифт emergency_access_point: Пункт первой помощи footway: Тротуар ford: Брод + give_way: Знак "Уступи дорогу" living_street: Жилая улица milestone: Километровый столб motorway: Автомагистраль motorway_junction: Перекрёсток motorway_link: Развязка на автомагистрали + passing_place: Разъездной путь path: Тропа pedestrian: Пешеходная улица platform: Платформа @@ -631,6 +643,7 @@ ru: services: Придорожный сервис speed_camera: Камера контроля скорости steps: Лестница + stop: Знак остановки street_lamp: Уличный фонарь tertiary: Дорога третьего класса tertiary_link: Дорога третьего класса @@ -639,8 +652,8 @@ ru: trail: Тропа trunk: Трасса trunk_link: Развязка + turning_loop: Дорога для разворота unclassified: Дорога местного значения - unsurfaced: Грунтовая дорога "yes": Дорога historic: archaeological_site: Раскопки @@ -659,6 +672,7 @@ ru: manor: Поместье memorial: Памятник mine: Рудник + mine_shaft: Шахтный ствол monument: Монумент roman_road: Римская дорога ruins: Развалины @@ -668,6 +682,7 @@ ru: wayside_cross: Придорожный крест wayside_shrine: Придорожная святыня wreck: Остов судна + "yes": Памятное место junction: "yes": Перекрёсток landuse: @@ -705,9 +720,9 @@ ru: leisure: beach_resort: Пляж с насаждениями bird_hide: Засидка (пункт скрытого наблюдения за птицами) - club: Клуб common: Альменда dog_park: Площадка для собак + firepit: Место для костра fishing: Рыбалка fitness_centre: Фитнес-центр fitness_station: Фитнес-станция @@ -732,15 +747,46 @@ ru: water_park: Аквапарк "yes": Досуг man_made: + adit: Галерея + beacon: Маяк + beehive: Улей + breakwater: Волнорез + bridge: Мост + bunker_silo: Бункер + chimney: Дымоход + crane: Кран + dolphin: Причальная тумба + dyke: Канава + embankment: Дамба + flagpole: Флагшток + gasometer: Газгольдер + groyne: Волнорез + kiln: Печь lighthouse: Маяк + mast: Мачта + mine: Рудник + mineshaft: Шахтный ствол + monitoring_station: Станция мониторинга + petroleum_well: Скважина + pier: Пирс pipeline: Трубопровод + silo: Силос + storage_tank: Крытый резервуар + surveillance: Наблюдение tower: Башня + wastewater_plant: Станция очистки сточных вод + watermill: Водяная мельница + water_tower: Водонапорная башня + water_well: Колодец + water_works: Водозабор + windmill: Ветроэнергетическая установка works: Фабрика "yes": Искусственный military: airfield: Военный аэродром barracks: Казармы bunker: Бункер + "yes": Военный mountain_pass: "yes": Перевал natural: @@ -786,11 +832,14 @@ ru: accountant: Бухгалтер administrative: Администрация architect: Архитектор + association: Ассоциация company: Компания + educational_institution: Учебное заведение employment_agency: Агентство занятости estate_agent: Агенство недвижимости government: Государственное учреждение insurance: Страховое бюро + it: IT-офис lawyer: Юрист ngo: Офис некоммерческой организации telecommunication: Офис телекоммуникационной компании @@ -798,9 +847,8 @@ ru: "yes": Офисы place: allotments: Садоводство - block: Квартал - airport: Аэропорт city: Город + city_block: Городской квартал country: Страна county: Уезд farm: Ферма @@ -811,12 +859,13 @@ ru: islet: Маленький остров isolated_dwelling: Отдельный дом-ферма locality: Заброшенная деревня, урочище, необитаемая местность - moor: Вересковая пустошь municipality: Муниципалитет neighbourhood: Соседство postcode: Почтовый индекс + quarter: Район города region: Регион sea: Море + square: Площадь state: Область/Штат subdivision: Подразделение suburb: Пригород @@ -828,10 +877,8 @@ ru: abandoned: Разобранные железнодорожные пути construction: Ремонт железнодорожных путей disused: Заброшенная железнодорожная ветка - disused_station: Заброшеная железнодорожная станция funicular: Фуникулёр halt: Железнодорожная станция - historic_station: Историческая железнодорожная станция junction: Железнодорожная стрелка level_crossing: Железнодорожный переезд light_rail: Легкорельсовый транспорт @@ -857,6 +904,7 @@ ru: beauty: Салон красоты beverages: Магазин напитков bicycle: Веломагазин + bookmaker: Букмекер books: Книжный магазин boutique: Бутик butcher: Мясная лавка @@ -895,12 +943,16 @@ ru: hairdresser: Парикмахерская hardware: Хозяйственный магазин hifi: Магазин аудио/видео аппаратуры - insurance: Страховая компания + houseware: Магазин посуды + interior_decoration: Оформление интерьера jewelry: Ювелирный магазин kiosk: Киоск + kitchen: Магазин кухонь laundry: Прачечная + lottery: Лотерея mall: Молл market: Рынок + massage: Массаж mobile_phone: Магазин мобильных телефонов motorcycle: Магазин по продаже мотоциклов music: Музыкальный магазин @@ -908,19 +960,25 @@ ru: optician: Оптика organic: Магазин органических продуктов outdoor: Магазин для активного отдыха + paint: Лавка художника + pawnbroker: Ломбард pet: Зоомагазин pharmacy: Аптека photo: Фотомагазин - salon: Салон + seafood: Морепродукты second_hand: Комиссионный магазин shoes: Обувной магазин - shopping_centre: Торговый центр sports: Спортивный магазин stationery: Канцелярские товары supermarket: Супермаркет tailor: Портной + ticket: Касса + tobacco: Табачный магазин toys: Магазин игрушек travel_agency: Туристической агентство + tyres: Магазин шин + vacant: Пустующий магазин + variety_store: Магазин одной цены video: Магазин видеозаписей wine: Винный магазин "yes": Магазин @@ -946,6 +1004,7 @@ ru: viewpoint: Смотровая площадка zoo: Зоопарк tunnel: + building_passage: Проезд через здание culvert: Водопропускная труба, кульверт "yes": Тоннель waterway: @@ -1053,23 +1112,23 @@ ru: title_html: Авторские права и лицензирование intro_1_html: |- OpenStreetMap® содержит свободные данные, распространяемые по лицензии Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) организацией OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF). intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши данные за основу, то вы должны распространять - результат только по такой же лицензии. Полный юридический + результат только по такой же лицензии. Полный юридический текст лицензии разъясняет ваши права и обязанности. intro_3_html: Изготовленные нами изображения карты, также как и наша документация - распространяются по лицензии Creative - Commons Attribution-ShareAlike 2.0 (CC-BY-SA). + распространяются по лицензии Creative + Commons Attribution-ShareAlike 2.0 (CC BY-SA). credit_title_html: Как сослаться на OpenStreetMap credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap». credit_2_html: Вы должны также ясно обозначить, что по лицензии Open Database License распространяется база геоданных, в то время как готовые изображения - карты лицензированы под CC-BY-SA. Вы можете сделать это, разместив ссылку - на эту страницу. Если + карты лицензированы под CC BY-SA. Вы можете сделать это, разместив ссылку + на эту страницу. Если же вы распространяете OSM только в виде базы данных, мы можете размещать гиперссылку напрямую на текст соответствующей лицензии. Если формат медиа делает использование гиперссылок невозможным (как например бумажные карты), мы рассчитываем, что @@ -1084,7 +1143,7 @@ ru: title: Пример указания авторства more_title_html: Узнайте больше more_1_html: Прочитайте больше об использовании наших данных и о том, как указывать - нас, на странице Лицензии + нас, на странице Лицензии OSMF. more_2_html: Хотя данные OpenStreetMap открыты для использования, мы не в состоянии предоставить бесплатный API к нашим картам для сторонних разработчиков. См. @@ -1097,19 +1156,19 @@ ru: Проект также включает данные под свободными лицензиями от национальных картографических агентств и от других источников, среди которых:' contributors_at_html: |- - Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и - Тироля (на условиях CC-BY AT с дополнениями). + Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и + Тироля (на условиях CC BY AT с дополнениями). contributors_ca_html: Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). contributors_fi_html: |- Финляндия: Содержит данные из топографической базы национальной земельной службы Финляндии и других наборов данных, под - лицензией NLSFI. + лицензией NLSFI. contributors_fr_html: 'Франция: Данные от Главного налогового управления.' contributors_nl_html: 'Нидерланды: Contains © AND data, - 2007 (www.and.com)' + 2007 (www.and.com)' contributors_nz_html: Новая Зеландия. Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved. contributors_si_html: 'Словения: содержит данные от Геодезического @@ -1122,7 +1181,7 @@ ru: contributors_gb_html: Великобритания. Данные Ordnance Survey © Crown copyright и права на базы данных 2010-12. contributors_footer_1_html: Более подробную информацию об этих и других источниках, - использованных для наполнения OpenStreetMap, смотрите на странице + использованных для наполнения OpenStreetMap, смотрите на странице Contributors вики-сервера OpenStreetMap. contributors_footer_2_html: Включение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, @@ -1135,15 +1194,15 @@ ru: infringement_2_html: |- Если вы считаете, что защищённый авторским правом материал был неправомерно добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь - к нашей процедуре + к нашей процедуре изымания или непосредственно на нашу вебстраницу регистрации. trademarks_title_html: Товарные знаки trademarks_1_html: OpenStreetMap, логотип с увеличительным стеклом и State of the Map являются зарегистрированными товарными знаками Фонда OpenStreetMap. - Если у вас есть вопросы об использовании этих знаков, пожалуйста, задайте - их рабочей - группе по лицензированию. + Если у вас есть вопросы об использовании этих знаков, пожалуйста, ознакомьтесь + с Политикой + в области товарных знаков. welcome_page: title: Добро пожаловать! introduction_html: Добро пожаловать на OpenStreetMap, открытую и свободную карту @@ -1211,7 +1270,7 @@ ru: explanation_html: |- Если у вас есть вопросы о том, как используются наши данные, или о содержимом сайта, обратитесь к нашей странице авторских прав для получения дополнительной правовой информации или свяжитесь с соответствующий - рабочей группой OSMF. + рабочей группой OSMF. help_page: title: Получение справки introduction: На OpenStreetMap есть несколько ресурсов, где можно узнать о проекте, @@ -1221,7 +1280,7 @@ ru: title: Добро пожаловать на OSM description: Начните с этого краткого руководства, охватывающего основы OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0 + url: https://wiki.openstreetmap.org/wiki/RU:%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE_%D0%BD%D0%BE%D0%B2%D0%B8%D1%87%D0%BA%D0%B0 title: Руководство для начинающих description: Сообщество поддерживает руководство для начинающих. help: @@ -1243,7 +1302,7 @@ ru: description: Помощь компаниям и организациям в переходе на карты и другие ресурсы OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/wiki/RU:Main_Page + url: https://wiki.openstreetmap.org/wiki/RU:Заглавная_страница title: wiki.openstreetmap.org description: Посмотреть вики с подробной документацией по OSM about_page: @@ -1261,7 +1320,7 @@ ru: community_driven_html: |- Сообщество OpenStreetMap — разнообразное, неравнодушное и растущее с каждым днём. Наши участники — это энтузиасты-картографы, ГИС-профессионалы, инженеры, содержащие серверы OSM, люди, отмечающие районы, пострадавшие от бедствий, и многие другие. - Чтобы узнать больше о сообществе, читайте блог OpenStreetMap , дневники участников, блоги сообщества и сайт Фонда OSM. + Чтобы узнать больше о сообществе, читайте блог OpenStreetMap , дневники участников, блоги сообщества и сайт Фонда OSM. open_data_title: Открытые данные open_data_html: 'OpenStreetMap являются открытыми данными: вы можете использовать их для любых целей до тех пор, пока вы указываете авторские права OpenStreetMap @@ -1270,14 +1329,10 @@ ru: Смотрите Авторские права и лицензирование для более подробной информации.' legal_title: Юридические вопросы - legal_html: Этот веб-сайт и многие связанные с ними услуги находятся в ведении - OpenStreetMap Foundation (OSMF), действующего - от имени сообщества OSM. Использование предоставляемых OSMF услуг является предметом - нашей политики конфиденциальностии - «Приемлемой - политики использования».
Пожалуйста, свяжитесь - с OSMF, если есть вопросы относительно лицензирования, авторских прав, либо - другие правовые вопросы или проблемы. + legal_html: |- + Этот веб-сайт и многие связанные с ними услуги находятся в ведении OpenStreetMap Foundation (OSMF), действующего от имени сообщества OSM. Использование предоставляемых OSMF услуг является предметом нашей политики конфиденциальностии «Приемлемой политики использования».
Пожалуйста, свяжитесь с OSMF, если есть вопросы относительно лицензирования, авторских прав, либо другие правовые вопросы. +
+ Логотип OpenStreetMap в виде увеличительного стекла и логотип State of the Map — зарегистрированные товарные знаки организации OSMF. partners_title: Партнёры notifier: diary_comment_notification: @@ -1506,7 +1561,8 @@ ru: potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.) - potlatch2_not_configured: Potlatch 2 не был настроен — подробнее см. http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: Potlatch 2 не был настроен — пожалуйста, обратитесь + к https://wiki.openstreetmap.org/wiki/The_Rails_Port за дополнительной информацией potlatch2_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch 2 следует нажать «Сохранить».) id_not_configured: iD не был настроен @@ -1525,6 +1581,7 @@ ru: where_am_i_title: Опишите ваше местоположение, воспользовавшись инструментом поиска submit_text: Найти + reverse_directions_text: Обратный маршрут key: table: entry: @@ -1599,7 +1656,7 @@ ru: edit: Изменить preview: Предварительный просмотр markdown_help: - title_html: Разобрано с помощью Markdown + title_html: Разобрано с помощью Markdown headings: Заголовки heading: Заголовок subheading: Подзаголовок @@ -1926,12 +1983,12 @@ ru: и они свободны для исправления, обновления, загрузки и использования каждым.

Зарегистрируйтесь, чтобы сделать свой вклад. Мы отправим вам письмо, чтобы подтвердить ваш аккаунт.

license_agreement: Для подтверждения своей учётной записи вам необходимо согласиться - с условиями + с условиями сотрудничества. email address: 'Адрес эл. почты:' confirm email address: 'Подтвердите адрес эл. почты:' not displayed publicly: Ваш адрес не будет отображаться публично, смотрите нашу - политику конфиденциальности для получения дополнительной информации display name: 'Отображаемое имя:' @@ -2059,7 +2116,7 @@ ru: public editing: heading: 'Публичная правка:' enabled: Включено. Можно редактировать. Правки не анонимны. - enabled link: http://wiki.openstreetmap.org/wiki/RU:Anonymous_edits&uselang=ru + enabled link: https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8 enabled link text: что это? disabled: Отключён и не может вносить правки, все предыдущие изменения анонимны. disabled link text: почему я не могу вносить изменения? @@ -2069,7 +2126,7 @@ ru: вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку внизу. После перехода на API версии 0.6, только доступные для связи - пользователи могут править данные карты. (узнайте, + пользователи могут править данные карты. (узнайте, почему).
  • Ваш адрес электронной почты не будет раскрыт для других, но связаться с вами будет возможно.
  • Это действие не имеет обратной силы, а все новые пользователи теперь доступны для связи по умолчанию.
    • @@ -2465,8 +2522,16 @@ ru: instructions: continue_without_exit: Продолжите по %{name} slight_right_without_exit: Плавно поверните направо на %{name} - offramp_right_without_exit: Сверните направо на съезд к %{name} - onramp_right_without_exit: Поверните направо на съезд к %{name} + offramp_right_without_exit: Сверните на правый съезд на %{name} + offramp_right_with_directions: Сверните на правый съезд в направлении %{directions} + offramp_right_with_name_and_directions: Сверните на правый съезд на %{name} + в направлении %{directions} + offramp_right_without_directions: Сверните на правый съезд + onramp_right_without_exit: Сверните на правый въезд на %{name} + onramp_right_with_directions: Сверните на правый въезд в направлении %{directions} + onramp_right_with_name_and_directions: Сверните на правый въезд на %{name} + в направлении %{directions} + onramp_right_without_directions: Сверните на правый въезд endofroad_right_without_exit: В конце дороги поверните направо на %{name} merge_right_without_exit: Перестройтесь правее на %{name} fork_right_without_exit: На развилке поверните направо на %{name} @@ -2475,15 +2540,23 @@ ru: uturn_without_exit: Развернитесь на %{name} sharp_left_without_exit: Резко поверните налево на %{name} turn_left_without_exit: Поверните налево на %{name} - offramp_left_without_exit: Сверните налево на съезд к %{name} - onramp_left_without_exit: Поверните налево на съезд к %{name} + offramp_left_without_exit: Сверните на левый съезд на %{name} + offramp_left_with_directions: Сверните на левый съезд в направлении %{directions} + offramp_left_with_name_and_directions: Сверните на левый съезд на %{name} + в направлении %{directions} + offramp_left_without_directions: Сверните на левый съезд + onramp_left_without_exit: Сверните на левый въезд на %{name} + onramp_left_with_directions: Сверните на левый въезд в направлении %{directions} + onramp_left_with_name_and_directions: Сверните на левый въезд на %{name} в + направлении %{directions} + onramp_left_without_directions: Сверните на левый въезд endofroad_left_without_exit: В конце дороги поверните налево на %{name} merge_left_without_exit: Перестройтесь левее на %{name} fork_left_without_exit: На развилке поверните налево на %{name} slight_left_without_exit: Плавно поверните налево на %{name} via_point_without_exit: (через точку) follow_without_exit: Следуйте %{name} - roundabout_without_exit: На развязке сверните к %{name} + roundabout_without_exit: На круговой развязке сверните на %{name} leave_roundabout_without_exit: Покиньте развязку - %{name} stay_roundabout_without_exit: Оставайтесь на развязке - %{name} start_without_exit: Начните на %{name} @@ -2491,10 +2564,10 @@ ru: against_oneway_without_exit: Идите против одностороннего движения на %{name} end_oneway_without_exit: Конец одностороннего движения на %{name} roundabout_with_exit: На круговой развязке сверните на %{exit}-й съезд к %{name} - turn_left_with_exit: На круговой развязке поверните налево на %{name} - slight_left_with_exit: На круговой развязке плавно поверните налево на %{name} - turn_right_with_exit: На круговой развязке поверните направо на %{name} - slight_right_with_exit: На круговой развязке плавно поверните направо на %{name} + turn_left_with_exit: На круговой развязке сверните налево на %{name} + slight_left_with_exit: На круговой развязке плавно сверните налево на %{name} + turn_right_with_exit: На круговой развязке сверните направо на %{name} + slight_right_with_exit: На круговой развязке плавно сверните направо на %{name} continue_with_exit: На круговой развязке продолжайте движение прямо на %{name} unnamed: дорога courtesy: Маршрут предоставлен %{link} diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 60573e3fc..61dee2f1c 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -438,33 +438,26 @@ scn: crematorium: Crimatoriu dentist: Dintista doctors: Dutturi - dormitory: Durmitoriu drinking_water: Acqua pi vìviri driving_school: Scola guida embassy: Ammasciata - emergency_phone: Telèfunu d'emirgenza fast_food: Fast Food ferry_terminal: Attraccu dû traghettu - fire_hydrant: Idranti fire_station: Pumperi food_court: Zona di risturazzioni fountain: Funtana fuel: Pompa dâ binzina gambling: Scummissi grave_yard: Cimiteru - gym: Palestra - health_centre: Casa di cura hospital: Spitali hunting_stand: Barracca dî cacciatura ice_cream: Gilatarìa kindergarten: Asilu library: Libbrarìa - market: Mircatu marketplace: Mircatu monastery: Munasteru motorcycle_parking: Pusteggiu dî muturi nightclub: Night Club - nursery: Asilu nursing_home: Casa di riposu office: Uffizziu parking: Pusteggiu @@ -478,7 +471,6 @@ scn: prison: Càrciri pub: Pub public_building: Edificiu pùbblicu - reception_area: Accittazzioni recycling: Ìsula eculòggica restaurant: Risturanti retirement_home: Casa di riposu @@ -574,7 +566,6 @@ scn: trunk: Supirstrata trunk_link: Supirstrata unclassified: Strata senza classificazzioni - unsurfaced: Strata stirrata "yes": Strata historic: archaeological_site: Zona archiulòggica @@ -639,7 +630,6 @@ scn: leisure: beach_resort: Lidu bird_hide: Ossirvatoriu pi l'auceddi - club: Cìrculu common: Cumuni dog_park: Parcu dî cani fishing: Riserva di pisca @@ -732,8 +722,6 @@ scn: "yes": Uffizziu place: allotments: Tirritoriu agrìculu o ricriativu - block: Isulatu - airport: Ariuportu city: Cità country: Paisi county: Cuntea @@ -745,7 +733,6 @@ scn: islet: Isuletta isolated_dwelling: Casi isulati locality: Cuntrata - moor: Molu municipality: Cumuni neighbourhood: Quarteri postcode: CAP @@ -762,10 +749,8 @@ scn: abandoned: Ferruvìa abbannunata construction: Ferruvìa n custruzzioni disused: Ferruvìa n disusu - disused_station: Stazzioni dû trenu abbannunata funicular: Funiculari halt: Firmata dû trenu - historic_station: Stazzioni dû trenu stòrica junction: Biviu ferruviariu level_crossing: Passaggiu a liveddu light_rail: Mitrupulitana leggia @@ -829,7 +814,6 @@ scn: hairdresser: Piluccheri hardware: Firramenta hifi: Hi-Fi - insurance: Assicurazzioni jewelry: Giujillirìa kiosk: Cioscu laundry: Lavannarìa @@ -845,10 +829,8 @@ scn: pet: Nigozziu di l'armali pharmacy: Farmacìa photo: Artìculi di futugrafìa - salon: Saluni di biddizza second_hand: Artìculi di secunna manu shoes: Scarparu - shopping_centre: Centru cummirciali sports: Artìculi spurtivi stationery: Cartaru supermarket: Supirmircatu diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 3fe4afd0e..809ae9003 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -414,30 +414,23 @@ sco: crematorium: Crematorium dentist: Dentist doctors: Doctors - dormitory: Dormitory drinking_water: Drinkin Watter driving_school: Drivin Schuil embassy: Embassy - emergency_phone: Emergency Phone fast_food: Fast Fuid ferry_terminal: Ferry Terminal - fire_hydrant: Fire Hydrant fire_station: Fire Station food_court: Fuid Coort fountain: Foontain fuel: Fuel grave_yard: Grave Yard - gym: Fitness Centre / Gym - health_centre: Heal Centre hospital: Hospital hunting_stand: Huntin Staund ice_cream: Ice Cream kindergarten: Kindergarten library: Library - market: Mercat marketplace: Mercatplace nightclub: Nicht Club - nursery: Nursery nursing_home: Nursin Home office: Office parking: Pairkin @@ -450,7 +443,6 @@ sco: prison: Prison pub: Pub public_building: Public Biggin - reception_area: Reception Aurie recycling: Recyclin Pynt restaurant: Restaurant retirement_home: Retirement Home @@ -531,7 +523,6 @@ sco: trunk: Trunk Road trunk_link: Trunk Road unclassified: Unclassified Road - unsurfaced: Unsurfaced Road historic: archaeological_site: Airchaeological Steid battlefield: Battlefield @@ -676,7 +667,6 @@ sco: travel_agent: Travel Agency "yes": Office place: - airport: Airport city: Ceety country: Kintra county: Coonty @@ -688,7 +678,6 @@ sco: islet: Islet isolated_dwelling: Isolatit Dwellin locality: Locality - moor: Muir municipality: Municipality neighbourhood: Neighbourhuid postcode: Postcode @@ -704,10 +693,8 @@ sco: abandoned: Abandoned Railway construction: Railway unner Construction disused: Disuised Railway - disused_station: Disuised Railway Station funicular: Funicular Railway halt: Train Stap - historic_station: Historic Railway Station junction: Railway Junction level_crossing: Level Crossin light_rail: Licht Rail @@ -771,7 +758,6 @@ sco: hairdresser: Hairdresser hardware: Hairdware Store hifi: Hi-Fi - insurance: Insurance jewelry: Jewelry Shop kiosk: Kiosk Shop laundry: Laundry @@ -787,10 +773,8 @@ sco: pet: Pet Shop pharmacy: Pharmacy photo: Photo Shop - salon: Salon second_hand: Seicont-haund Shop shoes: Shoe Shop - shopping_centre: Shoppin Centre sports: Sports Shop stationery: Stationery Shop supermarket: Supermercat diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 6c519622b..c1846ab00 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -425,31 +425,24 @@ sk: crematorium: Krematórium dentist: Zubár doctors: Lekár - dormitory: Å tudentský domov drinking_water: Pitná voda driving_school: AutoÅ¡kola embassy: Veľvyslanectvo - emergency_phone: Núdzový telefón fast_food: Rýchle občerstvenie ferry_terminal: Terminál trajektu - fire_hydrant: Požiarny hydrant fire_station: Požiarna stanica food_court: Food court fountain: Fontána fuel: Benzínová pumpa grave_yard: Cintorín - gym: Fitnes centrum / telocvičňa - health_centre: Zdravotné stredisko hospital: Nemocnica hunting_stand: Poľovnícky posed ice_cream: Zmrzlina kindergarten: Materská Å¡kola library: Knižnica - market: Obchod marketplace: Tržnica monastery: Kláštor nightclub: Nočný klub - nursery: Jasle nursing_home: Sanatórium office: Úrad parking: Parkovisko @@ -462,7 +455,6 @@ sk: prison: Väzenie pub: Krčma public_building: Verejná budova - reception_area: Recepcia recycling: Recyklačné miesto restaurant: ReÅ¡taurácia retirement_home: Domov dôchodcov @@ -553,7 +545,6 @@ sk: trunk: Cesta pre motorové vozidlá trunk_link: Privádzač k ceste pre motorové vozidlá unclassified: Neklasifikovaná cesta - unsurfaced: Nespevnená cesta "yes": Cesta historic: archaeological_site: Archeologické nálezisko @@ -614,7 +605,6 @@ sk: leisure: beach_resort: Plážové letovisko bird_hide: Vtáčia pozorovateľňa - club: Klub common: Verejné priestranstvo dog_park: Psí park fishing: Rybolov (Å¡portový) @@ -703,7 +693,6 @@ sk: travel_agent: Cestovná kancelária "yes": Úrad place: - airport: Letisko city: Mesto nad 100 tis. country: Å tát county: Okres @@ -715,7 +704,6 @@ sk: islet: Ostrovček isolated_dwelling: Samota locality: OblasÅ¥ - moor: Močiar municipality: Obecný úrad neighbourhood: Å tvrÅ¥ postcode: PSČ @@ -731,10 +719,8 @@ sk: abandoned: ZruÅ¡ená železničná traÅ¥ construction: Železnica vo výstavbe disused: Nepoužívaná železnica - disused_station: Nepoužívaná železničná stanica funicular: Lanová dráha halt: Zastávka vlaku - historic_station: Zastávka historickej železnice junction: Železničný uzol level_crossing: Železničný prejazd light_rail: Ľahká železnica @@ -798,7 +784,6 @@ sk: hairdresser: Kaderníctvo,holičstvo hardware: Železiarstvo hifi: Hi-Fi - insurance: PoisÅ¥ovňa jewelry: Zlatníctvo kiosk: Novinový stánok laundry: Práčovňa @@ -814,10 +799,8 @@ sk: pet: Chovprodukt pharmacy: Lekáreň photo: Fotokino - salon: Salón second_hand: Bazár shoes: Obuv - shopping_centre: Nákupné stredisko sports: Å portový obchod stationery: Papierníctvo supermarket: Supermarket diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 1c67e2355..aa203d026 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -280,7 +280,7 @@ sl: newer_entries: NovejÅ¡i zapisi edit: title: Uredi zapis v dnevnik - subject: 'Naslov:' + subject: 'Zadeva:' body: 'Besedilo:' language: 'Jezik:' location: 'Lokacija:' @@ -350,7 +350,7 @@ sl: map_image: Slika zemljevida (prikaže standardni izris) embeddable_html: HTML za vključitev na spletno stran licence: Licenca - export_details: OpenStreetMap podatki imajo dovoljenje Open + export_details: OpenStreetMap podatki imajo dovoljenje Open Data Commons Open Database License (ODbL). too_large: advice: 'Če zgornji izvoz spodleti, uporabite enega od spodnjih virov:' @@ -388,14 +388,14 @@ sl: geocoder: search: title: - latlon: Interni zadetki + latlon: Interni zadetki uk_postcode: Zadetki iz NPEMap / FreeThe Postcode - ca_postcode: Zadetki iz Geocoder.CA - osm_nominatim: Zadetki iz OpenStreetMap + ca_postcode: Zadetki iz Geocoder.CA + osm_nominatim: Zadetki iz OpenStreetMap Nominatim geonames: Zadetki iz GeoNames - osm_nominatim_reverse: Zadetki iz OpenStreetMap + osm_nominatim_reverse: Zadetki iz OpenStreetMap Nominatim-a geonames_reverse: Zadetki iz GeoNames search_osm_nominatim: @@ -408,8 +408,10 @@ sl: station: ŽičniÅ¡ka postaja aeroway: aerodrome: Letališče + airstrip: Vzletna steza apron: LetaliÅ¡ka ploščad gate: Vrata + hangar: Hangar helipad: Heliodrom runway: Vzletna steza taxiway: Vozna steza @@ -445,33 +447,26 @@ sl: crematorium: Krematorij dentist: Zobozdravnik doctors: Zdravniki - dormitory: Å tudentski dom drinking_water: Pitna voda driving_school: AvtoÅ¡ola embassy: VeleposlaniÅ¡tvo - emergency_phone: Klic v sili fast_food: Hitra hrana ferry_terminal: Trajekt - fire_hydrant: Hidrant fire_station: Gasilska postaja food_court: Prehrambeni prostor fountain: Vodomet fuel: Bencinska črpalka gambling: Igre na srečo grave_yard: Pokopališče - gym: Fitnes / Telovadnica - health_centre: Dom zdravja hospital: BolniÅ¡nica hunting_stand: Lovska opazovalnica ice_cream: Sladoled kindergarten: Vrtec library: Knjižnica - market: Trg marketplace: Tržnica monastery: Samostan motorcycle_parking: Parkirišče motornih koles nightclub: Nočni klub - nursery: Vrtec nursing_home: Dom za starejÅ¡e office: Pisarne parking: Parkirišče @@ -485,7 +480,6 @@ sl: prison: Zapor pub: Pivnica public_building: Javne zgradba - reception_area: Recepcija recycling: Reciklirna točka restaurant: Restavracija retirement_home: Dom za ostarele @@ -537,6 +531,7 @@ sl: "yes": Obrtnik emergency: ambulance_station: ReÅ¡evalna postaja + assembly_point: Zbirno mesto defibrillator: Defibrilator landing_site: Mesto za pristanek v sili phone: Klic v sili @@ -581,7 +576,6 @@ sl: trunk: Hitra cesta trunk_link: Priključek na hitro cesto unclassified: Neopredeljena cesta - unsurfaced: Makadamska pot "yes": Cesta historic: archaeological_site: ArheoloÅ¡ko najdbišče @@ -600,6 +594,7 @@ sl: manor: Graščina memorial: Spomenik mine: Rudnik + mine_shaft: RudniÅ¡ki jaÅ¡ek monument: Spomenik roman_road: Rimska cesta ruins: RuÅ¡evine @@ -646,7 +641,6 @@ sl: leisure: beach_resort: kopališče bird_hide: Ptičja opazovalnica - club: Klub common: Javno zemljišče dog_park: Pasji park fishing: Ribolovno področje @@ -673,9 +667,19 @@ sl: water_park: Vodni park "yes": Prosti čas man_made: + beehive: Čebelnjak + bridge: Most + bunker_silo: Bunker + chimney: Dimnik + crane: Žerjav lighthouse: Svetilnik + mineshaft: RudniÅ¡ki jaÅ¡ek + pier: Pomol pipeline: Cevovod tower: Stolp + watermill: Vodno kolo + water_tower: Vodni stolp + windmill: Vetrnica works: Tovarna military: airfield: VojaÅ¡ko letališče @@ -727,6 +731,7 @@ sl: administrative: Administracija architect: Arhitekt company: Podjetje + educational_institution: Izobraževalna ustanova employment_agency: Agencija za zaposlovanje estate_agent: Nepremičninska agencija government: Vladni urad @@ -738,8 +743,6 @@ sl: "yes": Pisarne place: allotments: Vrtički - block: Blok - airport: Letališče city: Mesto country: Država county: Okrožje @@ -751,7 +754,6 @@ sl: islet: Otoček isolated_dwelling: Osamljena hiÅ¡a locality: Krajevno ime - moor: Barje municipality: Občina neighbourhood: Mestna četrt postcode: PoÅ¡tna Å¡tevilka @@ -768,10 +770,8 @@ sl: abandoned: Opuščena železnica construction: Železnica v izgradnji disused: Opuščena železnica - disused_station: Opuščena železniÅ¡ka postaja funicular: Žična vzpenjača halt: ŽelezniÅ¡ko postajališče - historic_station: Zgodovinska železniÅ¡ka postaja junction: Križišče železnic level_crossing: Prehod light_rail: Mestna železnica @@ -835,10 +835,10 @@ sl: hairdresser: Frizerski salon hardware: Železnina hifi: Trgovina z avdio opremo - insurance: Zavarovalnica jewelry: Draguljarna kiosk: Kiosk prodajalna laundry: Pralnica + lottery: Loterija mall: Trgovski center market: Trg mobile_phone: Trgovina mobilnih telefonov @@ -851,16 +851,15 @@ sl: pet: Trgovina za male živali pharmacy: Lekarna photo: Fotograf - salon: Lepotilni salon second_hand: Trgovina z rabljeno opremo shoes: Trgovina s čevlji - shopping_centre: Nakupovalni center sports: Å portna trgovina stationery: Papirnica supermarket: Supermarket tailor: Krojač toys: Trgovina igrač travel_agency: Potovalna agencija + tyres: Vulkanizer video: Videoteka wine: Vinoteka "yes": Trgovina @@ -917,7 +916,7 @@ sl: level10: Meja predmestja description: title: - osm_nominatim: Lokacija iz OpenStreetMap + osm_nominatim: Lokacija iz OpenStreetMap Nominatim geonames: Lokacija iz GeoNames types: @@ -990,8 +989,8 @@ sl: legal_babble: title_html: Avtorske pravice in licenca intro_1_html: OpenStreetMap® so prosti - podatki z dovoljenjem Open - Data Commons Open Database License (ODbL) Fundacije + podatki z dovoljenjem Open + Data Commons Open Database License (ODbL) Fundacije OpenStreetMap (OSMF). contributors_title_html: NaÅ¡i sodelavci contributors_si_html: |- @@ -1000,7 +999,7 @@ sl: Ministrstva za kmetijstvo, gozdarstvo in prehrano. contributors_footer_1_html: |- Za več podrobnosti o teh in drugih virih, ki so bili uporabljeni kot pripomočki pri izboljÅ¡evanju OpenStreetMap, si prosimo oglejte stran sodelujočih na wikiju OpenStreetMap. + href="https://wiki.openstreetmap.org/wiki/Contributors">stran sodelujočih na wikiju OpenStreetMap. infringement_title_html: KrÅ¡itev avtorskih pravic welcome_page: title: DobrodoÅ¡li! @@ -1062,7 +1061,7 @@ sl: title: DobrodoÅ¡li v OSM description: Začnite s tem hitrim vodičem, ki zajema osnove OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Sl:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Sl:Beginners%27_guide title: Vodnik za začetnike description: Vodnik za začetnike, ki ga vzdržuje skupnost. help: @@ -1077,7 +1076,7 @@ sl: title: IRC description: Interaktivni klepet v mnogo različnih jezikih in o mnogo temah. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Prebrskajte wiki za poglobljeno OSM dokumentacijo. about_page: @@ -1299,13 +1298,13 @@ sl: user_page_link: strani vaÅ¡ega uporabniÅ¡kega računa anon_edits_link_text: Pojasnilo zakaj je temu tako. flash_player_required: Za uporabo Potlatcha, urejevalnika OpenStreetMap, potrebujete - urejevalnik Flash. Prenesete ga lahko s strani Adobe.com. - Na razpolago so tudi druge + predvajalnik Flash. Prenesete ga lahko s strani Adobe.com. + Na razpolago so tudi druge možnosti za urejanje zemljevidov OpenStreetMap. potlatch_unsaved_changes: Imate neshranjene spremembe. (Za shranjevanje v Potlatch-u, od-izberite trenutno pot ali vozlišče (v načinu v živo), ali pa kliknite na gumb Save (shrani), če ga imate.) - potlatch2_not_configured: Potlatch 2 ni nastavljen - poglej http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: Potlatch 2 ni nastavljen - poglej https://wiki.openstreetmap.org/wiki/The_Rails_Port potlatch2_unsaved_changes: Spremembe niso shranjene. (Če želite shraniti v Potlatch 2, kliknete Shrani.) id_not_configured: iD Å¡e ni bil konfiguriran @@ -1397,7 +1396,7 @@ sl: edit: Uredi preview: Predogled markdown_help: - title_html: Obdelano z Markdown + title_html: Obdelano z Markdown headings: Poglavja heading: Poglavje subheading: Podpoglavje @@ -1507,7 +1506,7 @@ sl: description: Prebrskaj nedavno poslane sledi GPS tagged_with: ' z oznako %{tags}' empty_html: Prazno. Naložite novo sled oziroma - izvedete več o GPS sledeh na wiki + izvedete več o GPS sledeh na wiki strani. delete: scheduled_for_deletion: Sled bo izbrisana @@ -1703,12 +1702,12 @@ sl:

    Za razliko od drugih zemljevidov je OpenStreetMap popolnoma ustvarjen od ljudi kot si ti in ga lahko vsakdo popravit, nadgradi, prenese ter brezplačno uporablja.

    Prijavite se, če želite začeti prispevati. Poslali vam bomo elektronsko sporočilo za potrditev računa.

    license_agreement: Ko boste potrdili svoj račun, se boste morali strinjati s - pogoji + pogoji sodelovanja. email address: 'E-poštni naslov:' confirm email address: 'Potrdite naslov e-pošte:' not displayed publicly: Vaš naslov ne bo javno objavljen (za več informacij - glej politiko zasebnosti) display name: 'Prikazno ime:' display name description: Javno prikazano uporabniško ime. To lahko spremenite @@ -1828,26 +1827,26 @@ sl: email never displayed publicly: (nikoli javno objavljen) external auth: 'Zunanje preverjanje pristnosti:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: kaj je to? public editing: heading: 'Javno urejanje:' enabled: Omogočeno. Niste anonimni in lahko urejate podatke. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Kaj je to? disabled: Onemogočeno in ne morete urejati podatkov. Vsi vaši prejšnji prispevki so anonimni. disabled link text: Zakaj ne morem urejati? public editing note: heading: Javno urejanje - text: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslali - sporočil oz. videti vaše lokacije. Da prikažete, kaj ste urejali in ljudem + text: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslati + sporočil oz. videti vaše lokacije. Da prikažete, kar ste urejali in ljudem omogočite, da vas kontaktirajo prek spletne strani, kliknite spodnji gumb. - Od prehoda na API 0.6 lahko karto urejajo le javni uporabniki. ( - Ugotovite, + Od prehoda na API 0.6 lahko zemljevid urejajo le javni uporabniki. + ( Ugotovite, zakaj).
    • VaÅ¡ e-naslov se ob tem, ko boste postali javen uporabnik, ne bo razkril.
    • Dejanja ni mogoče razveljaviti in vsi novi uporabniki - so zdaj javni po privzetem.
    + so sedaj privzeto javni.
contributor terms: heading: 'Pogoji sodelovanja:' agreed: Sprejeli ste nove pogoje sodelovanja. @@ -2181,10 +2180,8 @@ sl: notes: new: intro: Ste opazili napako ali pa kaj manjka? Obvestite ostale kartografe o - tem, da lahko to popravijo. Premaknite oznako na pravilno lokacijo in vpiÅ¡ite - opombo, kjer pojasnite problem. (Prosimo, ne vnaÅ¡ajte osebnih podatkov ali - informacij pridobljenih iz zemljevidov zaščitenih z avtorskimi pravicami - ali imeniÅ¡kih seznamov.) + tem, da lahko to popravimo. Premaknite oznako na pravilno lokacijo in vpiÅ¡ite + opombo, kjer pojasnite problem. add: Dodaj opombo show: anonymous_warning: To opomba vključuje pripombe anonimnih uporabnikov, ki diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 53d3639c0..4838615fb 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Euriditi +# Author: Fanjiayi # Author: GretaDoci # Author: Kosovastar # Author: Liridon @@ -356,7 +357,7 @@ sq: map_image: Imzhi i hartës (shfaq shtresën e parazgjedhur) embeddable_html: HTML i inkorporueshëm licence: Licensa - export_details: Të dhënat e OpenStreetMap janë të licencuara nën Open + export_details: Të dhënat e OpenStreetMap janë të licencuara nën Open Data Commons Open Database License (ODbL). too_large: advice: 'Në qoftë se dështon eksporti i mësipërm, të lutem konsidero përdorimin @@ -398,14 +399,14 @@ sq: geocoder: search: title: - latlon: Rezultatet e brendshme nga + latlon: Rezultatet e brendshme nga uk_postcode: Rezultatet nga NPEMap / FreeThe Postcode - ca_postcode: Rezultatet nga Geocoder.ca - osm_nominatim: Rezultatet nga OpenStreetMap + ca_postcode: Rezultatet nga Geocoder.ca + osm_nominatim: Rezultatet nga OpenStreetMap Nominatim geonames: Rezultate nga GeoNames - osm_nominatim_reverse: Rezultatet nga OpenStreetMap + osm_nominatim_reverse: Rezultatet nga OpenStreetMap Nominatim geonames_reverse: Rezultate nga GeoNames search_osm_nominatim: @@ -456,33 +457,26 @@ sq: crematorium: Krematorium dentist: Dentist doctors: Mjekët - dormitory: Konvikt drinking_water: Ujë i pijshëm driving_school: Autoshkollë embassy: Ambasadë - emergency_phone: Kabinë telefoni për emergjencë fast_food: Ushqim i shpejtë ferry_terminal: Terminal i trageteve - fire_hydrant: Hidrant zjarrfikës fire_station: Zjarrëfiksat food_court: Kënd ushqimi fountain: Shatërvan fuel: Stacion karburanti gambling: Kumar grave_yard: Varrezë - gym: Qendër fitnesi / Palestër - health_centre: Qendër shëndetsore hospital: Spital hunting_stand: Vend gjuetie ice_cream: Akullore kindergarten: Kopësht fëmijësh library: Bibliotekë - market: Market marketplace: Treg monastery: Manastir motorcycle_parking: Vendparkim motoçikletash nightclub: Klub nate - nursery: Çerdhe nursing_home: Çerdhe office: Zyrë parking: Vendparkim @@ -496,7 +490,6 @@ sq: prison: Burg pub: Pub public_building: Ndërtesë publike - reception_area: Zonë e pritjes recycling: Pikë riciklimi restaurant: Restorant retirement_home: Shtëpi pleqësh @@ -592,7 +585,6 @@ sq: trunk: Rrugë magjistrale trunk_link: Rrugë magjistrale unclassified: Rrugë e paklasifikuar - unsurfaced: Rrugë me kalldrëm "yes": Rrugë historic: archaeological_site: Vend arkeologjik @@ -657,7 +649,6 @@ sq: leisure: beach_resort: Plazh bird_hide: Kamuflim zogjësh - club: Klub common: Tokë e përbashkët dog_park: Park qenësh fishing: Zonë peshkimi @@ -684,6 +675,7 @@ sq: water_park: Park ujor "yes": Kohë e lirë man_made: + bunker_silo: Bunker lighthouse: Fanar pipeline: Tubacion tower: Kullë @@ -750,8 +742,6 @@ sq: "yes": Zyrë place: allotments: Kopsht i vogël - block: Bllok - airport: Aeroport city: Qytet country: Vend county: Vend @@ -763,7 +753,6 @@ sq: islet: Ishull isolated_dwelling: Vendbanim i izoluar locality: Lokalitet - moor: Moçal municipality: Komunë neighbourhood: Lagje postcode: Kodi postar @@ -780,10 +769,8 @@ sq: abandoned: Hekurudhë e braktisur construction: Hekurudhë në ndërtim e sipër disused: Hekurudhë e braktisur - disused_station: Stacion hekurudhor jashtë përdorimi funicular: Linjë teleferiku halt: Stacion hekerudhor - historic_station: Stacion hekurudhor historik junction: Nyje hekurudhore level_crossing: Kryqzim hekurudhor light_rail: Hekurudhë e lehtë @@ -834,7 +821,6 @@ sq: hairdresser: Floktar hardware: Hekrari hifi: Hi-Fi - insurance: Zyre sigurimi jewelry: Dyqan bizhuterie kiosk: Kiosk laundry: Lavanderi @@ -846,7 +832,6 @@ sq: optician: Optikë pharmacy: Barnatore photo: Fotograf - salon: Sallon supermarket: Supermarket tailor: Rrobaqepës toys: Dyqan lodrash diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 192b53287..f5ca8e9d4 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -312,30 +312,23 @@ sr-Latn: crematorium: Krematorijum dentist: Zubar doctors: Doktor - dormitory: Studentski dom drinking_water: Pijaća voda driving_school: Auto-Å¡kola embassy: Ambasada - emergency_phone: Telefon za hitne slučajeve fast_food: Brza hrana ferry_terminal: Skela - fire_hydrant: Hidrant fire_station: Vatrogasna stanica food_court: Å tandovi za brzu hranu fountain: Fontana fuel: Benzinska pumpa grave_yard: Groblje - gym: Fitnes centar - health_centre: Dom zdravlja hospital: Bolnica hunting_stand: Lovački dom ice_cream: Prodavnica sladoleda kindergarten: ObdaniÅ¡te library: Biblioteka - market: Pijaca marketplace: Pijaca nightclub: Noćni klub - nursery: Jaslice nursing_home: Starački dom office: Poslovnica parking: Parking @@ -348,7 +341,6 @@ sr-Latn: prison: Zatvor pub: Pab public_building: Ustanova - reception_area: Prijemno područje recycling: Mesto za reciklažu restaurant: Restoran retirement_home: Starački dom @@ -421,7 +413,6 @@ sr-Latn: trunk: Magistralni put trunk_link: Magistralni put unclassified: Nekategorisani put - unsurfaced: Neasfaltirani put historic: archaeological_site: ArheoloÅ¡ko nalaziÅ¡te battlefield: BojiÅ¡te @@ -549,7 +540,6 @@ sr-Latn: travel_agent: Turistička agencija "yes": Kancelarija place: - airport: Aerodrom city: Grad country: Zemlja county: Okrug @@ -561,7 +551,6 @@ sr-Latn: islet: Hrid isolated_dwelling: Udaljeno prebivaliÅ¡te locality: Lokalitet - moor: Močvara municipality: OpÅ¡tina postcode: PoÅ¡tanski broj region: Područje @@ -576,10 +565,8 @@ sr-Latn: abandoned: NapuÅ¡tena železnica construction: Železnička pruga u izgradnji disused: NapuÅ¡tena železnica - disused_station: NapuÅ¡tena železnička stanica funicular: Žičana železnica halt: Železničko stajaliÅ¡te - historic_station: Istorijska železnička stanica junction: Železnički čvor level_crossing: Pružni prelaz light_rail: Laka železnica @@ -639,7 +626,6 @@ sr-Latn: hairdresser: Frizerski salon hardware: Gvožđara hifi: Muzička oprema - insurance: Osiguranje jewelry: Zlatara kiosk: Kiosk laundry: Perionica rublja @@ -654,9 +640,7 @@ sr-Latn: outdoor: Å tand pet: Prodavnica kućnih ljubimaca photo: Fotografska radnja - salon: Salon shoes: Prodavnica obuće - shopping_centre: Tržni centar sports: Sportska oprema stationery: Papirnica supermarket: Supermarket diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 5fa308c5c..6210ad645 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1,6 +1,7 @@ # Messages for Serbian (Cyrillic script) (српски (ћирилица)‎) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Acamicamacaraca # Author: Aktron # Author: Macofe # Author: Magnumns @@ -53,7 +54,7 @@ sr: tracepoint: Тачка руте tracetag: Ознака руте user: Корисник - user_preference: Поставке корисника + user_preference: Подешавања корисника user_token: Токен корисника way: Линија way_node: Тачка линије @@ -116,7 +117,7 @@ sr: deleted_by_html: Избрисао %{user} пре %{time} edited_by_html: Изменио %{user} пре %{time} closed_by_html: Затворио %{user} пре %{time} - version: Верзија + version: Издање in_changeset: Скуп измена anonymous: анониман no_comment: (нема коментара) @@ -389,11 +390,11 @@ sr: latlon: Унутрашњи резултати uk_postcode: Резултати са сајта NPEMap/FreeThe Postcode - ca_postcode: Резултати са сајта Geocoder.ca - osm_nominatim: Резултати са сајта OpenStreetMap + ca_postcode: Резултати са сајта Geocoder.ca + osm_nominatim: Резултати са сајта OpenStreetMap Nominatim geonames: Резултати са сајта GeoNames - osm_nominatim_reverse: Резултати са сајта OpenStreetMap + osm_nominatim_reverse: Резултати са сајта OpenStreetMap Nominatim geonames_reverse: Резултати са сајта GeoNames search_osm_nominatim: @@ -407,9 +408,12 @@ sr: station: Станица жичаре aeroway: aerodrome: Аеродром + airstrip: Писта apron: Пристанишна платформа gate: Капија + hangar: Хангар helipad: Хелиодром + parking_position: Место за паркинг runway: Писта taxiway: Рулна стаза terminal: Терминал @@ -444,37 +448,31 @@ sr: crematorium: Крематоријум dentist: Стоматолог doctors: Лекари - dormitory: Студентски дом drinking_water: Пијаћа вода driving_school: Ауто-школа embassy: Амбасада - emergency_phone: Телефон за хитне случајеве fast_food: Брза храна ferry_terminal: Трајектни терминал - fire_hydrant: Противпожарни хидрант fire_station: Ватрогасна станица food_court: Пултови са храном fountain: Фонтана fuel: Гориво gambling: Коцкарница grave_yard: Гробље - gym: Фитнес центар/теретана - health_centre: Здравствени центар hospital: Болница hunting_stand: Ловачка кула ice_cream: Продавница сладоледа kindergarten: Обданиште library: Библиотека - market: Пијаца marketplace: Зелена пијаца monastery: Манастир motorcycle_parking: Паркинг за мотоцикле nightclub: Ноћни клуб - nursery: Јаслице nursing_home: Старачки дом office: Канцеларија parking: Паркинг parking_entrance: Улаз на паркинг + parking_space: Паркинг место pharmacy: Апотека place_of_worship: Верски објекат police: Полиција @@ -484,7 +482,6 @@ sr: prison: Затвор pub: Паб public_building: Јавна зграда - reception_area: Рецепција recycling: Место за рециклажу restaurant: Ресторан retirement_home: Дом пензионера @@ -545,6 +542,7 @@ sr: bus_guideway: Трамвајска линија bus_stop: Аутобуска станица construction: Ауто-пут у изградњи + corridor: Коридор cycleway: Бициклистичка стаза elevator: Лифт emergency_access_point: Прва помоћ @@ -571,6 +569,7 @@ sr: services: Услуге на ауто-путу speed_camera: Фото-радар steps: Степенице + stop: Знак стоп street_lamp: Улична светиљка tertiary: Локални пут tertiary_link: Локални пут @@ -580,7 +579,6 @@ sr: trunk: Магистрала trunk_link: Магистрала unclassified: Некласификовани пут - unsurfaced: Неасфалтирани пут "yes": Пут historic: archaeological_site: Археолошко налазиште @@ -608,6 +606,7 @@ sr: wayside_cross: Крајпуташ wayside_shrine: Светилиште покрај пута wreck: Олупина + "yes": Историјска знаменитост junction: "yes": Раскрсница landuse: @@ -645,9 +644,9 @@ sr: leisure: beach_resort: Приобално одмаралиште bird_hide: Осматрачница за птице - club: Клуб common: Општинско земљиште dog_park: Парк за псе + firepit: Камин fishing: Место за риболов fitness_centre: Фитнес центар fitness_station: Технички преглед @@ -672,15 +671,34 @@ sr: water_park: Аквапарк "yes": Разонода man_made: + beacon: Светионик + beehive: Кошница са пчелама + bridge: Мост + bunker_silo: Бункер + chimney: Димњак + crane: Кран + embankment: Насип + flagpole: Јарбол за заставу + gasometer: Гасометар + groyne: Брана + kiln: Печењара lighthouse: Светионик + mast: Јарбол + mine: Рудник + pier: Пристаниште pipeline: Цевовод + silo: Силос + surveillance: Присмотра tower: Кула + watermill: Водени млин + water_well: Бунар works: Фабрика "yes": Вештачки објекти military: airfield: Војни аеродром barracks: Касарна bunker: Бункер + "yes": Војска mountain_pass: "yes": Планински прелаз natural: @@ -727,10 +745,12 @@ sr: administrative: Администрација architect: Архитекта company: Предузеће + educational_institution: Образовна установа employment_agency: Агенција за запошљавање estate_agent: Агенција за некретнине government: Владина служба insurance: Агенција за осигурање + it: ИТ канцеларија lawyer: Адвокат ngo: Невладина организација telecommunication: Телекомуникациона компанија @@ -738,9 +758,8 @@ sr: "yes": Канцеларија place: allotments: Парцеле - block: Блок - airport: Аеродром city: Град + city_block: Градски блок country: Земља county: Округ farm: Фарма @@ -751,12 +770,12 @@ sr: islet: Острвце isolated_dwelling: Удаљено пребивалиште locality: Локалитет - moor: Вресиште municipality: Општина neighbourhood: Кварт postcode: Поштански број region: Регион sea: Море + square: Трг state: Држава subdivision: Административно подручје suburb: Предграђе @@ -768,10 +787,8 @@ sr: abandoned: Напуштена железница construction: Железничка пруга у изградњи disused: Напуштена железница - disused_station: Напуштена железничка станица funicular: Жичана железница halt: Железничко стајалиште - historic_station: Историјска железничка станица junction: Железнички чвор level_crossing: Пружни прелаз light_rail: Лака железница @@ -835,12 +852,14 @@ sr: hairdresser: Фризерски салон hardware: Продавница алата hifi: Продавница аудио-опреме - insurance: Осигуравајућа компанија + interior_decoration: Декорација ентеријера jewelry: Јувелирница kiosk: Трафика laundry: Перионица веша + lottery: Лутрија mall: Тржни центар market: Пијаца + massage: Масажа mobile_phone: Продавница мобилних телефона motorcycle: Продавница мотоцикала music: Музичка продавница @@ -848,21 +867,25 @@ sr: optician: Оптичар organic: Продавница здраве хране outdoor: Продавница опреме за спортове на отвореном + paint: Фарбара + pawnbroker: Залагаоничар pet: Продавница за кућне љубимце pharmacy: Апотека photo: Фотографска радња - salon: Салон + seafood: Морски плодови second_hand: Продавница половне робе shoes: Продавница обуће - shopping_centre: Тржни центар sports: Продавница спортске опреме stationery: Продавница канцеларијског прибора supermarket: Супермаркет tailor: Кројач + ticket: Продавница карата + tobacco: Продавница цигарета toys: Продавница играчака travel_agency: Туристичка агенција + tyres: Продавница гума video: Видеотека - wine: Продавница алкохолних пића + wine: Винарија "yes": Продавница tourism: alpine_hut: Планинарски дом @@ -886,6 +909,7 @@ sr: viewpoint: Видиковац zoo: Зоолошки врт tunnel: + building_passage: Пролаз између зграда culvert: Одводни канал "yes": Тунел waterway: @@ -917,7 +941,7 @@ sr: level10: Граница насеља description: title: - osm_nominatim: Локација са сајта OpenStreetMap + osm_nominatim: Локација са сајта OpenStreetMap Nominatim geonames: Локација са сајта GeoNames types: @@ -995,19 +1019,19 @@ sr: title_html: Ауторска права и лиценца intro_1_html: |- OpenStreetMap® садржи слободне податке који су доступни под лиценцом Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) организације OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF). intro_2_html: |2- Можете да умножавате, делите, преносите и прилагођавате наше податке, све док именујете Опенстритмап и њене уреднике. Ако желите да мењате и дограђујете наше податке, можете их делити само под истом лиценцом. - Цео + Цео текст уговора објашњава вам ваша права и одговорности. intro_3_html: |- Картографија у нашим пољима мапа и документацији - нуди се под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC-BY-SA). + нуди се под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC BY-SA). credit_title_html: Како да именујете OpenStreetMap credit_1_html: |- Захтевамо да као носиоце ауторских права наведете “© ОпенСтитМап @@ -1015,7 +1039,7 @@ sr: credit_2_html: |- Такође неопходно је недвосмислено навести да су подаци доступни под лиценцом отворене базе података "Open Database License", и ако користите наше плочице за карту, да је картографија лиценцирана под CC BY-SA. Ово можете учинити упућивањем на - ову страницу за ауторска права. + ову страницу за ауторска права. Друга могућност је да ако ширите ОСМ у облику податка, лиценце можете навести и повезати директно. У медијима у којима повезивање није могуће (нпр. штампани материјали), предлажемо да упутите читаоце на openstreetmap.org (можда проширујући 'OpenStreetMap' на пуну адресу), на opendatacommons.org, и ако је потребно, на creativecommons.org. credit_3_html: |- @@ -1042,10 +1066,10 @@ sr: и других извора, међу којима су: contributors_at_html: |- Аустрија: садржи податке из - Штата Виена под лиценцом - CC BY), - Ланд Форарлберг и - Ланд Тирол (под лиценцом CC-BY AT са изменама и допунама). + Штата Виена под лиценцом + CC BY), + Ланд Форарлберг и + Ланд Тирол (под лиценцом CC-BY AT са изменама и допунама). contributors_ca_html: |- Канада: садржи податке из Беобазе®, Геогратиса (© Одељење за природне @@ -1056,13 +1080,13 @@ sr: Финска: Садржи податке са Топографске базе података Националног геодетског завода Финске те друге сетове података, под - NLSFI лиценцом. + NLSFI лиценцом. contributors_fr_html: |- Француска: садржи податке који потичу од Генералне дирекције за опорезивање. contributors_nl_html: |- Холандија: садржи © AND подаци, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Нови Зеланд: садржи податке који потичу од Land Information New Zealand. Крунска ауторска права задржана. @@ -1082,7 +1106,7 @@ sr: contributors_footer_1_html: |- Више информација о овим и другим изворима коришћеним за побољшавање Опенстритмапа можете наћи на страници Доприносиоци на нашем викију. + href="https://wiki.openstreetmap.org/wiki/Contributors">Доприносиоци на нашем викију. contributors_footer_2_html: |2- Укључивање података у Опенстритмап не подразумева да изворни власник података прихвата Опенстритмап, обезбеђује било какву @@ -1094,7 +1118,7 @@ sr: infringement_2_html: |- Ако верујете да је материјал заштићен ауторским правима био неприкладно додат у базу података OpenStreetMap или овај сајт, молимо да пратите - нашу процедуру за + нашу процедуру за скидање или да се директно обратите на нашој онлајн страници за пријаве. trademarks_title_html: Робне марке @@ -1104,7 +1128,7 @@ sr: групи за лиценце. welcome_page: title: Добро дошли! - introduction_html: Добродошли на ОпенСтритМап, бесплатну изменљиву карту света. + introduction_html: Добро дошли на OpenStreetMap, бесплатну изменљиву карту света. Сада кад сте се пријавили, спремни сте да почнете са картографијом. Ево га брзи водич са најбитнијим стварима које је потребно знати. whats_on_the_map: @@ -1172,7 +1196,7 @@ sr: теме. welcome: url: /welcome - title: Добродошли на ОСМ + title: Добро дошли на ОСМ description: Почни са овим брзим водичем који покрива основе ОпенСтритМапа beginners_guide: url: http://wiki.openstreetmap.org/wiki/Sr:Beginners%27_guide @@ -1198,7 +1222,7 @@ sr: description: Помоћ за компаније и организације које прелазе на мапе засноване на OpenStreetMap-у и другим алаткама. wiki: - url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page + url: https://wiki.openstreetmap.org/wiki/Sr:Main_Page title: wiki.openstreetmap.org/wiki/Sr:Main_Page description: Претражи вики за детаљнију ОСМ документаацију. about_page: @@ -1704,7 +1728,7 @@ sr: oauthorize_failure: title: Неуспешан захтев за ауторизацију denied: Онемогућили сте да апликација %{app_name} приступи Вашем налогу. - invalid: Токен за ауторизацију није валидан. + invalid: Токен за ауторизацију није исправан. revoke: flash: Опозвали сте новчић за %{application} permissions: @@ -1981,12 +2005,12 @@ sr: email never displayed publicly: (никада се не приказује јавно) external auth: 'Спољна аутентификација:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: шта је ово? public editing: heading: 'Јавно уређивање:' enabled: Омогућено. Није анонимно и могу се уређивати подаци. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: шта је ово? disabled: Онемогућено и не могу се уређивати подаци. Све претходне измене су анонимне. @@ -1996,7 +2020,7 @@ sr: text: Тренутно су ваше измене анонимне и људи вам не могу слати поруке или видети вашу локацију. Да бисте показали ваше измене и дозволили људима да вас контактирају, кликните на дугме испод. Од промена АПИ-ја 0.6, само - јавни корисници могу уређивати мапе. (сазнајте + јавни корисници могу уређивати мапе. (сазнајте зашто).
  • Ваша е-адреса неће бити откривена на овај начин.
  • Ова радња не може бити опозвана и сви нови корисници су од сада постављени као јавни.
@@ -2106,7 +2130,7 @@ sr: invalid_credentials: Невалидни аутентификациони акредитиви no_authorization_code: Нема кода ауторизације unknown_signature_algorithm: Непознат потписни алгоритам - invalid_scope: Невалидан опсед + invalid_scope: Неисправан опсед auth_association: heading: Ваш ID још увек није повезан са налогом OpenStreetMap. option_1: |- @@ -2339,8 +2363,7 @@ sr: new: intro: Наишли сте на грешку или нешто недостаје? Обавестите друге картографе како бисмо решили проблем. Преместите маркер на исправно место и напишите - објашњење. Молимо вас да не уносите личне податке, информације из мапа заштићених - ауторским правима или спискове каталога. + објашњење. add: Додај белешку show: anonymous_warning: Ова белешка садржи коментаре анонимних корисника које би diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 08ccb07fc..d4782c70c 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -381,7 +381,7 @@ sv: embeddable_html: Inbäddad HTML licence: Licens export_details: Data frÃ¥n OpenStreetMap har gjorts tillgänglig under licensen Open Data Commons Open + href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License (ODbL). too_large: advice: 'Om ovanstÃ¥ende export misslyckas, vänligen överväg att använda en @@ -420,14 +420,14 @@ sv: geocoder: search: title: - latlon: Resultat frÃ¥n OpenStreetMap + latlon: Resultat frÃ¥n OpenStreetMap uk_postcode: Resultat frÃ¥n NPEMap / Free The Postcode - ca_postcode: Resultat frÃ¥n Geocoder.CA - osm_nominatim: Resultat frÃ¥n OpenStreetMap + ca_postcode: Resultat frÃ¥n Geocoder.CA + osm_nominatim: Resultat frÃ¥n OpenStreetMap Nominatim geonames: Resultat frÃ¥n GeoNames - osm_nominatim_reverse: Resultat frÃ¥n OpenStreetMap + osm_nominatim_reverse: Resultat frÃ¥n OpenStreetMap Nominatim geonames_reverse: Resultat frÃ¥n GeoNames search_osm_nominatim: @@ -437,12 +437,17 @@ sv: chair_lift: Stollift drag_lift: Släplift gondola: Gondolbana + platter: Knapplift station: Linbanestation + t-bar: Ankarlift aeroway: aerodrome: Flygfält + airstrip: Landningsbana apron: Platta gate: Gate + hangar: Hangar helipad: Helikopterplatta + parking_position: Parkeringsplats runway: Landningsbana taxiway: Taxibana terminal: Terminal @@ -477,39 +482,33 @@ sv: crematorium: Krematorium dentist: Tandläkare doctors: Läkare - dormitory: Studenthem drinking_water: Dricksvatten driving_school: Körskola embassy: Ambassad - emergency_phone: Nödtelefon fast_food: Snabbmat ferry_terminal: Färjeterminal - fire_hydrant: Brandpost fire_station: Brandstation food_court: Food Court fountain: Fontän fuel: Bränsle gambling: Spel grave_yard: Begravningsplats - gym: Fitnesscenter / Gym - health_centre: VÃ¥rdcentral hospital: Sjukhus hunting_stand: Jakttorn ice_cream: Glass kindergarten: Dagis library: Bibliotek - market: Torghandel marketplace: |2- Marknad monastery: Kloster motorcycle_parking: Motorcykelparkering nightclub: Nattklubb - nursery: Förskola nursing_home: VÃ¥rdhem office: Kontor parking: Parkeringsplats parking_entrance: Parkeringsinfart + parking_space: Parkeringsplats pharmacy: Apotek place_of_worship: Plats för tillbedjan police: Polis @@ -519,7 +518,6 @@ sv: prison: Fängelse pub: Pub public_building: Offentlig byggnad - reception_area: Reception recycling: Återvinningsstation restaurant: Restaurang retirement_home: Äldreboende @@ -552,6 +550,7 @@ sv: protected_area: Skyddat omrÃ¥de bridge: aqueduct: Akvedukt + boardwalk: Strandpromenad suspension: Hängbro swing: Svängbro viaduct: Viadukt @@ -571,20 +570,24 @@ sv: "yes": Hantverksbutik emergency: ambulance_station: Ambulansstation + assembly_point: Mötesplats defibrillator: Defibrillator landing_site: Nödlandningsplats phone: Nödtelefon + "yes": Nödsituation highway: abandoned: Övergiven motorväg bridleway: Ridstig bus_guideway: SpÃ¥rbussväg bus_stop: BusshÃ¥llplats construction: Väg under byggnad + corridor: Korridor cycleway: CykelspÃ¥r elevator: Hiss emergency_access_point: Utryckningsplats footway: GÃ¥ngväg ford: Vadställe + give_way: Väjningspliktsskylt living_street: GÃ¥ngfartsomrÃ¥de milestone: Milstolpe motorway: Motorväg @@ -606,6 +609,7 @@ sv: services: Rastplats-väg speed_camera: Trafiksäkerhetskamera steps: Trappa + stop: Stoppskylt street_lamp: Gatlykta tertiary: Landsväg tertiary_link: Landsväg @@ -614,8 +618,8 @@ sv: trail: Vandringsled trunk: Stamväg trunk_link: PÃ¥-/avfart till stamväg/motortrafikled + turning_loop: Vändslinga unclassified: Oklassificerad väg - unsurfaced: Oasfalterad väg "yes": Väg historic: archaeological_site: Arkeologisk plats @@ -634,6 +638,7 @@ sv: manor: HerrgÃ¥rd memorial: Minnesmärke mine: Gruva + mine_shaft: Gruvschakt monument: Monument roman_road: Romersk väg ruins: Ruin @@ -643,6 +648,7 @@ sv: wayside_cross: Landmärke wayside_shrine: Vägkants-helgedom wreck: Vrak + "yes": Historisk plats junction: "yes": Korsning landuse: @@ -680,9 +686,9 @@ sv: leisure: beach_resort: Badort bird_hide: FÃ¥geltorn - club: Klubb common: Allmänning dog_park: Hundpark + firepit: Gropeld fishing: Fiskevatten fitness_centre: Gym fitness_station: Gym @@ -707,15 +713,45 @@ sv: water_park: Vattenpark "yes": Fritid man_made: + adit: Gruvöppning + beacon: Fyr + beehive: Bikupa + breakwater: VÃ¥gbrytare + bridge: Bro + bunker_silo: Bunker + chimney: Skorsten + crane: Kran + dolphin: Dykdalb + dyke: Dike + embankment: Fördämning + flagpole: FlaggstÃ¥ng + gasometer: Gasometer + groyne: VÃ¥gbrytare + kiln: Kalkugn lighthouse: Fyr + mast: Mast + mine: Gruva + mineshaft: Gruvschakt + petroleum_well: Oljebrunn + pier: Pir pipeline: Pipeline + silo: Silo + storage_tank: Lagringstank + surveillance: Övervakning tower: Torn + wastewater_plant: Avfallsfabrik + watermill: Vattenkvarn + water_tower: Vattentorn + water_well: Brunn + water_works: Vattenreningsverk + windmill: Väderkvarn works: Fabrik "yes": handgjord military: airfield: Militärt flygfält barracks: Kaserner bunker: Bunker + "yes": Militär mountain_pass: "yes": Bergspass natural: @@ -762,10 +798,12 @@ sv: administrative: Administration architect: Arkitekt company: Företag + educational_institution: Utbildningsanstalt employment_agency: Bemanningsföretag estate_agent: Fastighetsmäklare government: Statligt kontor insurance: Försäkringskassa + it: IT-kontor lawyer: Advokat ngo: Icke-statligt kontor telecommunication: Telefonbolagskontor @@ -773,9 +811,8 @@ sv: "yes": Kontor place: allotments: Kolonilotter - block: Blockera - airport: Flygplats city: Stad + city_block: Kvarter country: Land county: Län farm: BondgÃ¥rd @@ -786,10 +823,10 @@ sv: islet: Holme isolated_dwelling: Enslig bostad locality: Läge - moor: Hed municipality: Kommun neighbourhood: Grannskap postcode: Postnummer + quarter: Kvarter region: Region sea: Hav state: Delstat @@ -803,10 +840,8 @@ sv: abandoned: Övergiven järnväg construction: Järnväg under anläggande disused: Nedlagd järnväg - disused_station: Nedlagd järnvägsstation funicular: Bergbana halt: TÃ¥gstopp - historic_station: Historisk Järnvägsstation junction: Järnvägsknutpunkt level_crossing: Järnvägskorsning light_rail: SnabbspÃ¥rväg @@ -870,12 +905,16 @@ sv: hairdresser: Frisör hardware: Järnhandel hifi: Hi-Fi - insurance: Försäkring + houseware: Husvaruhandel + interior_decoration: Heminredning jewelry: Guldsmed kiosk: Kiosk + kitchen: Kökshandlare laundry: Tvättservice + lottery: Lotteri mall: Köpcentrum market: Marknad + massage: Massage mobile_phone: Mobiltelefonbutik motorcycle: Motorcykelhandlare music: Musikaffär @@ -883,21 +922,26 @@ sv: optician: Optiker organic: Ekologiska livsmedelsaffär outdoor: Friluftsbutik + paint: Färgbutik + pawnbroker: PantlÃ¥nare pet: Djuraffär pharmacy: Apotek photo: Fotoaffär - salon: Damfrisering + seafood: Skaldjur second_hand: Second hand-butik shoes: Skoaffär - shopping_centre: Köpcentrum sports: Sportaffär stationery: Pappershandel supermarket: Snabbköp tailor: Skräddare + ticket: Biljettbutik + tobacco: Tobaksaffär toys: Leksaksaffär travel_agency: ResebyrÃ¥ + tyres: Däckaffär + variety_store: Varuhus video: Videobutik - wine: Spritbutik + wine: Vinhandel "yes": Affär tourism: alpine_hut: Fjällstuga @@ -921,6 +965,7 @@ sv: viewpoint: Utsiktspunkt zoo: Djurpark tunnel: + building_passage: Byggpassage culvert: Kulvert "yes": Tunnel waterway: @@ -952,7 +997,7 @@ sv: level10: Förortsgräns description: title: - osm_nominatim: Plats frÃ¥n OpenStreetMap + osm_nominatim: Plats frÃ¥n OpenStreetMap Nominatim geonames: Plats frÃ¥n GeoNames types: @@ -1029,18 +1074,18 @@ sv: title_html: Upphovsrätt och licens intro_1_html: |- OpenStreetMap® är öppen data, gjord tillgänglig under licensen Open Data Commons Open Database License (ODbL) av OpenStreetMap Foundation (OSMF). + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) av OpenStreetMap Foundation (OSMF). intro_2_html: |- Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥r data, sÃ¥ länge du anger OpenStreetMap och dess bidragsgivare som källa. Om du ändrar eller bygger vidare pÃ¥ vÃ¥r data kan du endast distribuera resultatet under samma licens. Den - fullständiga juridiska + fullständiga juridiska texten förklarar dina rättigheter och skyldigheter. intro_3_html: |- Kartografin i vÃ¥ra kartrutor, och vÃ¥r dokumentation, är - tillgängliga under licensen Creative + tillgängliga under licensen Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). credit_title_html: Hur du anger OpenStreetMap som källa credit_1_html: |- @@ -1050,7 +1095,7 @@ sv: Du mÃ¥ste ocksÃ¥ göra klart att datan är tillgänglig under licensen Open Database License, och om du använder vÃ¥ra kartrutor, att kartografin är tillgänglig under licensen CC BY-SA. Du kan göra detta genom att länka till - denna sida om upphovsrätt. + denna sida om upphovsrätt. Alternativt, och som krav om du distribuerar OSM i dataform, kan du namnge och länka direkt till licenserna. I media där länkar ej är möjliga (t.ex. tryckt material), förslÃ¥r vi att du hänvisar dina läsare till openstreetmap.org @@ -1064,7 +1109,7 @@ sv: more_title_html: Mer information more_1_html: |- Läs mer om användning av vÃ¥r data och hur du anger oss som källa pÃ¥ OSMF:s licenssida. + href="https://osmfoundation.org/Licence">OSMF:s licenssida. more_2_html: |- Även om OpenStreetMap är öppen data, kan vi inte tillhandahÃ¥lla nÃ¥got gratis kart-API för tredjeparter. Se vÃ¥r användningspolicy för API, @@ -1077,9 +1122,9 @@ sv: bland annat frÃ¥n: contributors_at_html: |- Österrike: InnehÃ¥ller data frÃ¥n - Stadt Wien (under licensen - CC BY), - Land Vorarlberg och + Stadt Wien (under licensen + CC BY), + Land Vorarlberg och Land Tirol (under licensen CC BY AT med tillägg). contributors_ca_html: |- Kanada: InnehÃ¥ller data frÃ¥n @@ -1088,13 +1133,13 @@ sv: Resources Canada), och StatCan (Geography Division, Statistics Canada). contributors_fi_html: 'Finland: InnehÃ¥ller data frÃ¥n Lantmäteriverket - i Finlands topografiska databas och andra dataset, under licensen NLSFI.' + i Finlands topografiska databas och andra dataset, under licensen NLSFI.' contributors_fr_html: |- Frankrike: InnehÃ¥ller data frÃ¥n Direction Générale des Impôts. contributors_nl_html: |- Nederländerna: InnehÃ¥ller © AND data, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: |- Nya Zeeland: InnehÃ¥ller data frÃ¥n Land Information New Zealand. Crown Copyright reserved. @@ -1114,7 +1159,7 @@ sv: contributors_footer_1_html: |- För ytterligare detaljer om dessa och andra källor som använts för att förbättra OpenStreetMap, se sidan om bidragsgivare + href="https://wiki.openstreetmap.org/wiki/Contributors">sidan om bidragsgivare pÃ¥ 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 @@ -1127,13 +1172,12 @@ sv: infringement_2_html: |- Om du tror att upphovsrättsskyddat material felaktigt har lagts in i OpenStreetMaps databas eller till den här webbplatsen, se - vÃ¥rt borttagningsförfarande + vÃ¥rt borttagningsförfarande eller fyll i vÃ¥rt online-formulär direkt. trademarks_title_html: Varumärken trademarks_1_html: OpenStreetMap, förstoringsglas-logotypen och State of the Map är registrerade varumärken hos OpenStreetMap Foundation. Om du har frÃ¥gor - gällande din användning av varumärkena, vänligen skicka frÃ¥gorna till arbetsgruppen - för licenser. + gällande din användning av varumärkena, vänligen se vÃ¥r varumärkespolicy. welcome_page: title: Välkommen! introduction_html: Välkommen till OpenStreetMap, den fria och redigerbara kartan @@ -1166,8 +1210,8 @@ sv: paragraph_1_html: "OpenStreetMap har fÃ¥ formella regler, men vi förväntar oss att alla deltagare samarbetar och kommunicerar med gemenskapen. Om du funderar pÃ¥\nnÃ¥gon annan aktivitet än manuell redigering av sidan, läs och följ anvisningarna - pÃ¥ \nImport - och \nAutomatiserade + pÃ¥ \nImport + och \nAutomatiserade redigeringar." questions: title: NÃ¥gra frÃ¥gor? @@ -1201,7 +1245,7 @@ sv: explanation_html: |- Om du har frÃ¥gor om hur vÃ¥r data används eller om innehÃ¥llet, se sidan om upphovsrätt för mer juridisk information eller kontakta lämplig - OSMF-arbetsgrupp. + OSMF-arbetsgrupp. help_page: title: FÃ¥ hjälp introduction: OpenStreetMap har flera resurser som hjälper dig att lära dig om @@ -1212,7 +1256,7 @@ sv: title: Välkommen till OSM description: Börja med den här snabbguiden som täcker grunderna i OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Sv:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Sv:Beginners%27_guide title: Guide för nybörjare description: Guide för nybörjare som underhÃ¥lls av gemenskapen. help: @@ -1236,7 +1280,7 @@ sv: description: Hjälp för företag och organisationer att byta till OpenStreetMap-baserade kartor och andra tjänster. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Sök i wikin för ingÃ¥ende OSM-dokumentation. about_page: @@ -1252,10 +1296,13 @@ sv: flygbilder, GPS-enheter och lÃ¥gteknologiska fältkartor för att kontrollera att OSM är korrekt och uppdaterad. community_driven_title: Gemenskapsdriven - community_driven_html: |- - OpenStreetMaps gemenskap är blandad, passionerad och växer varje dag. - Bland vÃ¥ra bidragsgivare finns kartentusiaster, GIS-proffs, ingenjörer som hÃ¥ller igÃ¥ng OSM:s servrar, frivilliga som kartlägger katastrofomrÃ¥den, och mÃ¥nga andra. - För mer information om gemenskapen, se OpenStreetMap-bloggen, användardagböcker, gemenskapens bloggar, och OSM-stiftelsens webbplats. + community_driven_html: "OpenStreetMaps gemenskap är blandad, passionerad och växer + varje dag.\nBland vÃ¥ra bidragsgivare finns kartentusiaster, GIS-proffs, ingenjörer + som hÃ¥ller igÃ¥ng OSM:s servrar, frivilliga som kartlägger katastrofomrÃ¥den, + och mÃ¥nga andra.\nFör mer information om gemenskapen, se \nOpenStreetMap-bloggen, + \nanvändardagböcker, \ngemenskapens + bloggar, och \nOSM-stiftelsens + webbplats." open_data_title: Öppna data open_data_html: 'OpenStreetMap är öppna data: du kan fritt använda den för valfritt syfte sÃ¥ länge du anger OpenStreetMap och dess bidragsgivare som @@ -1264,13 +1311,15 @@ sv: för Upphovsrätt och Licens för detaljer.' legal_title: Juridik legal_html: "Denna sida och mÃ¥nga andra liknande tjänster drivs formellt av \nOpenStreetMap Foundation (OSMF) \npÃ¥ + href=\"https://osmfoundation.org/\">OpenStreetMap Foundation (OSMF) \npÃ¥ gemenskapens vägnar. Användning av alla OSMF-opererade tjänster är föremÃ¥l\nför - vÃ¥ra \npolicyer + vÃ¥ra \npolicyer för acceptabel användning och vÃ¥r integritetspolicy\n
- \nVänligen kontakta OSMF \nom + \nVänligen kontakta OSMF \nom du har frågor eller funderingar om licenser, upphovsrätt eller andra rättsliga - frågor." + frågor.\n
\nOpenStreetMap, förstoringsglaslogotypen och State of the Map + är registrerade + varumärken av OSMF." partners_title: Partners notifier: diary_comment_notification: @@ -1481,13 +1530,13 @@ sv: user_page_link: användarsida anon_edits_link_text: Ta reda på varför det är så. flash_player_required: Du måste ha Flash Player för att kunna använda Potlatch, - OpenStreetMaps flasheditor. Du kan ladda - hem Flash Player från Adobe.com. Det finns också flera - andra editorer tillgängliga för OpenStreetMap. + OpenStreetMaps flasheditor. Du kan ladda + hem Flash Player från Adobe.com. Det finns också flera + andra redigerare tillgängliga för OpenStreetMap. potlatch_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch, bör du avmarkera den nuvarande vägen eller markeringen om du redigerar i realtidsläge, eller klicka på Spara om du har en Spara-knapp.) - potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se http://wiki.openstreetmap.org/wiki/The_Rails_Port + potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se https://wiki.openstreetmap.org/wiki/The_Rails_Port potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch 2, bör du klicka på spara.) id_not_configured: iD har inte konfigurerats @@ -1505,6 +1554,7 @@ sv: where_am_i: Var är detta? where_am_i_title: Beskriv den aktuella platsen med hjälp av sökmotorn submit_text: Gå + reverse_directions_text: Omvända riktningar key: table: entry: @@ -1579,7 +1629,7 @@ sv: edit: Redigera preview: Förhandsgranska markdown_help: - title_html: Tolkat med Markdown + title_html: Tolkat med Markdown headings: Rubriker heading: Rubrik subheading: Underrubrik @@ -1689,7 +1739,7 @@ sv: description: Bläddra bland nyligen uppladdade GPS-spår tagged_with: ' taggad med %{tags}' empty_html: Ingenting här ännu. Ladda upp ett nytt - GPS-spår eller lär dig om GPS-spår på wikin. + GPS-spår eller lär dig om GPS-spår på wikin. delete: scheduled_for_deletion: GPS-spår schemalagt för radering make_public: @@ -1897,10 +1947,10 @@ sv: html: |-

Till skillnad från andra kartor är OpenStreetMap helt skapad av människor som du. Kartan är öppen för alla att bidra till, uppdatera, ladda ner och använda.

Registrera dig för att börja kartera. Vi skickar ett mail för att bekräfta ditt konto.

- license_agreement: När du bekräftar ditt konto mÃ¥ste du samtycka till bidragsgivarvillkoren. + license_agreement: När du bekräftar ditt konto mÃ¥ste du samtycka till bidragsgivarvillkoren. email address: 'E-postadress:' confirm email address: 'Bekräfta e-postadress:' - not displayed publicly: Din adress visas inte offentligt, se vÃ¥r integritetspolicy för mer information display name: 'Visat namn:' @@ -2022,12 +2072,12 @@ sv: email never displayed publicly: (visas aldrig offentligt) external auth: 'Extern autentisering:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: vad är detta? public editing: heading: 'Offentlig redigering:' enabled: Aktiverat, du är inte anonym och kan redigera data. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: vad är detta? disabled: Avstängt och kan inte redigera data, alla redigeringar som gjorts är anonyma. diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 4b41e253c..e6e34af7c 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -258,27 +258,21 @@ ta: crematorium: சுடுகாடு dentist: பல் மருத்துவர்கள் doctors: மருத்துவர்கள் - dormitory: பலர் தூங்கும் இடம் drinking_water: குடிநீர் driving_school: ஓட்டுநர் பயிற்சிப்பள்ளி embassy: தூதரகம் - emergency_phone: அவசர தொலைபேசி fast_food: துரித உணவு fire_station: தீயணைப்பு நிலையம் food_court: உணவுச்சாலை fountain: நீரூற்று fuel: எரிபொருள் grave_yard: இடுகாடு - gym: உடற்பயிற்சி மையம் / ஜிம் - health_centre: சுகாதார மையம் hospital: மருத்துவமனை ice_cream: ஐஸ் கிரீம் kindergarten: சிறு குழந்தைகளுக்கு உரிய (விளையாட்டு முறை) கல்வி கூடம் library: நூலகம் - market: சந்தை marketplace: சந்தை கூடுமிடம் nightclub: இரவு கிளப் - nursery: குழந்தைகள் பள்ளி nursing_home: மருத்துவ இல்லம் office: அலுவலகம் parking: வண்டிகள் நிறுத்துமிடம் @@ -290,7 +284,6 @@ ta: preschool: முன் பள்ளி prison: சிறைச்சாலை public_building: பொது கட்டிடம் - reception_area: வரவேற்பு பகுதி recycling: மறுசுழற்சி புள்ளி restaurant: உணவு விடுதி retirement_home: ஓய்வு இல்லம் @@ -412,7 +405,6 @@ ta: ngo: அரசு சாரா தன்னார்வ அலுவலகம் "yes": அலுவலகம் place: - airport: விமான நிலையம் city: நகரம் country: நாடு county: நாடு @@ -433,7 +425,6 @@ ta: abandoned: கைவிடப்பட்ட தொடர்வண்டி பாதை construction: தொடர்வண்டி பாதை கட்டுமானப் பணிகள் நடந்து கொண்டுள்ளது. halt: ரயில் நிறுத்துமிடம் - historic_station: வரலாற்று சிறப்புமிக்க ரயில் நிலையம் junction: ரயில்வே சந்திப்பு platform: ரயில்வே நடைமேடை station: ரயில் நிலையம் @@ -456,7 +447,6 @@ ta: fish: மீன் கடை food: உணவுக் கடை gallery: காட்சியகம் - insurance: காப்புறுதி jewelry: நகைக் கடை laundry: சலவை market: சந்தை @@ -464,9 +454,7 @@ ta: motorcycle: மோட்டார் சைக்கிள் கடை pet: வளர்ப்பு விலங்குகள் கடை photo: புகைப்பட கடை - salon: முடி திருத்தகம் shoes: காலணிகள் கடை - shopping_centre: ஷாப்பிங் மையம் stationery: எழுதுபொருள் கடை supermarket: பேரங்காடி tourism: diff --git a/config/locales/te.yml b/config/locales/te.yml index abbe0f978..17c8feeb0 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -273,21 +273,16 @@ te: crematorium: శ్మశానవాటిక dentist: దంతవైద్యుడు doctors: వైద్యులు - dormitory: వసతిగృహం drinking_water: త్రాగు నీరు driving_school: డ్రైవింగ్ పాఠశాల embassy: దౌత్య కార్యాలయం - emergency_phone: అత్యవసర ఫోను fast_food: అల్పాహారం fuel: ఇంధనం grave_yard: స్మశానం - health_centre: ఆరోగ్య కేంద్రం hospital: ఆసుపత్రి ice_cream: ఐస్ క్రీం library: గ్రంథాలయం - market: సంత marketplace: సంత - nursery: పిల్లల బడి office: కార్యాలయం parking: పార్కింగు pharmacy: మందుల దుకాణం @@ -410,7 +405,6 @@ te: lawyer: న్యాయవాది "yes": కార్యాలయం place: - airport: విమానాశ్రయం city: నగరం country: దేశం hamlet: కుగ్రామం @@ -426,7 +420,6 @@ te: village: గ్రామం shop: butcher: కసాయి - insurance: బీమా jewelry: నగల దుకాణం laundry: చాకలి market: అంగడి diff --git a/config/locales/th.yml b/config/locales/th.yml index c52151a38..26bb9b380 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -185,7 +185,7 @@ th: wiki_link: key: หน้าคำอธิบายวิกิาสำหรับป้ายระบุ %{key} tag: หน้าคำอธิบายวิกิาสำหรับป้ายระบุ %{key}=%{value} - wikidata_link: รายการ %{page} ที่วิกิข้อมูล + wikidata_link: รายการ %{page} ที่วิกิสนเทศ wikipedia_link: บทความ %{page} ที่วิกิพีเดีย telephone_link: โทรศัพท์ไปเลขหมาย %{phone_number} note: @@ -211,10 +211,10 @@ th: ก่อน hidden_by: ซ่อนโดย %{user} เมื่อ %{when} ก่อน query: - title: คุณสมบัติการสอบถาม + title: ส่วนประกอบในพื้นที่ introduction: คลิกที่แผนที่เพื่อค้นหาคุณสมบัติต่าง ๆ ที่อยู่ใกล้เคียง - nearby: คุณสมบัติที่อยู่ใกล้เคียง - enclosing: คุณสมบัติที่ปิดล้อม + nearby: ส่วนประกอบที่อยู่ใกล้เคียง + enclosing: ส่วนประกอบที่ปิดล้อม changeset: changeset_paging_nav: showing_page: หน้า %{page} @@ -386,11 +386,15 @@ th: chair_lift: รถกระเช้าเปลือย drag_lift: ลิฟต์ลากสกี gondola: รถกระเช้า + platter: กระเช้าลาก + pylon: เสากระเช้า station: สถานีรถกระเช้า aeroway: aerodrome: ลานบิน + airstrip: ลานบินขนาดเล็ก apron: ลานจอดเครื่องบิน gate: ประตูขึ้นเครื่อง + hangar: โรงเก็บเครื่องบิน helipad: ลานจอดเฮลิคอปเตอร์ runway: ทางวิ่งเครื่องบิน taxiway: ทางขับเครื่องบิน @@ -426,37 +430,31 @@ th: crematorium: ฌาปนสถาน dentist: ทันตแพทย์ doctors: แพทย์ - dormitory: หอพักนักศึกษา - drinking_water: น้ำดื่ม + drinking_water: ก๊อกน้ำดื่ม driving_school: โรงเรียนสอนขับรถ embassy: สถานทูต - emergency_phone: โทรศัพท์ฉุกเฉิน fast_food: อาหารจานด่วน ferry_terminal: สถานีเรือข้ามฟาก - fire_hydrant: หัวดับเพลิง fire_station: สถานีดับเพลิง food_court: ศูนย์อาหาร fountain: น้ำพุ fuel: สถานีบริการเชื้อเพลิง gambling: การพนัน grave_yard: สุสาน - gym: สถานออกกำลังกาย - health_centre: ศูนย์สุขภาพ hospital: โรงพยาบาล hunting_stand: บังไพรล่าสัตว์ ice_cream: ร้านไอศกรีม kindergarten: โรงเรียนอนุบาล library: ห้องสมุด - market: ตลาด marketplace: ตลาด monastery: สำนักสงฆ์ motorcycle_parking: ที่จอดรถจักรยานยนต์ nightclub: สถานบันเทิง - nursery: สถานรับเลี้ยงเด็ก nursing_home: สถานสงเคราะห์หรือบ้านพักคนชรา office: สำนักงาน parking: ที่จอดรถ parking_entrance: ทางเข้าที่จอดรถ + parking_space: ซองจอดรถ pharmacy: ร้านขายยา place_of_worship: สถานที่ประกอบพิธีทางศาสนา police: สถานีตำรวจ @@ -466,7 +464,6 @@ th: prison: ทัณฑสถาน pub: ร้านเหล้า public_building: อาคารสาธารณะ - reception_area: พื้นที่ต้อนรับ recycling: จุดรีไซเคิล restaurant: ร้านอาหาร retirement_home: บ้านพักวัยเกษียณ @@ -491,6 +488,7 @@ th: village_hall: ศาลากลางหมู่บ้าน waste_basket: ถังขยะ waste_disposal: ที่ทิ้งขยะ + water_point: จุดเติมน้ำดื่ม youth_centre: ศูนย์เยาวชน boundary: administrative: ขอบเขตการปกครอง @@ -499,6 +497,7 @@ th: protected_area: พื้นที่ปกป้อง bridge: aqueduct: สะพานส่งน้ำ + boardwalk: ทางเดินไม้กระดาน suspension: สะพานแขวน swing: สะพานหันข้าง viaduct: สะพานบก @@ -518,20 +517,24 @@ th: "yes": ร้านงานฝีมือ emergency: ambulance_station: สถานีรถพยาบาล + assembly_point: จุดรวมพล defibrillator: เครื่องช่วยกระตุ้นหัวใจ landing_site: พื้นที่ลงจอดฉุกเฉิน phone: โทรศัพท์ฉุกเฉิน + "yes": อุปกรณ์ฉุกเฉิน highway: abandoned: ทางหลวงที่เลิกใช้แล้ว bridleway: ทางเกวียน bus_guideway: ทางรถสาธารณะชนิดบังคับล้อได้ bus_stop: ที่หยุดรถสาธารณะ construction: ทางหลวงกำลังสร้าง + corridor: ระเบียงทางเดิน cycleway: ทางจักรยาน elevator: ลิฟต์ emergency_access_point: จุดเข้าถึงฉุกเฉิน footway: ทางเดินเท้า ford: ถนนตัดทางน้ำ + give_way: ป้ายให้ทาง living_street: ถนนใช้ร่วมรถและคน milestone: หลักไมล์ motorway: ทางหลวงพิเศษ @@ -552,7 +555,8 @@ th: service: ถนนสำหรับซ่อมบำรุง services: บริการทางหลวงพิเศษ speed_camera: กล้องจับความเร็ว - steps: ขั้น + steps: ขั้นบันใด + stop: ป้ายหยุด street_lamp: ไฟถนน tertiary: ถนนสายย่อย tertiary_link: ถนนสายย่อย @@ -562,7 +566,6 @@ th: trunk: ถนนสายประธาน trunk_link: ถนนสายประธาน unclassified: ถนนที่มิได้จำแนก - unsurfaced: ถนนที่ยังไม่ปูลาด "yes": ถนน historic: archaeological_site: สถานที่ทางโบราณคดี @@ -581,6 +584,7 @@ th: manor: บ้านสวน memorial: อนุสรณ์ mine: เหมือง + mine_shaft: ปล่องเหมืองเก่า monument: อนุสาวรีย์ roman_road: ถนนโรมัน ruins: ซากโบราณสถาน @@ -590,6 +594,7 @@ th: wayside_cross: กางเขนข้างทาง wayside_shrine: ศาลเจ้าข้างทาง wreck: ซากปรักหักพัง + "yes": สถานที่ประวัติศาสตร์ junction: "yes": ทางแยก landuse: @@ -619,7 +624,7 @@ th: reservoir: อ่างเก็บน้ำ reservoir_watershed: สันปันน้ำ residential: เขตที่พักอาศัย - retail: ร้านค้าขายปลีก + retail: พื้นที่ร้านค้า road: พื้นที่ถนน village_green: ลานหญ้าในเขตหมู่บ้าน vineyard: ไร่องุ่น @@ -627,9 +632,9 @@ th: leisure: beach_resort: สถานตากอากาศชายหาด bird_hide: บังไพรดูนก - club: สโมสร common: พื้นที่สาธารณประโยชน์ dog_park: สวนสุนัข + firepit: จุดก่อกองไฟ fishing: พื้นที่ตกปลา fitness_centre: ศูนย์ออกกำลังกาย fitness_station: ศูนย์ออกกำลังกาย @@ -654,15 +659,38 @@ th: water_park: สวนน้ำ "yes": สถานที่เพื่อนันทนาการ man_made: + beacon: เสาไฟสัญญาณ + beehive: คอนเลี้ยงผึ้ง + bridge: สะพาน + chimney: ปล่องไฟ + crane: ปั้นจั่น + dolphin: หลักผูกเรือ + flagpole: เสาธง + gasometer: ถุงเก็บแก๊ส + kiln: เตาเผา lighthouse: ประภาคาร/กระโจมไฟ + mast: เสา + mine: เหมือง + mineshaft: ปล่องเหมือง + monitoring_station: สถานีตรวจอากาศ + petroleum_well: บ่อน้ำมัน pipeline: ท่อส่งน้ำมัน + storage_tank: ถังกักเก็บ + surveillance: กล้องวงจรปิด tower: หอคอย + wastewater_plant: โรงบำบัดน้ำเสีย + watermill: กังหันน้ำ + water_tower: หอเก็บน้ำ + water_well: บ่อน้ำ + water_works: โรงประปา + windmill: กังหันลม works: โรงงาน "yes": ที่มนุษย์สร้างขึ้น military: airfield: สนามบินทหาร barracks: โรงทหาร bunker: หลุมหลบภัย + "yes": เขตทหาร mountain_pass: "yes": ช่องเขา natural: @@ -708,7 +736,9 @@ th: accountant: นักบัญชี administrative: การปกครอง architect: สถาปนิก + association: สมาคม company: บริษัท + educational_institution: สถาบันการศึกษา employment_agency: บริษัทจัดหางาน estate_agent: บริษัทอสังหาริมทรัพย์ government: สำนักงานของรัฐบาล @@ -720,8 +750,6 @@ th: "yes": สำนักงาน place: allotments: ที่ดินแบ่งใช้ - block: ช่วงตึก - airport: สนามบิน city: เมือง country: ประเทศ county: จังหวัด @@ -733,12 +761,12 @@ th: islet: เกาะขนาดเล็ก isolated_dwelling: ที่อยู่อาศัยโดด locality: ชุมชน - moor: ทุ่งหญ้าที่สูง municipality: เทศบาล neighbourhood: ชุมชน postcode: รหัสไปรษณีย์ region: ภูมิภาค sea: ทะเล + square: จตุรัส state: รัฐ subdivision: เขตการปกครองย่อย suburb: ชานเมือง @@ -750,10 +778,8 @@ th: abandoned: ทางรถไฟที่เลิกใช้แล้ว construction: ทางรถไฟกำลังสร้าง disused: ทางรถไฟเลิกใช้แล้ว - disused_station: สถานีรถไฟยุบแล้ว funicular: รถไฟขึ้นลงเนิน halt: ที่หยุดรถไฟ - historic_station: สถานีรถไฟในอดีต junction: ชุมทางรถไฟ level_crossing: ทางผ่านเสมอระดับ light_rail: รถไฟเบา @@ -817,12 +843,15 @@ th: hairdresser: ร้านทำผม hardware: ร้านวัสดุก่อสร้าง hifi: เครื่องเสียง - insurance: ประกันภัย + houseware: ร้านขายเครื่องใช้ในบ้าน jewelry: ร้านเครื่องประดับ kiosk: ร้านแผงลอย + kitchen: ร้านเครื่องครัว laundry: ร้านซักรีด - mall: ห้างสรรพสินค้าขนาดใหญ่ + lottery: ร้านขายสลาก + mall: ศูนย์การค้า market: ตลาด + massage: ร้านนวด mobile_phone: ร้านโทรศัพท์มือถือ motorcycle: ร้านรถจักรยานยนต์ music: ร้านดนตรี @@ -830,19 +859,25 @@ th: optician: จักษุแพทย์ organic: ร้านขายอาหารอินทรีย์ outdoor: ร้านขายอุปกรณ์ผจญภัย + paint: ร้านขายสี + pawnbroker: โรงรับจำนำ pet: ร้านขายสัตว์เลี้ยงและอุปกรณ์ pharmacy: ร้านขายยา photo: ร้านถ่ายภาพ - salon: ร้านทำผมสตรี + seafood: ร้านขายอาหารทะเล second_hand: ร้านขายของมือสอง shoes: ร้านขายรองเท้า - shopping_centre: ห้างสรรพสินค้า sports: ร้านขายอุปกรณ์กีฬา stationery: ร้านขายเครื่องเขียน - supermarket: ห้างสรรพสินค้า + supermarket: ซุปเปอร์มาร์เก็ต tailor: ช่างตัดเสื้อผ้า + ticket: ร้านขายตั๋ว + tobacco: ร้านขายยาสูบ toys: ร้านขายของเล่น travel_agency: ตัวแทนการเดินทาง + tyres: ร้านขายยางรถ + vacant: ร้านทิ้งร้าง + variety_store: ร้านขายของจุกจิก video: ร้านขายภาพยนตร์ wine: ร้านขายสุรา "yes": ร้านค้า @@ -868,6 +903,7 @@ th: viewpoint: จุดชมวิว zoo: สวนสัตว์ tunnel: + building_passage: ทางลอดตึก culvert: ท่อระบายน้ำ "yes": อุโมงค์ waterway: @@ -971,16 +1007,16 @@ th: title_html: ลิขสิทธิ์และสัญญาอนุญาต intro_1_html: |- OpenStreetMap® เป็นข้อมูลเปิดให้ใช้งาน และอนุญาตให้ใช้งานภายใต้สัญญาอนุญาต Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) โดยมูลนิธิ OpenStreetMap (OSMF). + href="https://osmfoundation.org/">มูลนิธิ OpenStreetMap (OSMF). intro_2_html: "ท่านสามารถทำสำเนา แจกจ่าย แพร่ภาพ และปรับใช้ข้อมูลของเรา\nตราบเท่าที่ได้ระบุชื่อ OpenStreetMap ตลอดจนผู้ร่วมจัดทำไว้ในคำขอบคุณหรือที่มา\nถ้าท่านปรับแก้ไขหรือสร้างสรรค์งานใหม่โดยใช้ข้อมูลของเราเป็นพื้น ท่านสามารถ\nแจกจ่ายผลลัพธ์ที่ได้ภายใต้สัญญาอนุญาตเดียวกันเท่านั้น โปรดดู ข้อกำหนดทางกฎหมาย + href=\"https://opendatacommons.org/licenses/odbl/1.0/\">ข้อกำหนดทางกฎหมาย \nซึ่งจะอธิบายสิทธิและหน้าที่ที่ท่านพึงมี" intro_3_html: |- - ภาพร่าง ลายเส้นแผนที่ตามที่ปรากฏ และเอกสารกำกับ อนุญาตให้ใช้งานตามสัญญาอนุญาต Creative + ภาพร่าง ลายเส้นแผนที่ตามที่ปรากฏ และเอกสารกำกับ อนุญาตให้ใช้งานตามสัญญาอนุญาต Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA) credit_title_html: วิธีการแสดงที่มาหรือคำขอบคุณ OpenStreetMap credit_1_html: |- @@ -990,7 +1026,7 @@ th: ท่านจะต้องระบุให้ชัดเจนเจาะจงว่าข้อมูลอนุญาตให้ใช้ตามสัญญาอนุญาต Open Database License และถ้ามีการนำรูปแผนที่ไปใช้ รูปนั้นอนุญาตให้ใช้ตามสัญญาอนุญาต CC BY-SA ในการนี้อาจจะลิงก์ไปยังหน้า - ข้อมูลลิขสิทธิ์ + ข้อมูลลิขสิทธิ์ นอกจากนี้ (จำเป็นหากท่านจ่ายแจกข้อมูล OSM) ท่านสามารถลิงก์ไปยังสัญญาอนุญาตโดยตรง ในสื่ออย่างอื่น อาทิ สิ่งพิมพ์ ซึ่งไม่สามารถลิงก์ข้อมูลได้แนะนำให้ระบุเพียง openstreetmap.org และ/หรือ opendatacommons.org และ/หรือ creativecommons.org @@ -998,10 +1034,10 @@ th: contributors_title_html: ผู้ร่วมสร้างสรรค์ของเรา contributors_at_html: |- ออสเตรีย: มีข้อมูลจาก - Stadt Wien (under - CC BY), - Land Vorarlberg และ - Land Tirol (under CC BY AT with amendments). + Stadt Wien (under + CC BY), + Land Vorarlberg และ + Land Tirol (under CC BY AT with amendments). contributors_ca_html: |- แคนาดา: มีข้อมูลจาก GeoBase®, GeoGratis (© Department of Natural @@ -1012,7 +1048,7 @@ th: ฟินแลนด์: มีข้อมูลจาก ฐานข้อมูลการสำรวจภูมิศาสตร์แห่งชาติฟินแลนด์และฐานข้อมูลอื่น อนุญาตให้ใช้ตาม - สัญญาอนุญาต NLSFI. + สัญญาอนุญาต NLSFI. contributors_fr_html: |- ฝรั่งเศส: มีข้อมูลจากอธิบดีกรมภาษี ( Direction Générale des Impôts) @@ -1084,12 +1120,14 @@ th: welcome: title: ยินดีต้อนรับสู่ OSM beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Th:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Th:Beginners%27_guide title: คำแนะนำสำหรับผู้เริ่มต้น mailing_lists: title: รายการอีเมลรับข่าวสาร forums: title: กระดานสนทนา + irc: + title: ไออาร์ซี about_page: next: ถัดไป used_by: '%{name} - ข้อมูลแผนที่ซึ่งขับเคลื่อนเว็บไซต์ แอปพลิเคชั่นมือถือ และอุปกรณ์นำทางมากมายรอบตัวคุณ' @@ -1397,7 +1435,7 @@ th: edit: แก้ไข preview: แสดงตัวอย่าง markdown_help: - title_html: ตัดอ่านโดย Markdown + title_html: เขียนด้วยรูปแบบ Markdown headings: หัวเรื่องหลัก heading: หัวเรื่องหลัก subheading: หัวเรื่องย่อย @@ -1422,6 +1460,13 @@ th: ซึ่งจะใช้เวลาประมาณครึ่งชั่วโมง เมื่อกระบวนการเรียบร้อยแล้วจะมีอีเมลแจ้งท่านให้ทราบ edit: filename: 'ชื่อแฟ้ม:' + download: ดาวน์โหลด + uploaded_at: 'อัปโหลดเมื่อ:' + points: 'จุด:' + start_coord: 'เริ่มจากตำแหน่ง:' + map: แผนที่ + edit: แก้ไข + tags: 'ป้ายกำกับ:' tags_help: คั่นด้วยจุลภาค save_button: บันทึกการเปลี่ยนแปลง visibility: 'สถานะการแสดง:' @@ -1495,6 +1540,11 @@ th: description_without_count: แฟ้มข้อมูล GPX จากผู้ใช้ %{user} oauth: oauthorize: + title: อนุญาตการเข้าถึงบัญชีของคุณ + allow_to: 'อนุญาตให้โปรแกรมสามารถ:' + allow_read_prefs: อ่านการตั้งค่าผู้ใช้ของคุณ + allow_write_prefs: แก้ไขการตั้งค่าผู้ใช้ของคุณ + allow_write_api: แก้ไขแผนที่ allow_write_notes: แก้ไขหมายเหตุ grant_access: อนุญาตการเข้าถึง oauthorize_success: @@ -1574,6 +1624,8 @@ th: login: title: ลงชื่อเข้าใช้ heading: ลงชื่อเข้าใช้ + email or username: 'อีเมลหรือชื่อผู้ใช้:' + password: 'รหัสผ่าน:' remember: จดจำฉันไว้ในระบบ lost password link: ลืมรหัสผ่านหรือ? login_button: ลงชื่อเข้าใช้ @@ -1615,16 +1667,23 @@ th: lost_password: title: ตั้งรหัสผ่านใหม่ heading: ลืมรหัสผ่านหรือ? + email address: 'ที่อยู่อีเมล:' new password button: ตั้งรหัสผ่านใหม่ reset_password: + title: ตั้งรหัสผ่านใหม่ + heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}' password: 'รหัสผ่าน:' confirm password: 'ยืนยันรหัสผ่าน:' + reset: ตั้งรหัสผ่านใหม่ + flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย new: title: สมัครสมาชิก + about: + header: เสรีและแก้ไขได้ email address: 'ที่อยู่อีเมล:' confirm email address: 'ยืนยันที่อยู่อีเมล:' not displayed publicly: ที่อยู่ของท่านจะไม่แสดงให้บุคคลภายนอกเห็น โปรดดู นโบายความเป็นส่วนบุคคล ถ้าต้องการรายละเอียดเพิ่มเติม display name: 'ชื่อที่ใช้แสดง:' display name description: ชื่อที่แสดงต่อสาธารณะ ท่านสามารถเปลี่ยนในภายหลังได้ในหน้าการตั้งค่า @@ -1665,7 +1724,7 @@ th: my profile: ประวัติของฉัน my settings: การตั้งค่าของฉัน my comments: ความคิดเห็นของฉัน - oauth settings: การตั้งค่าoauth + oauth settings: ตั้งค่าการอนุญาต OAuth blocks on me: ผู้ใช้ที่กีดกันข้าพเจ้า blocks by me: ผู้ใช้ที่ข้าพเจ้ากีดกัน send message: ส่งข้อความ @@ -1688,27 +1747,34 @@ th: spam score: 'คะแนนสแปม:' description: คำอธิบาย user location: ตำแหน่งผู้ใช้ + if set location: เพื่อค้นหาผู้ใช้ที่อยู่ข้างเคียง ให้ตั้งค่าตำแหน่งบ้านในหน้า%{settings_link} settings_link_text: การตั้งค่า your friends: เพื่อนของท่าน no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ km away: ห่างออกไป %{count}km m away: ห่างออกไป %{count}m nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง + no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง comments: ความเห็นที่เขียน create_block: กีดกันผู้ใช้นี้ activate_user: เปิดใช้งานผู้ใช้นี้ deactivate_user: ปิดใช้งานผู้ใช้นี้ + confirm: ยืนยัน popup: your location: ตำแหน่งของคุณ + friend: เพื่อน account: title: แก้ไขบัญชี my settings: การตั้งค่าของฉัน current email address: 'ที่อยู่อีเมลปัจจุบัน:' new email address: 'ที่อยู่อีเมลใหม่:' email never displayed publicly: (จะไม่แสดงต่อสาธารณะ) - external auth: 'การอนุญาตจากภายนอก:' + external auth: 'เชื่อมโยงตัวตนจากบริการอื่น:' openid: link text: นี้คืออะไร? + public editing: + heading: 'แก้ไขโดยเปิดเผย:' + enabled link text: นี้คืออะไร? contributor terms: link text: นี้คืออะไร? profile description: 'คำอธิบายหน้าประวัติส่วนตัว:' @@ -1801,7 +1867,7 @@ th: connection_failed: การเชื่อมต่อกับผู้ให้บริการบัญชีภายนอกล้มเหลว invalid_credentials: ชื่อผู้ใช้และ/หรือรหัสผ่านไม่ถูกต้อง no_authorization_code: ไม่มีรหัสยืนยัน - unknown_signature_algorithm: ขั้นตอนวิธีลายมือชื่อไม่ทราบ + unknown_signature_algorithm: ลายเซ็นดิจิตอลที่ใช้เป็นระบบที่ไม่รู้จัก invalid_scope: ขอบข่ายผิดพลาด auth_association: heading: บัญชีภายนอกของท่านยังมิได้ต่อเชื่อมกับบัญชี OpenStreetMap @@ -1870,6 +1936,9 @@ th: heading: รายการการกีดกันผู้ใช้ empty: ยังไม่มีการกีดกันใด ๆ partial: + show: แสดง + edit: แก้ไข + status: สถานะ next: ถัดไป » previous: « ก่อนหน้า helper: @@ -1878,6 +1947,10 @@ th: title: การกีดกันบน %{name} heading: รายการการกีดกันบน %{name} empty: '%{name} ยังไม่ได้ถูกกีดกัน' + show: + status: สถานะ + show: แสดง + edit: แก้ไข note: rss: title: หมายเหตุแผนที่ บน OpenStreetMap @@ -1889,8 +1962,14 @@ th: share: title: แบ่งปัน cancel: ยกเลิก + image: ภาพ + link: ลิงก์ หรือ HTML + long_link: ลิงก์ + short_link: ลิงก์สั้น + custom_dimensions: กำหนดขนาดแผนที่เอง format: 'รูปแบบ:' scale: 'ขนาด:' + download: ดาวน์โหลด short_url: URL สั้น include_marker: แสดงไอคอนหมุด embed: @@ -1913,12 +1992,14 @@ th: header: ชั้นแผนที่ notes: หมายเหตุแผนที่ data: ข้อมูลแผนที่ + gps: รอยทาง GPS สาธารณะ donate_link_text: site: edit_tooltip: แก้ไขแผนที่ edit_disabled_tooltip: ขยายเพื่อแก้ไขแผนที่ createnote_tooltip: ใส่หมายเหตุลงในแผนที่ - queryfeature_tooltip: สอบถามส่วนประกอบ + queryfeature_tooltip: แสดงส่วนประกอบ + queryfeature_disabled_tooltip: ต้องซูมเข้ามากกว่านี้ จึงจะตรวจสอบส่วนประกอบได้ changesets: show: comment: ความคิดเห็น @@ -1931,6 +2012,9 @@ th: add: เพิ่มหมายเหตุ show: hide: ซ่อน + resolve: ปิดเรื่อง + comment_and_resolve: แสดงความเห็น และปิดเรื่อง + comment: แสดงความเห็น directions: ascend: ลาดขึ้น descend: ลาดลง @@ -1974,7 +2058,7 @@ th: directions_to: เส้นทางมาที่นี่ add_note: เพิ่มหมายเหตุตรงนี้ show_address: แสดงที่อยู่ - query_features: สอบถามส่วนประกอบ + query_features: แสดงส่วนประกอบ centre_map: วางแผนที่ตรงกลางที่นี่ redaction: edit: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 8ff7a4eed..2da4f6726 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -401,33 +401,26 @@ tl: crematorium: Krematoryum dentist: Dentista doctors: Mga manggagamot - dormitory: Dormitoryo drinking_water: Naiinom na Tubig driving_school: Paaralan ng Pagmamaneho embassy: Embahada - emergency_phone: Teleponong Pangsakuna fast_food: Kainang Pangmabilisan ferry_terminal: Himpilan ng Barkong Pangtawid - fire_hydrant: Panubig ng Bumbero fire_station: Himpilan ng Bumbero food_court: Korte ng Pagkain fountain: Bukal fuel: Panggatong gambling: Pagsusugal grave_yard: Sementeryo - gym: Lunduyang Pangkalusugan / Himnasyo - health_centre: Lunduyan ng Kalusugan hospital: Ospital hunting_stand: Pook-tayuan na Pangpangangaso ice_cream: Sorbetes kindergarten: Kindergarten library: Aklatan - market: Pamilihan marketplace: Palengke monastery: Monasteryo motorcycle_parking: Paradahan ng Motorsiklo nightclub: Alibangbang - nursery: Alagaan ng mga Bata nursing_home: Alagaan ng mga Matatanda office: Tanggapan parking: Paradahan @@ -441,7 +434,6 @@ tl: prison: Bilangguan pub: Pangmadlang Bahay public_building: Pangmadlang Gusali - reception_area: Tanggapang Pook recycling: Pook ng Muling Paggamit restaurant: Kainan retirement_home: Tahanan ng Pagreretiro @@ -530,7 +522,6 @@ tl: trunk: Pangunahing Ruta trunk_link: Pangunahing Ruta unclassified: Kalsadang Walang Kaurian - unsurfaced: Kalsadang Hindi Patag "yes": Daan historic: archaeological_site: Pook na Pang-arkeolohiya @@ -672,7 +663,6 @@ tl: travel_agent: Ahensiya ng Paglalakbay "yes": Tanggapan place: - airport: Paliparan city: Lungsod country: Bansa county: Kondehan @@ -684,7 +674,6 @@ tl: islet: Munting Pulo isolated_dwelling: Ilang na Tirahan locality: Lokalidad - moor: Lupang Pugalan ng Tubig municipality: Munisipalidad neighbourhood: Kabahayan postcode: Kodigo ng Koreo @@ -701,10 +690,8 @@ tl: abandoned: Pinabayaang daambakal construction: Kinukumpuning Daambakal disused: Hindi Ginagamit na Daambakal - disused_station: Hindi Ginagamit na Himpilan ng Daambakal funicular: Daambakal sa Matarik na Lupa halt: Hintuan ng Tren - historic_station: Makasaysayang Himpilan ng Daambakal junction: Panulukan ng Daambakal level_crossing: Patag na Tawiran light_rail: Banayad na Riles @@ -764,7 +751,6 @@ tl: hairdresser: Tagapag-ayos ng Buhok hardware: Tindahan ng Hardwer hifi: Hi-Fi - insurance: Seguro jewelry: Tindahan ng Alahas kiosk: Tindahan ng Kubol laundry: Labahan @@ -780,9 +766,7 @@ tl: pet: Tindahan ng Alagang Hayop pharmacy: Botika photo: Tindahan ng Litrato - salon: Salon shoes: Tindahan ng Sapatos - shopping_centre: Lunduyang Pamilihan sports: Tindahang Pampalakasan stationery: Tindahan ng Papel supermarket: Malaking Pamilihan diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 7e7f38f31..052f61446 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -336,7 +336,7 @@ tr: diary_entry: posted_by: '%{link_user} tarafından %{created} tarihinde %{language_link} dilinde gönderildi' - comment_link: Bu girdisi yorumla + comment_link: Bu girdiyi yorumla reply_link: Bu girdiyi yanıtla comment_count: one: 1 yorum @@ -479,33 +479,26 @@ tr: crematorium: Krematoryum dentist: Diş hekimi doctors: Doktorlar - dormitory: Yurt drinking_water: İçme Suyu driving_school: Sürücü Kursu embassy: Elçilik - emergency_phone: Acil Telefon fast_food: Büfe / Fast Food ferry_terminal: Feribot Terminali - fire_hydrant: Yangın musluğu fire_station: Itfaiye food_court: Yiyecek Reyonu fountain: Fıskiye fuel: Petrol ofisi gambling: Kumarhane grave_yard: Mezarlık - gym: Fitness Merkezi / Spor Salonu - health_centre: Sağlık Merkezi hospital: Hastane hunting_stand: Avcılık Standı ice_cream: Dondurma kindergarten: Kreş library: Kütüphane - market: Pazar marketplace: Pazar yeri monastery: Manastır motorcycle_parking: Motosiklet Park Yeri nightclub: Gece Kulübü - nursery: Kreş nursing_home: Huzurevi office: Ofis parking: Otopark @@ -519,7 +512,6 @@ tr: prison: Cezaevi pub: Birahane public_building: Kamu Binası - reception_area: Resepsiyon Alanı recycling: Geri dönüşüm noktası restaurant: Restoran retirement_home: Bakımevi @@ -615,7 +607,6 @@ tr: trunk: Bölünmüş anayol trunk_link: Bölünmüş anayol bağlantısı unclassified: Sınıflandırılmamış yolu - unsurfaced: Ham yolu "yes": Yol historic: archaeological_site: Arkeolojik Alan @@ -680,7 +671,6 @@ tr: leisure: beach_resort: Plajlı tatilköyü bird_hide: Kuş Gözleme Yeri - club: Klüb common: Genel Arazi dog_park: Köpek Parkı fishing: Balıkçılık alanı @@ -773,8 +763,6 @@ tr: "yes": Ofis place: allotments: Bostan - block: Blok - airport: Havaalanı city: Büyükşehir / Ä°l Merkezi country: Ülke county: Ä°lçe @@ -786,7 +774,6 @@ tr: islet: Adacık isolated_dwelling: Ä°zole Konut locality: Yer/mevkii - moor: Bataklık municipality: Belediye neighbourhood: Mahalle postcode: Posta kodu @@ -803,10 +790,8 @@ tr: abandoned: Terkedilmiş Demiryolu construction: Yapım aşamasındaki demiryolları disused: Kullanılmayan Demiryolu - disused_station: Kullanılmayan Tren Ä°stasyonu funicular: Füniküler hattı halt: Tren Durağı - historic_station: Tarihi tren istasyonu junction: Demiryolu Kavşağı level_crossing: Demiryolu Geçidi light_rail: Hafif raylı demiryolu @@ -870,7 +855,6 @@ tr: hairdresser: Kuaför hardware: Hırdavatçı hifi: Hi-Fi - insurance: Sigorta jewelry: Kuyumcu kiosk: Tekel Bayii laundry: Çamaşırhane @@ -886,10 +870,8 @@ tr: pet: Hayvan Mağazası pharmacy: Eczane photo: Fotoğrafçı - salon: Kuaför second_hand: Ä°kinci El Dükkânı shoes: Ayakkabı Dükkânı - shopping_centre: Alışveriş Merkezi sports: Spor Malzemeleri Mağazası stationery: Kırtasiye supermarket: Süpermarket @@ -2442,10 +2424,22 @@ tr: uturn_without_exit: '%{name} boyunca U dönüşü' sharp_left_without_exit: '%{name} üstünden sola keskin dönüş' turn_left_without_exit: '%{name} üstünden sola dönün' + offramp_left_without_exit: Soldaki rampayı kullanarak %{name} girin + onramp_left_without_exit: Rampadan sola dönerek %{name} girin + endofroad_left_without_exit: Yolun sonunda sola %{name} yönünde dönün + merge_left_without_exit: '%{name} üzerine soldan birleşin' + fork_left_without_exit: Çataldan sola doğru %{name} üzerine + slight_left_without_exit: '%{name} üzerinden hafif sola' + via_point_without_exit: (geçiş noktası) + follow_without_exit: '%{name} takip et' + roundabout_without_exit: Dönel kavşakta %{name} gidiniz leave_roundabout_without_exit: Kavşaktan ayrıl - %{name} stay_roundabout_without_exit: Kavşakta kal - %{name} + start_without_exit: '%{name} bitişinden başlayın' destination_without_exit: Hedefe ulaş - roundabout_with_exit: Dönel kavşakta %{exit} çıkışı kullanarak %{name} üzerine + roundabout_with_exit: Dönel kavşakta %{exit}. çıkışı kullanarak %{name} üzerine + slight_left_with_exit: Dönel kavşakta %{name} üzerine hafif sola + slight_right_with_exit: Dönel kavşakta %{name} üzerine hafif sağa unnamed: adsız yol time: Zaman query: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b9592a98e..f17f2d5ad 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -17,6 +17,7 @@ # Author: Green Zero # Author: KEL # Author: Macofe +# Author: Movses # Author: Mykola Swarnyk # Author: Nemo bis # Author: Olvin @@ -158,6 +159,8 @@ uk: title_comment: Набір змін %{id} — %{comment} join_discussion: Увійдіть в систему, щоб приєднатися до обговорення discussion: Обговорення + still_open: Набір змін досі відкритий - обговорення буде відкрито, як тільки + набір змін закриють. node: title: 'Точка: %{name}' history_title: 'Історія точки: %{name}' @@ -468,33 +471,26 @@ uk: crematorium: Крематорій dentist: Стоматологія doctors: Лікарі - dormitory: Гуртожиток drinking_water: Питна вода driving_school: Автошкола embassy: Амбасада - emergency_phone: Телефон для екстрених викликів fast_food: Швидке харчування ferry_terminal: Поромна станція - fire_hydrant: Пожежний гідрант fire_station: Пожежна станція food_court: Фуд-корт fountain: Фонтан fuel: Пальне gambling: Азартні ігри grave_yard: Цвинтар - gym: Тренажерний зал - health_centre: Лікарня hospital: Шпиталь hunting_stand: Мисливська вежа ice_cream: Морозиво kindergarten: Дитячий садок library: Бібліотека - market: Ринок marketplace: Ринок monastery: Монастир motorcycle_parking: Стоянка мотоциклів nightclub: Нічний клуб - nursery: Ясла nursing_home: Будинок престарілих office: Офіс parking: Стоянка @@ -508,7 +504,6 @@ uk: prison: В’язниця pub: Паб public_building: Громадський заклад - reception_area: Зона прийому recycling: Місце переробки відходів restaurant: Ресторан retirement_home: Будинок для людей похилого віку @@ -604,7 +599,6 @@ uk: trunk: Шосе trunk_link: З’їзд з/на шосе unclassified: Дорога без класифікації - unsurfaced: Дорога без покриття "yes": Дорога historic: archaeological_site: Археологічні дослідження @@ -669,7 +663,6 @@ uk: leisure: beach_resort: Пляжний курорт bird_hide: Засідка (пункт спостереження за птахами) - club: Клуб common: Громадська земля dog_park: Майданчик для собак fishing: Район риболовлі @@ -762,8 +755,6 @@ uk: "yes": Офіси place: allotments: Сади-городи, дачні ділянки - block: Квартал - airport: Аеропорт city: Місто country: Країна county: Район @@ -775,7 +766,6 @@ uk: islet: Острівець isolated_dwelling: Окреме господарство locality: Місцевість - moor: Якірна стоянка municipality: Муніципалітет neighbourhood: Мікрорайон postcode: Індекс @@ -792,10 +782,8 @@ uk: abandoned: Занедбані колії construction: Будівництво колії disused: Покинута колія - disused_station: Покинута залізнична станція funicular: Фунікулер halt: Зупинка поїзда - historic_station: Історична залізнична станція junction: Переїзд level_crossing: Залізничний переїзд light_rail: Швидкісний трамвай @@ -859,7 +847,6 @@ uk: hairdresser: Перукарня hardware: Господарські товари hifi: Аудіо-техніка - insurance: Страхування jewelry: Ювелірний магазин kiosk: Кіоск laundry: Пральня @@ -875,10 +862,8 @@ uk: pet: Зоомагазин pharmacy: Аптека photo: Фотомагазин - salon: Салон second_hand: Комісійний магазин shoes: Взуття - shopping_centre: Торговий центр sports: Спортивні товари stationery: Канцтовари supermarket: Супермаркет @@ -1199,8 +1184,8 @@ uk: тематичних або регіональних списків розсилки. forums: title: Форуми - description: Запитання та дискусії для тих, хто віддає перевагу інтерфейсу дошки - обговорень. + description: Запитання та обговорення для тих, хто віддає перевагу інтерфейсу + дошки обговорень. irc: title: IRC description: Інтерактивний чат багатьма мовами на багато тем. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 53e2557bf..72eb9f6bf 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -136,6 +136,8 @@ vi: title_comment: Bộ thay đổi %{id} – %{comment} join_discussion: Đăng nhập để tham gia thảo luận discussion: Thảo luận + still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được + đóng. node: title: 'Nốt: %{name}' history_title: 'Lịch sá»­ Nốt: %{name}' @@ -341,7 +343,7 @@ vi: map_image: Hình Bản đồ (Lớp Chuẩn) embeddable_html: HTML để Nhúng licence: Giấy phép - export_details: Dữ liệu OpenStreetMap được phép sá»­ dụng theo Giấy + export_details: Dữ liệu OpenStreetMap được phép sá»­ dụng theo Giấy phép CÆ¡ sở dữ liệu Mở Open Data Commons (ODbL). too_large: advice: 'Nếu việc xuất dữ liệu ở trên bị thất bại, hãy nghÄ© đến việc sá»­ dụng @@ -381,14 +383,14 @@ vi: geocoder: search: title: - latlon: Kết quả nội bộ + latlon: Kết quả nội bộ uk_postcode: Kết quả NPEMap / FreeThe Postcode - ca_postcode: Kết quả Geocoder.CA - osm_nominatim: Kết quả OpenStreetMap + ca_postcode: Kết quả Geocoder.CA + osm_nominatim: Kết quả OpenStreetMap Nominatim geonames: Kết quả GeoNames - osm_nominatim_reverse: Kết quả OpenStreetMap + osm_nominatim_reverse: Kết quả OpenStreetMap Nominatim geonames_reverse: Kết quả GeoNames search_osm_nominatim: @@ -438,33 +440,26 @@ vi: crematorium: Lò Hỏa táng dentist: Nha sÄ© doctors: Bác sÄ© - dormitory: Ký túc xá drinking_water: Vòi Nước uống driving_school: Trường Lái xe embassy: Tòa Đại sứ - emergency_phone: Điện thoại Khẩn cấp fast_food: Nhà hàng Ăn nhanh ferry_terminal: Trạm Phà - fire_hydrant: Trụ Cứu hỏa fire_station: Trạm Cứu hỏa food_court: Khu Ẩm thá»±c fountain: Vòi nước fuel: Cây xăng gambling: Xe Cáp treo Lớn grave_yard: NghÄ©a địa - gym: Nhà Thể dục - health_centre: Trung tâm Y tế hospital: Bệnh viện hunting_stand: Ghế Dá»±ng để Săn bắn ice_cream: Tiệm Kem kindergarten: Tiểu học library: ThÆ° viện - market: Chợ marketplace: Chợ phiên monastery: Nhà tu motorcycle_parking: Chỗ Đậu Xe máy nightclub: Câu lạc bộ Đêm - nursery: Nhà trẻ nursing_home: Viện Dưỡng lão office: Văn phòng parking: Chỗ Đậu xe @@ -478,7 +473,6 @@ vi: prison: Nhà tù pub: Quán rượu public_building: Tòa nhà Công cộng - reception_area: Phòng Tiếp khách recycling: Trung tâm hoặc Thùng Tái sinh restaurant: Nhà hàng retirement_home: Nhà về hÆ°u @@ -574,7 +568,6 @@ vi: trunk: Xa lộ trunk_link: Xa lộ unclassified: Ngõ - unsurfaced: Đường Không Lát "yes": Đường historic: archaeological_site: Khu vá»±c Khảo cổ @@ -639,7 +632,6 @@ vi: leisure: beach_resort: Khu Nghỉ mát Ven biển bird_hide: Căn nhà Quan sát Chim - club: Câu lạc bộ common: Đất Công dog_park: Công viên Chó fishing: Hồ Đánh cá @@ -732,8 +724,6 @@ vi: "yes": Văn phòng place: allotments: Khu Vườn Gia đình - block: Khối phố - airport: Sân bay city: Thành phố country: Quốc gia county: Quận hạt @@ -745,7 +735,6 @@ vi: islet: Đảo Nhỏ isolated_dwelling: Chỗ ở Cô đơn locality: Địa phÆ°Æ¡ng - moor: Truông municipality: Đô thị neighbourhood: Hàng xóm postcode: Mã BÆ°u chính @@ -762,10 +751,8 @@ vi: abandoned: Đường sắt Bỏ hoang construction: Đường sắt Đang Xây disused: Đường sắt Không hoạt động - disused_station: Nhà ga Đóng cá»­a funicular: Đường sắt Leo núi halt: Ga Xép - historic_station: Nhà ga Lịch sá»­ junction: Ga Đầu mối level_crossing: Điểm giao Đường sắt light_rail: Đường sắt Nhẹ @@ -829,7 +816,6 @@ vi: hairdresser: Tiệm Làm tóc hardware: Tiệm NgÅ© kim hifi: Cá»­a hàng Hi-fi - insurance: Bảo hiểm jewelry: Tiệm Kim hoàn kiosk: Quán laundry: Tiệm Giặt Quần áo @@ -845,10 +831,8 @@ vi: pet: Tiệm Vật nuôi pharmacy: Nhà thuốc photo: Tiệm Rá»­a Hình - salon: Tiệm Làm tóc second_hand: Tiệm Mua lại shoes: Tiệm Giày - shopping_centre: Trung tâm Mua sắm sports: Tiệm Thể thao stationery: Tiệm Văn phòng phẩm supermarket: Siêu thị @@ -911,7 +895,7 @@ vi: level10: Biên giới Khu phố description: title: - osm_nominatim: Vị trí từ OpenStreetMap + osm_nominatim: Vị trí từ OpenStreetMap Nominatim geonames: Vị trí từ GeoNames types: @@ -946,8 +930,8 @@ vi: intro_text: OpenStreetMap là bản đồ thế giới do những người nhÆ° bạn xây dá»±ng và cho phép sá»­ dụng thoải mái theo một giấy phép nguồn mở. intro_2_create_account: Mở tài khoản mới - partners_html: Dịch vụ nhờ sá»± hỗ trợ hosting của %{ucl}, %{ic}, và %{bytemark}, - cÅ©ng nhÆ° %{partners} khác. + partners_html: Dịch vụ nhờ sá»± hỗ trợ hosting của %{ucl}, %{bytemark}, %{ic}, và + %{partners} khác. partners_ucl: UCL partners_ic: Đại học Hoàng gia Luân Đôn partners_bytemark: Bytemark Hosting @@ -986,16 +970,16 @@ vi: title_html: Bản quyền và Giấy phép intro_1_html: |- OpenStreetMap® là dữ liệu mở được phát hành theo Giấy phép CÆ¡ sở dữ liệu Mở của Open Data - Commons (ODbL) bởi OpenStreetMap Foundation (OSMF). + href="https://opendatacommons.org/licenses/odbl/">Giấy phép CÆ¡ sở dữ liệu Mở của Open Data + Commons (ODbL) bởi OpenStreetMap Foundation (OSMF). intro_2_html: Bạn được tá»± do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sá»­a đổi hoặc tạo sản phẩm dá»±a trên các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy - phép. Mã pháp lý + phép. Mã pháp lý đầy đủ giải thích các quyền và trách nhiệm của bạn. intro_3_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành - theo giấy phép Creative + theo giấy phép Creative \nCommons Ghi công–Chia sẻ tÆ°Æ¡ng tá»± 2.0 (CC BY-SA)." credit_title_html: Cách ghi công OpenStreetMap credit_1_html: Chúng tôi bắt bạn phải sá»­ dụng lời ghi công “© những người đóng @@ -1003,7 +987,7 @@ vi: credit_2_html: Bạn cÅ©ng phải giải thích rõ rằng dữ liệu được phát hành theo Giấy phép CÆ¡ sở dữ liệu Mở, và, nếu bạn đang sá»­ dung các hình ảnh bản đồ của chúng tôi, rằng các hình ảnh này được phát hành theo giấy phép CC BY-SA. Bạn - có thể thỏa mãn điều này bằng cách đặt liên kết đến trang + có thể thỏa mãn điều này bằng cách đặt liên kết đến trang bản quyền này. Nếu bạn đang phân phối nguyên dữ liệu của OSM hoặc không muốn đặt liên kết đến trang bản quyền của OSM, bạn có thể nói đến và đặt liên kết trá»±c tiếp đến (các) giấy phép. Nếu bạn đang sá»­ dụng phÆ°Æ¡ng tiện không @@ -1018,9 +1002,9 @@ vi: alt: Ví dụ ghi công OpenStreetMap trên một trang Web title: Ví dụ ghi công more_title_html: Tìm hiểu thêm - more_1_html: |- - Hãy đọc thêm chi tiết về việc sá»­ dụng dữ liệu của chúng tôi và cách ghi công chúng tôi tại OSMF Licence page and the community Hỏi đáp Pháp lý. + more_1_html: Hãy đọc thêm chi tiết về việc sá»­ dụng dữ liệu của chúng tôi và + cách ghi công chúng tôi tại trang + giấy phép Quỹ OSM. more_2_html: Tuy OpenStreetMap là một nguồn dữ liệu mở, nhÆ°ng chúng tôi không thể cung cấp API miễn phí cho bên thứ ba truy cập bản đồ. Hãy xem Quy định Sá»­ dụng API, Quy @@ -1030,22 +1014,22 @@ vi: contributors_intro_html: 'Dá»± án này nhờ công sức đóng góp của hàng ngàn cá nhân và cÅ©ng bao gồm các dữ liệu có giấy phép mở từ các cÆ¡ quan khảo sát quốc gia và những nguồn gốc khác, chẳng hạn:' - contributors_at_html: 'Áo: Bao gồm dữ liệu từ Bang - Viên (theo CC - BY), Bang - Vorarlberg, và Bang Tyrol (theo bản + contributors_at_html: 'Áo: Bao gồm dữ liệu từ Bang + Viên (theo CC + BY), Bang + Vorarlberg, và Bang Tyrol (theo bản sá»­a đổi CC BY Áo).' contributors_ca_html: 'Canada: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada).' contributors_fi_html: "Phần Lan: Chứa dữ liệu từ\nCÆ¡ sở dữ liệu Địa hình của Cục Khảo sát Địa lý Quốc gia Phần Lan (NLS) và các tập hợp - dữ liệu khác theo \nGiấy + dữ liệu khác theo \nGiấy phép dữ liệu mở NLS." contributors_fr_html: 'Pháp: Bao gồm dữ liệu từ Sở thuế Pháp (Direction générale des Impôts).' contributors_nl_html: 'Hà Lan: Bao gồm dữ liệu © 2007 AND (www.and.com)' + href="https://www.and.com">www.and.com)' contributors_nz_html: 'New Zealand: Bao gồm dữ liệu bắt nguồn từ Land Information New Zealand. Bản quyền Crown Copyright được bảo lÆ°u.' contributors_si_html: "Slovenia: Bao gồm dữ liệu từ \nCÆ¡ @@ -1058,7 +1042,7 @@ vi: Survey © bản quyền Crown Copyright và quyền cÆ¡ sở dữ liệu 2010–12.' contributors_footer_1_html: |- Xem thêm chi tiết và các nguồn gốc khác dùng để cải tiến OpenStreetMap tại trang Người đóng góp trên OpenStreetMap Wiki. + href="https://wiki.openstreetmap.org/wiki/Contributors?uselang=vi">trang Người đóng góp trên OpenStreetMap Wiki. contributors_footer_2_html: ' Việc bao gồm dữ liệu trong OpenStreetMap không ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sá»± chính xác của nó, hoặc nhận trách nhiệm pháp lý nào.' @@ -1068,14 +1052,14 @@ vi: các bản đồ trên giấy) trước khi các nhà giữ bản quyền cho phép rõ ràng. infringement_2_html: Nếu bạn tin rằng tài liệu có bản quyền đã được bổ sung vào cÆ¡ sở dữ liệu OpenStreetMap hoặc trang này một cách không thích đáng, - xin vui lòng tham khảo quá + xin vui lòng tham khảo quá trình takedown hoặc nộp đơn trá»±c tiếp tại trang khiếu nại trá»±c tuyến của chúng tôi. trademarks_title_html: Nhãn hiệu trademarks_1_html: OpenStreetMap, biểu trÆ°ng kính lúp, và State of the Map đều là nhãn hiệu đăng ký của Quỹ OpenStreetMap. Nếu bạn có thắc mắc về cách sá»­ - dụng các nhãn hiệu này, xin vui lòng liên lạc với Nhóm - làm việc Giấy phép. + dụng các nhãn hiệu này, xin vui lòng tham khảo Quy + định về nhãn hiệu của chúng tôi. welcome_page: title: Hoan nghênh! introduction_html: Chào mừng bạn đã đến OpenStreetMap, bản đồ thế giới có dữ liệu @@ -1107,8 +1091,8 @@ vi: paragraph_1_html: "OpenStreetMap có ít quy định chính thức, nhÆ°ng chúng ta mong muốn tất cả mọi người tham gia mà cộng tác và giao thiệp với cộng đồng. Nếu bạn tính hoạt động ngoài việc sá»­a đổi thủ công, xin vui lòng đọc và tuân theo - các hướng dẫn về việc nhập - và \ntá»± + các hướng dẫn về việc nhập + và \ntá»± động sá»­a đổi." questions: title: Có thắc mắc? @@ -1140,7 +1124,7 @@ vi: title: Vấn đề khác 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 + 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. help_page: title: Trợ giúp @@ -1151,7 +1135,7 @@ vi: title: Chào mừng đến với OSM description: Bắt đầu với cẩm nang các điều cÆ¡ bản OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Vi:Beginners%27_guide title: Hướng dẫn Bắt đầu description: Hướng dẫn bắt đầu do cộng đồng biên tập. help: @@ -1174,7 +1158,7 @@ vi: description: Trợ giúp cho những công ty và tổ chức muốn đổi qua các bản đồ và dịch vụ dá»±a trên OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi + url: https://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi title: wiki.openstreetmap.org description: Đọc tài liệu đầy đủ về OSM trên wiki. about_page: @@ -1193,8 +1177,8 @@ vi: community_driven_html: |- Cộng đồng của OpenStreetMap gồm đủ loại người nhiệt tình và càng ngày càng phát triển. Cộng đồng gồm những người tình nguyện vẽ bản đồ, các chuyên gia GIS, các kỹ sÆ° bảo quản các máy chủ OSM. Chúng ta vẽ bản đồ quê hưởng, những nÆ¡i du lịch, những nÆ¡i bị thiên tai (để hỗ trợ cÆ¡ quan nhân đạo), và nhiều hÆ¡n nữa. - Để tìm hiểu thêm về cộng đồng này, hãy đọc các nhật ký của người dùng, - blog của cộng đồng, và trang chủ Quỹ OSM. + Để tìm hiểu thêm về cộng đồng này, hãy đọc Blog OpenStreetMap, các nhật ký của người dùng, + blog của cộng đồng, và trang chủ Quỹ OSM. open_data_title: Dữ liệu Mở open_data_html: 'OpenStreetMap là dữ liệu mở: bạn được tá»± do sá»­ dụng nó cho bất cứ mục đích nào, miễn là bạn ghi công OpenStreetMap và những người đóng @@ -1204,9 +1188,11 @@ vi: Bản quyền và Giấy phép.' legal_title: Pháp luật legal_html: |- - Trang Web này và nhiều dịch vụ có liên quan được hoạt động chính thức bởi Quỹ OpenStreetMap (OSMF) thay mặt cho cộng đồng. Việc sá»­ dụng các dịch vụ do OSMF hoạt động phải tuân theo các Quy định Sá»­ dụng Hợp lý và Quy định về Quyền Riêng tÆ° của chúng tôi. + Trang Web này và nhiều dịch vụ có liên quan được hoạt động chính thức bởi Quỹ OpenStreetMap (OSMF) thay mặt cho cộng đồng. Việc sá»­ dụng các dịch vụ do OSMF hoạt động phải tuân theo các Quy định Sá»­ dụng Hợp lý và Quy định về Quyền Riêng tÆ° của chúng tôi. +
+ Xin vui lòng liên lạc với OSMF nếu bạn có thắc mắc về giấy phép, bản quyền, hoặc thắc mắc khác về pháp luật.
- Xin vui lòng liên lạc với OSMF nếu bạn có thắc mắc về giấy phép, bản quyền, hoặc vấn đề pháp luật khác. + OpenStreetMap, biểu trưng kính lúp, và State of the Map đều là nhãn hiệu đăng ký của Quỹ OSM. partners_title: Nhà bảo trợ notifier: diary_comment_notification: @@ -1411,14 +1397,14 @@ vi: user_page_link: trang cá nhân anon_edits_link_text: Tại sao vậy? flash_player_required: Bạn cần có Flash Player để sử dụng Potlatch, trình vẽ - OpenStreetMap bằng Flash. Bạn có thể tải - về Flash Player từ Adobe.com. Cũng có sẵn vài + OpenStreetMap bằng Flash. Bạn có thể tải + về Flash Player từ Adobe.com. Cũng có sẵn vài cách khác để sửa đổi OpenStreetMap. potlatch_unsaved_changes: Bạn có thay đổi chưa lưu. (Để lưu trong Potlatch, hãy bỏ chọn lối hoặc địa điểm đang được chọn, nếu đến sửa đổi trong chế độ Áp dụng Ngay, hoặc bấm nút Lưu nếu có.) potlatch2_not_configured: Potlatch 2 chưa được thiết lập. Xem thêm chi tiết - tại http://wiki.openstreetmap.org/wiki/The_Rails_Port?uselang=vi + tại https://wiki.openstreetmap.org/wiki/The_Rails_Port?uselang=vi potlatch2_unsaved_changes: Bạn chưa lưu một số thay đổi. (Trong Potlatch 2, bấm nút “Save” để lưu thay đổi.) id_not_configured: iD chưa được cấu hình @@ -1436,6 +1422,7 @@ vi: where_am_i: Đây là đâu? where_am_i_title: Miêu tả vị trí đang ở dùng máy tìm kiếm submit_text: Đi + reverse_directions_text: Đảo ngược key: table: entry: @@ -1510,7 +1497,7 @@ vi: edit: Sửa đổi preview: Xem trước markdown_help: - title_html: Trang trí dùng cú pháp Markdown + title_html: Trang trí dùng cú pháp Markdown headings: Đề mục heading: Đề mục subheading: Đề mục con @@ -1620,7 +1607,7 @@ vi: description: Xem những tuyến đường GPS được tải lên gần đây tagged_with: ' có thẻ %{tags}' empty_html: Chưa có gì ở đây. Tải lên tuyến đường mới - hoặc tìm hiểu thêm về tuyến đường GPS tại trang + hoặc tìm hiểu thêm về tuyến đường GPS tại trang wiki. delete: scheduled_for_deletion: Tuyến đường chờ được xóa @@ -1827,13 +1814,13 @@ vi: html: |-

Khác với mọi bản đồ khác, OpenStreetMap hoàn toàn được xây dựng bởi những người như bạn và cho phép mọi người chỉnh sửa, cập nhật, tải về, và sử dụng miễn phí cho bất kỳ mục đích.

Hãy mở tài khoản để bắt đầu đóng góp. Chúng tôi sẽ gửi thư điện tử để xác nhận tài khoản của bạn.

- license_agreement: Lúc khi xác nhận tài khoản, bạn sẽ phải chấp nhận các + license_agreement: Lúc khi xác nhận tài khoản, bạn sẽ phải chấp nhận các Điều kiện Đóng góp. email address: 'Địa chỉ Thư điện tử:' confirm email address: 'Xác nhận Địa chỉ Thư điện tử:' not displayed publicly: Địa chỉ thư điện tử của bạn không được hiển thị công - khai (xem thêm chi tiết trong quy + khai (xem thêm chi tiết trong quy định quyền riêng tư của chúng tôi) display name: 'Tên hiển thị:' display name description: Tên người dùng của bạn được hiển thị công khai. Bạn @@ -1957,12 +1944,12 @@ vi: email never displayed publicly: (không lúc nào hiện công khai) external auth: 'Xác minh Bên ngoài:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: đây là gì? public editing: heading: 'Sửa đổi công khai:' enabled: Kích hoạt. Không vô danh và có thể sửa đổi dữ liệu. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi enabled link text: đây là gì? disabled: Vô hiệu. Không thể sửa đổi dữ liệu. Tất cả các sửa đổi truớc là vô danh. @@ -1970,7 +1957,7 @@ vi: public editing note: heading: Sửa đổi công khai text: |- - Các sửa đổi của bạn đang vô danh, và không ai có thể gửi thư cho bạn hay xem bạn ở đâu. Để cho phép mọi người biết bạn sửa đổi gì và gửi thư cho bạn dùng trang Web, bấm nút ở dưới. Từ lúc đổi qua phiên bản 0.6 của API, chỉ có những người dùng công khai có quyền sửa đổi dữ liệu bản đồ (tìm hiểu tại sao). + Các sửa đổi của bạn đang vô danh, và không ai có thể gửi thư cho bạn hay xem bạn ở đâu. Để cho phép mọi người biết bạn sửa đổi gì và gửi thư cho bạn dùng trang Web, bấm nút ở dưới. Từ lúc đổi qua phiên bản 0.6 của API, chỉ có những người dùng công khai có quyền sửa đổi dữ liệu bản đồ (tìm hiểu tại sao).