From: John Firebaugh Date: Sat, 16 Nov 2013 00:47:49 +0000 (-0800) Subject: Merge branch 'master' into redesign X-Git-Tag: live~4661^2~53 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2b4f8e92c969a5508b73ae7af45811a118fda6b1?hp=5ddab68c11ad7ac85bf3b80e250aa4454292a53c Merge branch 'master' into redesign Conflicts: app/controllers/browse_controller.rb app/views/layouts/_head.html.erb config/environments/production.rb config/routes.rb --- diff --git a/CONFIGURE.md b/CONFIGURE.md index 7feae6a1e..8cae440bd 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -31,9 +31,9 @@ To give administrator or moderator permissions: $ bundle exec rails console >> user = User.find_by_display_name("My New User Name") => #[ ... ] ->> user.roles.create( {:role => "administrator", :granter_id => user.id}, :without_protection => true) +>> user.roles.create(:role => "administrator", :granter_id => user.id) => #[ ... ] ->> user.roles.create( {:role => "moderator", :granter_id => user.id}, :without_protection => true) +>> user.roles.create(:role => "moderator", :granter_id => user.id) => #[ ... ] >> user.save! => true diff --git a/Gemfile b/Gemfile index 1521ea0e6..958824e82 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '4.0.0' +gem 'rails', '4.0.1' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 diff --git a/Gemfile.lock b/Gemfile.lock index 27b5f5fa7..08bb2f1c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,43 +2,43 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) + actionmailer (4.0.1) + actionpack (= 4.0.1) + mail (~> 2.5.4) + actionpack (4.0.1) + activesupport (= 4.0.1) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-page_caching (1.0.0) - actionpack (>= 4.0.0.beta, < 5.0) - activemodel (4.0.0) - activesupport (= 4.0.0) + actionpack-page_caching (1.0.1) + actionpack (>= 4.0.0, < 5) + activemodel (4.0.1) + activesupport (= 4.0.1) builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) + activerecord (4.0.1) + activemodel (= 4.0.1) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) + activesupport (= 4.0.1) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) + activesupport (4.0.1) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.0) + arel (4.0.1) atomic (1.1.14) bigdecimal (1.1.0) builder (3.1.4) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.2) + cocaine (0.5.3) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.0.0) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0.beta, < 5.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs @@ -63,7 +63,7 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.1) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) @@ -77,9 +77,9 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25) - mini_portile (0.5.1) + mini_portile (0.5.2) minitest (4.7.5) - multi_json (1.8.1) + multi_json (1.8.2) multi_xml (0.5.5) multipart-post (1.2.0) nokogiri (1.6.0) @@ -101,10 +101,10 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.2) i18n - paperclip (3.5.1) + paperclip (3.5.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) - cocaine (~> 0.5.0) + cocaine (~> 0.5.3) mime-types pg (0.17.0) polyglot (0.3.3) @@ -113,25 +113,25 @@ GEM rack (1.5.2) rack-cors (0.2.8) rack - rack-openid (1.3.1) + rack-openid (1.4.0) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.0.1) + actionmailer (= 4.0.1) + actionpack (= 4.0.1) + activerecord (= 4.0.1) + activesupport (= 4.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) + railties (= 4.0.1) sprockets-rails (~> 2.0.0) rails-i18n (4.0.0) i18n (~> 0.6) rails (~> 4.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (4.0.1) + actionpack (= 4.0.1) + activesupport (= 4.0.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) @@ -141,8 +141,8 @@ GEM sanitize (2.0.6) nokogiri (>= 1.4.4) sass (3.2.12) - sass-rails (4.0.0) - railties (>= 4.0.0.beta, < 5.0) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) sprockets (2.10.0) @@ -150,7 +150,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) + sprockets-rails (2.0.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -162,10 +162,10 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) - uglifier (2.2.1) + tzinfo (0.3.38) + uglifier (2.3.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) validates_email_format_of (1.5.3) vendorer (0.1.14) @@ -200,7 +200,7 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.0.0) + rails (= 4.0.1) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) diff --git a/app/assets/javascripts/pngfix.js b/app/assets/javascripts/pngfix.js deleted file mode 100644 index e6ca5d6f7..000000000 --- a/app/assets/javascripts/pngfix.js +++ /dev/null @@ -1,25 +0,0 @@ -function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher. -{ - for(var i=0; i 0 && !img.id.match(/^OpenLayers/)) - { - var imgID = (img.id) ? "id='" + img.id + "' " : "" - var imgClass = (img.className) ? "class='" + img.className + "' " : "" - var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' " - var imgStyle = "display:inline-block;" + img.style.cssText - if (img.align == "left") imgStyle = "float:left;" + imgStyle - if (img.align == "right") imgStyle = "float:right;" + imgStyle - if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle - var strNewHTML = "" - img.outerHTML = strNewHTML - i = i-1 - } - } -} -window.attachEvent("onload", correctPNG); diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 6b8acbe71..091744e22 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -199,7 +199,7 @@ private def require_administrator unless @user.administrator? flash[:error] = t('user.filter.not_an_administrator') - redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id] + redirect_to :controller => 'diary_entry', :action => 'view' end end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 592ff020a..87eb329ab 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -13,6 +13,7 @@ class GeocoderController < ApplicationController @sources = [] if params[:lat] && params[:lon] + @sources.push "latlon" @sources.push "osm_nominatim_reverse" @sources.push "geonames_reverse" elsif params[:query].match(/^\d{5}(-\d{4})?$/) @@ -32,6 +33,24 @@ class GeocoderController < ApplicationController render :layout => map_layout end + def search_latlon + lat = params[:lat].to_f + lon = params[:lon].to_f + if lat < -90 or lat > 90 + @error = "Latitude #{lat} out of range" + render :action => "error" + elsif lon < -180 or lon > 180 + @error = "Longitude #{lon} out of range" + render :action => "error" + else + @results = [{:lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}"}] + + render :action => "results" + end + end + def search_us_postcode # get query parameters query = params[:query] @@ -143,7 +162,11 @@ class GeocoderController < ApplicationController type = place.attributes["type"].to_s name = place.attributes["display_name"].to_s min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",") - prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + if type.empty? + prefix_name = "" + else + prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + end if klass == 'boundary' and type == 'administrative' rank = (place.attributes["place_rank"].to_i + 1) / 2 prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 997973922..1757e771a 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -41,6 +41,7 @@ class SiteController < ApplicationController editor = preferred_editor if editor == "remote" + require_oauth render :action => :index return end diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 9d0e05530..9c4a9d8bd 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -151,8 +151,10 @@ class TraceController < ApplicationController if trace.visible? and (trace.public? or (@user and @user == trace.user)) if Acl.no_trace_download(request.remote_ip) render :text => "", :status => :forbidden - elsif request.format == Mime::XML or request.format == Mime::GPX + elsif request.format == Mime::XML send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => 'attachment') else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') end @@ -166,8 +168,13 @@ class TraceController < ApplicationController def edit @trace = Trace.find(params[:id]) - if @user and @trace.user == @user + if not @trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? or @trace.user != @user + render :text => "", :status => :forbidden + else @title = t 'trace.edit.title', :name => @trace.name + if params[:trace] @trace.description = params[:trace][:description] @trace.tagstring = params[:trace][:tagstring] @@ -176,8 +183,6 @@ class TraceController < ApplicationController redirect_to :action => 'view', :display_name => @user.display_name end end - else - render :text => "", :status => :forbidden end rescue ActiveRecord::RecordNotFound render :text => "", :status => :not_found @@ -186,17 +191,15 @@ class TraceController < ApplicationController def delete trace = Trace.find(params[:id]) - if @user and trace.user == @user - if trace.visible? - trace.visible = false - trace.save - flash[:notice] = t 'trace.delete.scheduled_for_deletion' - redirect_to :action => :list, :display_name => @user.display_name - else - render :text => "", :status => :not_found - end - else + if not trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? or trace.user != @user render :text => "", :status => :forbidden + else + trace.visible = false + trace.save + flash[:notice] = t 'trace.delete.scheduled_for_deletion' + redirect_to :action => :list, :display_name => @user.display_name end rescue ActiveRecord::RecordNotFound render :text => "", :status => :not_found diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index a3d1b6e67..a9006e82b 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -198,6 +198,8 @@ class UserController < ApplicationController flash[:error] = t 'user.reset_password.flash token bad' redirect_to :action => 'lost_password' end + else + render :text => "", :status => :bad_request end end diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 46fe40f04..9951737bc 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,8 +1,8 @@ + <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %> <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %> <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> diff --git a/config/environments/production.rb b/config/environments/production.rb index bbc06aac5..2db9f2366 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -70,7 +70,7 @@ OpenStreetMap::Application.configure do # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. config.assets.precompile += %w( index.js browse.js welcome.js ) - config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js ) + config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) diff --git a/config/initializers/composite_primary_keys.rb b/config/initializers/composite_primary_keys.rb new file mode 100644 index 000000000..ed4d5f2c9 --- /dev/null +++ b/config/initializers/composite_primary_keys.rb @@ -0,0 +1,48 @@ +# Monkey patch composite_primary_keys pending the resolution of: +# https://github.com/composite-primary-keys/composite_primary_keys/pull/170 +module ActiveRecord + module Associations + class HasManyAssociation + def delete_records(records, method) + if method == :destroy + records.each { |r| r.destroy } + update_counter(-records.length) unless inverse_updates_counter_cache? + else + if records == :all + scope = self.scope + else + # CPK + # keys = records.map { |r| r[reflection.association_primary_key] } + # scope = scope.where(reflection.association_primary_key => keys) + table = Arel::Table.new(reflection.table_name) + and_conditions = records.map do |record| + eq_conditions = Array(reflection.association_primary_key).map do |name| + table[name].eq(record[name]) + end + Arel::Nodes::And.new(eq_conditions) + end + + condition = and_conditions.shift + and_conditions.each do |and_condition| + condition = condition.or(and_condition) + end + + scope = self.scope.where(condition) + end + + if method == :delete_all + update_counter(-scope.delete_all) + else + # CPK + # update_counter(-scope.update_all(reflection.foreign_key => nil)) + updates = Array(reflection.foreign_key).inject(Hash.new) do |hash, name| + hash[name] = nil + hash + end + update_counter(-scope.update_all(updates)) + end + end + end + end + end +end diff --git a/config/locales/ar.yml b/config/locales/ar.yml index bffb29b8c..185453b9e 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -4,6 +4,7 @@ # Author: Ali1 # Author: Aude # Author: Bassem JARKAS +# Author: Fahad # Author: Grille chompa # Author: Houcinee1 # Author: Majid Al-Dharrab @@ -135,11 +136,13 @@ ar: edit: area: حرّر مساحة node: حرّر عقدة + note: تحرير الملاحظة relation: حرّر علاقة way: حرّر طريق larger: area: اعرض المنطقة على خريطة أكبر node: اعرض العقدة على خريطة أكبر + note: عرض الملاحظة في خريطة أكبر relation: اعرض العلاقة على خريطة أكبر way: اعرض الطريق على خريطة أكبر loading: جاري التحميل... @@ -147,10 +150,12 @@ ar: all: next_changeset_tooltip: حزمة التغييرات التالية next_node_tooltip: العقدة التالية + next_note_tooltip: الملاحظة التالية next_relation_tooltip: العلاقة التالية next_way_tooltip: الطريق التالي prev_changeset_tooltip: حزمة التغييرات السابقة prev_node_tooltip: العقدة السابقة + prev_note_tooltip: الملاحظة السابقة prev_relation_tooltip: العلاقة السابقة prev_way_tooltip: الطريق السابق user: @@ -178,6 +183,15 @@ ar: node: عقدة relation: علاقة way: طريق + note: + closed: "مغلق:" + closed_title: "ملاحظات محلولة: %{note_name}" + comments: "تعليقات:" + description: "الوصف:" + last_modified: "آخر تعديل:" + open_title: "ملاحظة لم يتم حلها: %{note_name}" + opened: "مفتوح:" + title: ملاحظة paging_nav: of: من showing_page: صفحة @@ -217,9 +231,10 @@ ar: loaded_an_area_with_num_features: "لقد قمت بتحميل منطقة تحتوي على %{num_features} ميّزة. بصفة عامّة، بعض المتصفحات قد لا تتوافق بشكل جيد مع عرض هذه الكمية من البيانات. عمومًا، تعمل المتصفحات بشكل أفضل في عرض أقل من 100 ميّزة في وقت واحد: القيام بأي شيء آخر قد يجعل المتصفح بطيء أو لن يستجيب. إن كنت متأكدًا من أنك ترغب في عرض هذه البيانات، يمكنك القيام بذلك عن طريق النقر على الزر أدناه." loading: جاري التحميل... manually_select: اختر يدويًا منطقة أخرى + notes_layer_name: استعراض الملاحظات object_list: api: استرد هذه المنطقة من الأي بي أي - back: اعرض لائحة الكائنات + back: العودة إلى قائمة الكائنات details: التّفاصيل heading: قائمة الكائنات history: @@ -237,6 +252,7 @@ ar: show_areas: أظهر المناطق show_history: أظهر التاريخ unable_to_load_size: "غير قادر على التحميل: حجم مربع الإحاطة %{bbox_size} كبير جدًا (يجب أن يكون أصغر من %{max_bbox_size})" + view_data: عرض البيانات لعرض الخريطة الحالية wait: انتظر... zoom_or_select: قم بالتكبير أو اختر منطقة من الخريطة لعرضها tag_details: @@ -279,7 +295,7 @@ ar: changeset_paging_nav: next: التالي » previous: «السابق - showing_page: إظهار الصفحة %{page} + showing_page: الصفحة %{page} changesets: area: منطقة comment: التعليق @@ -287,13 +303,13 @@ ar: saved_at: حُفظ في user: المستخدم list: - description: التغييرات الحديثة + description: استعراض المساهمات الأخيرة للخريطة description_bbox: حزم التغييرات داخل %{bbox} description_friend: حزم التغييرات من قبل أصدقائك description_nearby: حزم التغييرات من قبل المسخدمين في المقربة description_user: حزم التغييرات بواسطة %{user} description_user_bbox: حزم التغييرات بواسطة %{user} داخل %{bbox} - empty_anon_html: لا يوجد تغييرات حتى الآن + empty_anon_html: لم يعمل أي تحرير بعد. empty_user_html: يبدو أنك لم تقم بأي تغييرات حتى الآن. للبدء بالعمل، أنظر إلى دليل المبتدئين. heading: حزم التغييرات heading_bbox: حزم التغييرات @@ -304,6 +320,7 @@ ar: title: حزم التغييرات title_bbox: حزم التغييرات داخل %{bbox} title_friend: حزم التغييرات بواسطة أصدقائك + title_nearby: تغييرات من قبل مستخدمين قريبين title_user: حزم التغييرات بواسطة %{user} title_user_bbox: حزم التغييرات بواسطة %{user} داخل %{bbox} timeout: @@ -315,6 +332,7 @@ ar: has_commented_on: "%{display_name} علّق على مدخلات اليومية التالية" newer_comments: التعليقات الجديدة older_comments: التعليقات القديمة + post: إرسال when: متى diary_comment: comment_from: تعليق من %{link_user} في %{comment_created_at} @@ -361,7 +379,7 @@ ar: newer_entries: المدخلات الأحدث no_entries: لا يوجد مدخلات يومية older_entries: المدخلات الأقدم - recent_entries: "المدخلات اليومية الحديثة:" + recent_entries: إدخالات يوميات الحديثة title: يوميات المستخدمين title_friends: يوميات الأصدقاء title_nearby: يوميات/مفكرات المستخدمين في المقبرة @@ -400,7 +418,7 @@ ar: area_to_export: المنطقة المطلوب تصديرها embeddable_html: HTML مضمن export_button: صدِّر - export_details: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة المشاع الإبداعي، النسبة، نسخة 2.0. + export_details: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة قاعدة البيانات المفتوحة المشاعة . format: الهيئة format_to_export: الهيئة المطلوب تصديرها image_size: حجم الصورة @@ -416,8 +434,13 @@ ar: paste_html: ألصق HTML لتضمينه في موقع ما scale: القياس too_large: - body: هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر. + body: "هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر أو استخدام أحد المصادر التالية لتنزيل البيانات الضخمة:" + geofabrik: + title: تنزيلات موقع جيوفابريك heading: المنطقة كبيرة جدًا + planet: + description: نسخ محدثة بشكل دوري من قاعدة بيانات خرائط الشوارع المفتوحة OpenStreetMap + title: كوكب OSM zoom: تكبير start_rjs: add_marker: أضف علامة على الخريطة @@ -460,9 +483,20 @@ ar: uk_postcode: نتائج من NPEMap / FreeThe Postcode us_postcode: نتائج من Geocoder.us search_osm_nominatim: + admin_levels: + level10: حدود الضاحية + level2: حدود قطرية + level4: حدود الدولة + level5: حدود المنطقة + level6: حدود قطرية + level8: حدود المدينة + level9: حدود قرية prefix: + aerialway: + station: محطة قطار هوائي aeroway: aerodrome: المطار + apron: موقف طائرات gate: البوابة helipad: منصة مروحية runway: مدرج إقلاع @@ -553,6 +587,7 @@ ar: shower: غسيل بالدش social_centre: مركز إجتماعي social_club: نادي اجتماعي + social_facility: مرفق اجتماعي studio: ستوديو supermarket: سوبرماركت swimming_pool: مسبح @@ -570,15 +605,20 @@ ar: youth_centre: مركز نشاطات للشباب boundary: administrative: حدود إدارية + census: حدود تعدادية national_park: محمية وطنية protected_area: منطقة محمية bridge: + aqueduct: قنطرة suspension: جسر معلق swing: جسر متحرك viaduct: جسر "yes": جسر building: "yes": مبنى + emergency: + fire_hydrant: صنبور مياه الإطفاء + phone: هاتف طوارئ highway: bridleway: مسلك خيول bus_guideway: مسار خاص للحافلات @@ -590,6 +630,7 @@ ar: footway: ممر للمشاة ford: مخاضة living_street: شارع سكني + milestone: معلم minor: طريق غير هام motorway: طريق سريع motorway_junction: تقاطع طرقات سريعة @@ -599,6 +640,7 @@ ar: platform: منصة primary: طريق أولي primary_link: طريق أولي + proposed: طريق تحت الإنشاء raceway: حلبة سباق residential: طريق سكني rest_area: منطقة إستراحة @@ -610,6 +652,7 @@ ar: speed_camera: كاميرا كشف السرعة steps: درج stile: مرقى لعبور جدار + street_lamp: مصباح شارع tertiary: طريق فرعي tertiary_link: طريق فرعي track: مسار @@ -625,6 +668,7 @@ ar: building: مبنى castle: قلعة church: كنيسة + citywalls: أسوار المدينة fort: حصن house: منزل icon: أيقونة @@ -634,6 +678,7 @@ ar: monument: أثر museum: متحف ruins: أطلال + tomb: قبر tower: برج wayside_cross: صليب تذكاري wayside_shrine: مزار جانب طريق @@ -668,6 +713,7 @@ ar: reservoir: خزان residential: منطقة سكنية retail: بيع بالمفرق + road: منطقة الطريق village_green: أرض خضراء vineyard: كرم عنب wetland: أرض رطبة @@ -699,6 +745,8 @@ ar: airfield: منطقة عسكرية barracks: ثكنات bunker: دشمة + mountain_pass: + "yes": ممر جبلي natural: bay: خليج beach: شاطئ @@ -768,6 +816,7 @@ ar: locality: محلة moor: أرض جرداء municipality: البلدية + neighbourhood: حي postcode: الرمز البريدي region: المنطقة sea: بحر @@ -788,12 +837,15 @@ ar: junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية light_rail: قطار خفيف + miniature: مصغرة السكك الحديدية monorail: قطار ذات سكة حديد واحدة narrow_gauge: سكة حديد ضيقة platform: رصيف محطة قطار preserved: سكة حديدية تراثية + proposed: سكك حديدية مقترحة spur: خط تفرع سكة حديدية station: محطة قطار + stop: محطة سكك حديدية subway: محطة مترو الأنفاق subway_entrance: مدخل مترو switch: مبدل السكة الحديدية @@ -802,12 +854,14 @@ ar: yard: فناء سكة حديد shop: alcohol: متجر كحول للبيع الخارجي + antiques: تحف art: متجر فن bakery: مخبز beauty: صالون تجميل beverages: متجر مشروبات bicycle: متجر دراجات books: متجر كتب + boutique: دكان butcher: جزار car: متجر سيارات car_parts: قطع غيار سيارات @@ -821,6 +875,7 @@ ar: convenience: متجر للأغراض اليومية copyshop: محل تصوير مستندات cosmetics: بائع مستحضرات تجميل + deli: دكان أطعمة شهية department_store: متجر متعدد الأقسام discount: محل رخصة doityourself: براعة منزلية @@ -857,17 +912,21 @@ ar: organic: متجر أغذية عضوية outdoor: متجر للنشاطات الخارجية pet: متجر حيوانات أليفة + pharmacy: صيدلية photo: متجر صور salon: صالون + second_hand: متجر أغراض مستعملة shoes: متجر أحذية shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت + tailor: خياط toys: متجر ألعاب travel_agency: وكالة سفر video: متجر فيديو wine: متجر نبيذ للبيع الخارجي + "yes": متجر tourism: alpine_hut: كوخ جبلي artwork: عمل فني @@ -890,6 +949,7 @@ ar: viewpoint: موقع كاشف zoo: حديقة حيوانات tunnel: + culvert: مجرى مائي "yes": نفق waterway: artificial: مجرى ماء إصطناعي @@ -929,12 +989,14 @@ ar: community_blogs: مدونات المجتمع community_blogs_title: مدونات لأعضاء من مجتمع خريطة الشارع المفتوحة copyright: حقوق النشر والترخيص + data: البيانات documentation: التوثيق documentation_title: توثيق المشروع donate: ادعم خريطة الشارع المفتوحة ب%{link} لتمويل ترقية العتاد. donate_link_text: التبرع edit: تعديل edit_with: حرر بإستعمال %{editor} + export_data: تصدير البيانات foundation: المؤسسة foundation_title: مؤسسة خريطة الشارع المفتوحة gps_traces: آثار جي بي أس @@ -943,7 +1005,7 @@ ar: help_centre: مركز المساعدة help_title: موقع المساعدة للمشروع history: تاريخ - home: الصفحة الرئيسية + home: اذهب إلى الصفحة الرئيسية intro_1: خريطة الشارع المفتوحة هي خريطة للعالم كله قابلة للتحرير حرة ومجانية. قام بإنشائها أشخاص مثلك. intro_2_create_account: أنشئ حساب مستخدم intro_2_download: نزّل diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 4e1368623..0e1258d33 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -476,8 +476,10 @@ ast: title: ca_postcode: Resultaos de Geocoder.CA geonames: Resultaos de GeoNames + geonames_reverse: Resultaos de GeoNames latlon: Resultaos internos osm_nominatim: Resultaos de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultaos de OpenStreetMap Nominatim uk_postcode: Resultaos de NPEMap / FreeThe Postcode us_postcode: Resultaos de Geocoder.us search_osm_nominatim: @@ -994,6 +996,7 @@ ast: header: Capes del mapa notes: Notes de mapa overlays: Activar les superposiciones pa diagnosticar el mapa + title: Capes locate: popup: Tas a {distance} {unit} d'esti puntu title: Ver el mio allugamientu diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 3cf325905..7f74340c9 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -4,6 +4,7 @@ # Author: EugeneZelenko # Author: Jim-by # Author: Red Winged Duck +# Author: Renessaince # Author: Wizardist be-Tarask: activerecord: @@ -122,11 +123,13 @@ be-Tarask: edit: area: Рэдагаваць абшар node: Рэдагаваць вузел + note: Рэдагаваць нататку relation: Рэдагаваць адносіны way: Рэдагаваць дарогу larger: area: Паказаць абшар на большай мапе node: Паказаць пункт на большай мапе + note: Паказаць нататку на большай мапе relation: Прагляд адносінаў на большай мапе way: Паказаць шлях на большай мапе loading: Загрузка… @@ -134,10 +137,12 @@ be-Tarask: all: next_changeset_tooltip: Наступны набор зьменаў next_node_tooltip: Наступны вузел + next_note_tooltip: Наступная нататка next_relation_tooltip: Наступныя адносіны next_way_tooltip: Наступная дарога prev_changeset_tooltip: Папярэдні набор зьменаў prev_node_tooltip: Папярэдні вузел + prev_note_tooltip: Папярэдняя нататка prev_relation_tooltip: Папярэднія адносіны prev_way_tooltip: Папярэдняя дарога user: @@ -146,10 +151,10 @@ be-Tarask: prev_changeset_tooltip: Папярэдняе рэдагаваньне %{user} node: download_xml: Загрузіць XML - edit: рэдагаваць + edit: Рэдагаваць node: Вузел node_title: "Вузел: %{node_name}" - view_history: паказаць гісторыю + view_history: Паказаць гісторыю node_details: coordinates: "Каардынаты:" part_of: "Частка:" @@ -157,7 +162,7 @@ be-Tarask: download_xml: Загрузіць XML node_history: Гісторыя вузла node_history_title: "Гісторыя пункту: %{node_name}" - view_details: паказаць падрабязнасьці + view_details: Паказаць падрабязнасьці not_found: sorry: Прабачце, %{type} з ідэнтыфікатарам %{id} ня знойдзены. type: @@ -165,10 +170,14 @@ be-Tarask: node: вузел relation: адносіны way: шлях + note: + title: Нататка paging_nav: of: з - showing_page: Паказ старонкі + showing_page: Старонка redacted: + message_html: Вэрсія %{version} гэтага %{type} ня можа быць паказаная, бо яна была адрэдагаваная. Глядзіце %{redaction_link} для падрабязнасьцяў. + redaction: Рэдакцыя %{id} type: node: вузел relation: адносіны @@ -200,12 +209,13 @@ be-Tarask: hide_areas: Схаваць вобласьці history_for_feature: Гісторыя %{feature} load_data: Загрузіць зьвесткі - loaded_an_area_with_num_features: Вы загрузілі мясцовасьць, якая ўтрымлівае %{num_features} аб'ектаў. Увогуле, некаторыя браўзэры ня змогуць апрацаваць такую колькасьць зьвестак. Звычайна, найлепшы вынік назіраецца, калі аб'ектаў менш за 100, пры большай колькасьці браўзэр можа страціць хуткасьць. Калі Вы ўпэўненыя, што жадаеце паказаць гэтыя зьвесткі, націсьніце кнопку ніжэй. + loaded_an_area_with_num_features: Вы загрузілі мясцовасьць, якая ўтрымлівае %{num_features} аб’ектаў. Увогуле, некаторыя браўзэры ня змогуць апрацаваць такую колькасьць зьвестак. Звычайна найлепшы вынік назіраецца, калі аб’ектаў менш за %{max_features}, пры выкананьні яшчэ нейкіх задачаў браўзэр можа страціць хуткасьць/завіснуць. Калі Вы ўпэўненыя, што жадаеце паказаць гэтыя зьвесткі, націсьніце кнопку ніжэй. loading: Загрузка… manually_select: Выбраць іншы абшар + notes_layer_name: Прагляд нататак object_list: api: Атрымаць гэты абшар з API - back: Паказаць сьпіс аб'ектаў + back: Вярнуцца да сьпісу аб’ектаў details: Падрабязнасьці heading: Сьпіс аб'ектаў history: @@ -246,8 +256,8 @@ be-Tarask: way_title: "Шлях: %{way_name}" way_details: also_part_of: - one: таксама частка дарогі %{related_ways} - other: таксама частка дарогаў %{related_ways} + one: частка дарогі %{related_ways} + other: частка дарогаў %{related_ways} nodes: "Вузлы:" part_of: "Частка:" way_history: @@ -267,7 +277,7 @@ be-Tarask: changeset_paging_nav: next: Наступная » previous: « Папярэдняя - showing_page: Паказаная старонка %{page} + showing_page: Старонка %{page} changesets: area: Абшар comment: Камэнтар @@ -275,7 +285,7 @@ be-Tarask: saved_at: Захаваны як user: Карыстальнік list: - description: Апошнія зьмены + description: Прагляд апошніх зьменаў на мапе description_bbox: Набор зьменаў у %{bbox} description_friend: Наборы зьменаў Вашых сяброў description_nearby: Наборы зьменаў для суседніх удзельнікаў @@ -307,6 +317,7 @@ be-Tarask: few: "%{count} камэнтары" one: "%{count} камэнтар" other: "%{count} камэнтароў" + zero: Няма камэнтароў comment_link: Камэнтаваць гэты запіс confirm: Пацьвердзіць edit_link: Рэдагаваць гэты запіс @@ -341,7 +352,7 @@ be-Tarask: newer_entries: Навейшыя запісы no_entries: У дзёньніку няма запісаў older_entries: Старэйшыя запісы - recent_entries: "Апошнія запісы ў дзёньніку:" + recent_entries: Апошнія запісы ў дзёньніку title: Дзёньнікі карыстальнікаў title_friends: Дзёньнікі сяброў title_nearby: Дзёньнікі суседніх удзельнікаў @@ -365,6 +376,9 @@ be-Tarask: user_title: Дзёньнік %{user} editor: default: Па змоўчваньні (цяпер %{name}) + id: + description: iD (рэдактар у браўзэры) + name: iD potlatch: description: Potlatch 1 (рэдактар у браўзэры) name: Potlatch 1 @@ -380,7 +394,7 @@ be-Tarask: area_to_export: Абшар для экспарту embeddable_html: HTML-код для ўстаўкі export_button: Экспартаваць - export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Creative Commons Attribution-ShareAlike 2.0. + export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open Data Commons Open Database License (ODbL). format: Фармат format_to_export: Фармат экспарту image_size: "Памер выявы:" @@ -396,8 +410,10 @@ be-Tarask: paste_html: HTML-код для ўстаўкі ў вэб-сайт scale: Маштаб too_large: - body: Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. Калі ласка, зьменшыце маштаб ці выберыце меншы абшар. + body: "Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. Калі ласка, зьменшыце маштаб, выберыце меншы абшар, ці паспрабуйце адну з наступных крыніцаў для пакетнай запампоўкі зьвестак:" heading: Абшар занадта вялікі + planet: + title: Плянэта OSM zoom: Маштаб start_rjs: add_marker: Дадаць маркер на мапу @@ -587,6 +603,8 @@ be-Tarask: building: Будынак castle: Замак church: Царква + citywalls: Мескія муры + fort: Форт house: Дом icon: Ікона manor: Маёнтак diff --git a/config/locales/br.yml b/config/locales/br.yml index 3bca05576..e55b6cd55 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -998,6 +998,7 @@ br: header: Gwiskadoù kartenn notes: Notennoù kartenn overlays: Gweredekaat an adwiskadoù evit dresañ ar gartenn + title: Gwiskadoù locate: popup: Emaoc'h war-hed {distance} {unit} diouzh ar poent-mañ title: Diskouez al lec'h m'emaon @@ -1623,7 +1624,7 @@ br: heading: O welet ar roud %{name} map: kartenn none: Hini ebet - owner: Perc'henn + owner: "Perc'henn :" pending: WAR C'HORTOZ points: "Poentoù :" start_coordinates: "Daveennoù orin :" @@ -1865,7 +1866,7 @@ br: delete_user: dilemel an implijer-mañ description: Deskrivadur diary: deizlevr - edits: kemmoù + edits: Kemmoù email address: "Chomlec'h postel :" friends_changesets: Strolladoù kemmoù graet gant mignoned friends_diaries: Enmonedoù deizlevr ar vignoned diff --git a/config/locales/ca.yml b/config/locales/ca.yml index a515d71bd..880a39dda 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -11,6 +11,7 @@ # Author: Martorell # Author: McDutchie # Author: Micru +# Author: Mlforcada # Author: Nemo bis # Author: PerroVerd # Author: Pitort @@ -445,10 +446,18 @@ ca: scale: Escala too_large: body: Aquesta zona és massa gran per ser exportada com a dades XML de OpenStreetMap. Si us plau seleccioneu una àrea més petita o bé una de les següents fonts per descarregar quantitats grans de dades. + geofabrik: + description: Extractes actualitzats regularment de continents, països i de les ciutats seleccionades + title: Descàrregues de Geofabrik heading: L'àrea és massa gran + metro: + description: Extractes per a les ciutats més grans del món i les seves àrees metropolitanes + title: Extractes de Metro other: + description: Fonts addicionals llistades al wiki d'OpenStreetMap title: Altres fonts planet: + description: Còpies actualitzades regularment de la base de dades d'OpenStreetMap al complet title: Planeta OSM zoom: Zoom start_rjs: @@ -487,8 +496,10 @@ ca: title: ca_postcode: Resultats de Geocoder.CA geonames: Resultats des de GeoNames + geonames_reverse: Resultats procedents de GeoNames latlon: Resultats propis osm_nominatim: Resultats de OpenStreetMap nominatim + osm_nominatim_reverse: Resultats procedents de OpenStreetMap nominatim uk_postcode: Resultats de NPEMap / FreeThe Postcode us_postcode: Resultats de Geocoder.us search_osm_nominatim: @@ -995,6 +1006,7 @@ ca: map: base: cycle_map: Cycle Map + hot: Humanitarian mapquest: MapQuest Open standard: Estàndard transport_map: Mapa de transports @@ -1004,6 +1016,7 @@ ca: header: Capes del mapa notes: Notes de mapa overlays: Activar capes extra per als problemes del mapa + title: Capes del mapa locate: popup: Esteu a {distance} {unit} d'aquest punt title: Mostra la meva ubicació @@ -1241,11 +1254,11 @@ ca: title: Notes enviades o comentades per %{user} rss: closed: nota tancada (aprop de %{place}) - commented: nou comentari (prop de % {lloc}) + commented: nou comentari (prop de %{place}) description_area: Una llista de notes, reportades, comentades o bé tancades a la vostra àrea [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: Un canal rss per la nota %{id} - opened: Nota nova (a prop % {lloc}) - reopened: Nota reactivada (prop de % {lloc}) + opened: Nota nova (a prop %{place}) + reopened: Nota reactivada (prop de %{place}) title: Notes de OpenStreetMap notifier: diary_comment_notification: @@ -1394,7 +1407,7 @@ ca: update: flash: La informació de client ha actualitzat correctament printable_name: - with_version: "% {id}, v % {versió}" + with_version: "%{id}, v%{version}" redaction: create: flash: Redacció creada @@ -1549,6 +1562,8 @@ ca: upload_trace: Pujar traça de GPS delete: scheduled_for_deletion: Track programat per a ser suprimit + description: + description_without_count: Fitxer GPX de %{user} edit: description: "Descripció:" download: descàrrega @@ -1566,6 +1581,8 @@ ca: uploaded_at: "Pujat a:" visibility: "Visibilitat:" visibility_help: Què vol dir això? + georss: + title: Traces GPS d'OpenStreetMap list: description: Navega pels tracks pujats recentment empty_html: Aquí encara no hi ha res. Pujeu un nou track o apreneu més sobre els tracks GPS a la pàgina wiki. diff --git a/config/locales/cs.yml b/config/locales/cs.yml index abf478550..15320f3e9 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1,4 +1,4 @@ -# Messages for Czech (česky) +# Messages for Czech (čeština) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Bilbo @@ -494,8 +494,10 @@ cs: title: ca_postcode: Výsledky z Geocoder.CA geonames: Výsledky z GeoNames + geonames_reverse: Výsledky z GeoNames latlon: Výsledky z interní databáze osm_nominatim: Výsledky z OpenStreetMap Nominatim + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim uk_postcode: Výsledky z NPEMap / FreeThe Postcode us_postcode: Výsledky z Geocoder.us search_osm_nominatim: @@ -776,7 +778,7 @@ cs: crater: Kráter dune: Duna feature: Prvek - fell: See http://wiki.openstreetmap.org/wiki/Tag:natural=fell + fell: Fjell fjord: Fjord forest: Les geyser: Gejzír @@ -1012,6 +1014,7 @@ cs: header: Mapové vrstvy notes: Poznámky k mapě overlays: Zapnout vrstvy pro ladění mapy + title: Vrstvy locate: popup: Jste do {distance} {unit} od tohoto bodu title: Ukázat moji polohu @@ -1309,7 +1312,7 @@ cs: header: "%{from_user} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem %{subject}:" hi: Dobrý den, uživateli %{to_user}, note_comment_notification: - anonymous: Jako anonymní uživatel + anonymous: Anonymní uživatel closed: commented_note: "%{commenter} vyřešil poznámku k mapě, kterou jste komentovali. Poznámka je umístěna poblíž %{place}." subject_other: "[OpenStreetMap] %{commenter} vyřešil jednu z poznámek, která vás zajímá" diff --git a/config/locales/da.yml b/config/locales/da.yml index 72bae5dd0..f74e01080 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -491,8 +491,10 @@ da: title: ca_postcode: Resultater fra Geocoder.CA geonames: Resultater fra GeoNames + geonames_reverse: Resultater fra GeoNames latlon: Resultater fra interne osm_nominatim: Resultater fra OpenStreetMap Nominatim + osm_nominatim_reverse: Resultater fra OpenStreetMap Nominatim uk_postcode: Resultater fra NPEMap / FreeThe Postcode us_postcode: Resultater fra Geocoder.us search_osm_nominatim: @@ -508,6 +510,7 @@ da: aerialway: chair_lift: Stolelift drag_lift: Træklift + station: Svævebanestation aeroway: aerodrome: Flyveplads apron: Forstykke @@ -1007,6 +1010,7 @@ da: header: Kortlag notes: Kortbemærkninger overlays: Aktiver overlejringer til fejlfinding af kortet + title: Lag locate: popup: Du er inden for {distance} {unit} af dette punkt title: Vis min placering @@ -1042,6 +1046,7 @@ da: format: "Format:" image: Billede image_size: Billedet vil vise standard lag ved + include_marker: Tilføj markør link: Link eller HTML long_link: Link paste_html: Indsæt HTML som skal indlejres i websiden @@ -1253,11 +1258,11 @@ da: hi: Hej %{to_user}, subject: "[OpenStreetMap] %{user} kommenterede på dit blogindlæg" email_confirm: - subject: "[OpenStreetMap] Bekræft din emailadresse" + subject: "[OpenStreetMap] Bekræft din e-mailadresse" email_confirm_html: click_the_link: Hvis det er dig, skal du klikke på linket nedenfor for at bekræfte ændringen. greeting: Hej, - hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin emailadresse på %{server_url} til %{new_address}. + hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin e-mailadresse på %{server_url} til %{new_address}. email_confirm_plain: click_the_link: Hvis det er dig, skal du klikke på linket nedenfor for at bekræfte ændringen. greeting: Hej, @@ -1655,11 +1660,11 @@ da: link text: hvad er dette? not yet agreed: Du har endnu ikke accepteret de nye vilkår for bidragydere. review link text: Følg dette link når det er bekvemt for dig for at gennemse og acceptere de nye vilkår for bidragydere. - current email address: "Nuværende emailadresse:" + current email address: "Nuværende e-mailadresse:" delete image: Fjern det nuværende billede email never displayed publicly: (vises aldrig offentligt) flash update success: Brugerinformation opdateret. - flash update success confirm needed: Brugeroplysninger blev opdateret. Tjek din email for en nøgle til at bekræfte din nye emailadresse. + flash update success confirm needed: Brugeroplysningerne blev opdateret. Tjek din e-mail for en nøgle til at bekræfte din nye e-mailadresse. gravatar: gravatar: Brug Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar @@ -1672,7 +1677,7 @@ da: longitude: "Længdegrad:" make edits public button: Gør alle mine rettelser offentlige my settings: Mine indstillinger - new email address: "Ny e-mail-adresse:" + new email address: "Ny e-mailadresse:" new image: Tilføj et billede no home location: Du har ikke angivet din hjemmeposition. openid: @@ -1691,7 +1696,7 @@ da: heading: "Offentlig redigering:" public editing note: heading: Offentlig redigering - 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). + 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). replace image: Erstat det aktuelle billede return to profile: Tilbage til profil save changes button: Gem ændringer @@ -1708,13 +1713,13 @@ da: unknown token: Den bekræftelseskode er udløbet eller eksisterer ikke. confirm_email: button: Bekræft - failure: En emailadresse er allerede blevet bekræftet med denne nøgle. - heading: Bekræft ændring af e-mail adresse - press confirm button: Tryk på bekræft-knappen nedenfor for at bekræfte din nye emailadresse. - success: Bekræftede din emailadresse, tak fordi du tilmeldte dig! + failure: En e-mailadresse er allerede blevet bekræftet med denne nøgle. + heading: Bekræft ændring af e-mailadresse + press confirm button: Tryk på bekræft-knappen nedenfor for at bekræfte din nye e-mailadresse. + success: Din e-mailadresse er bekræftet, tak fordi du tilmeldte dig! confirm_resend: failure: Bruger %{name} ikke fundet. - success: Vi har sendt en bekræftelses-email til %{email}, og så snart du har bekræftet din konto, kan du gå i gang med kortlægningen.

Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare på den slags forespørgsler. + success: Vi har sendt en ny e-mail bekræftelse til %{email}, og så snart du har bekræftet din konto, kan du gå i gang med kortlægningen.

Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare på den slags forespørgsler. filter: not_an_administrator: Du skal være administrator for at gøre dette. go_public: @@ -1735,7 +1740,7 @@ da: account not active: Din konto er ikke aktiveret endnu.
Klik på linket i bekræftelsesemailen for at aktivere din konto eller få sendt en ny bekræftelsesemail. auth failure: Kunne ikke logge på med disse oplysninger. create account minute: Opret en konto. Det tager kun et minut. - email or username: "E-mail-adresse eller brugernavn:" + email or username: "E-mailadresse eller brugernavn:" heading: Log på login_button: Log på lost password link: Glemt din adgangskode? @@ -1776,11 +1781,11 @@ da: logout_button: Log af title: Log af lost_password: - email address: "Emailadresse:" + email address: "E-mailadresse:" heading: Glemt adgangskode? - help_text: Indtast e-mail-adressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. + help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. new password button: Nulstil adgangskode - notice email cannot find: Kunne ikke finde den e-mail-adresse. Beklager. + notice email cannot find: Kunne ikke finde den e-mailadresse, beklager. notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan snart indstille en ny. title: Glemt adgangskode make_friend: @@ -1793,16 +1798,16 @@ da: about: header: Gratis og kan redigeres html: "

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

\n

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

" - confirm email address: "Bekræft e-mail-adresse:" + confirm email address: "Bekræft e-mailadresse:" confirm password: "Bekræft adgangskode:" contact_webmaster: Kontakt venligst webmaster for at få oprettet en konto - vi vil forsøge at håndtere forespørgslen så hurtigt som muligt. continue: Opret konto display name: "Vist navn:" display name description: Dit offentligt synlige brugernavn. Du kan ændre dette senere i indstillingerne. - email address: "E-mail-adresse:" + email address: "E-mailadresse:" license_agreement: Når du bekræfter din konto, skal du acceptere vilkårene for bidragydere. no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt. - not displayed publicly: Vises ikke offentligt (se privatlivspolitik) + not displayed publicly: Vises ikke offentligt (se privatlivspolitik) openid: "%{logo} OpenID:" openid association: "

Din OpenID er endnu ikke tilknyttet en OpenStreetMap konto.

\n" openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan muligvis stadig have brug for en. @@ -1875,7 +1880,7 @@ da: description: Beskrivelse diary: Blog edits: Redigeringer - email address: "E-mail-adresse:" + email address: "E-mailadresse:" friends_changesets: venners ændringssæt friends_diaries: venners blogindlæg hide_user: skjul denne bruger @@ -2034,11 +2039,11 @@ da: title: Har du ikke tid til at kortlægge selv? Tilføj en note! basic_terms: editor_html: En editor er et program eller en hjemmeside der kan bruges til at redigere kortet. - node_html: En "node" er et punkt på kortet, f.eks. en enkelt restaurant eller et træ. + node_html: Et "punkt" er et sted på kortet, f.eks. en enkelt restaurant eller et træ. paragraph_1_html: Her er nogen få begreber som er nyttige at forstå for at bidrage til OpenStreetMap. - tag_html: "Et tag er en lille bid information om en \"node\" eller en \"way\", f.eks. navnet på en restaurant eller\nhastighedsbegrænsningen på en vej." + tag_html: En egenskab er en lille bid information om et "punkt" eller en "vej", f.eks. navnet på en restaurant eller hastighedsbegrænsningen på en vej. title: Grundlæggende begreber - way_html: En "way" er en linje eller et areal, f.eks. en vej, en å eller en bygning. + way_html: En "vej" er en linje eller et areal, f.eks. en vej, en å eller en bygning. introduction_html: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort. Nu hvor du er oprettet som bruger er du klar til at tilføje og ændre kortinformationer. Her er en guide med de vigtigste informationer til at komme hurtigt i gang. questions: paragraph_1_html: "Behøver du hjælp til at kortlægge eller er du usikker på hvordan OpenStreetMap bruges? Få svar på dine spørgsmål på\nOpenStreetMaps hjælpeside." diff --git a/config/locales/de.yml b/config/locales/de.yml index 3becedfce..7647ac082 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -505,8 +505,10 @@ de: title: ca_postcode: Suchergebnisse von Geocoder.CA geonames: Suchergebnisse von GeoNames + geonames_reverse: Ergebnisse von GeoNames latlon: Suchergebnisse von Internal osm_nominatim: Ergebnisse von OpenStreetMap Nominatim + osm_nominatim_reverse: Ergebnisse von OpenStreetMap Nominatim uk_postcode: Suchergebnisse von NPEMap / FreeThe Postcode us_postcode: Suchergebnisse von Geocoder.us search_osm_nominatim: diff --git a/config/locales/diq.yml b/config/locales/diq.yml index f93b6fa69..c5b6ed397 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Erdemaslancan +# Author: Gorizon # Author: Mirzali diq: activerecord: @@ -30,7 +31,7 @@ diq: public: Şar size: Gırdiye user: Karber - visible: Mocnerey + visible: Aseno user: active: Aktiv description: Sılasnayış @@ -527,7 +528,7 @@ diq: company: Şirket lawyer: Abuqat place: - city: Sûke + city: Suk farm: Erdo Bec hamlet: Mezra house: Keye diff --git a/config/locales/el.yml b/config/locales/el.yml index 1012cc684..2bcb0dd9a 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -435,7 +435,7 @@ el: licence: Άδεια longitude: "Γεω. Μη.:" manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής - map_image: Εικόνα Χάρτη (δείχνει τυπικό επίπεδο) + map_image: Εικόνα Χάρτη (δείχνει τυπικό στρώμα) max: μεγ options: Επιλογές osm_xml_data: Δεδομένα OpenStreetMap σε μορφή XML @@ -700,6 +700,7 @@ el: landuse: allotments: Λαχανόκηποι basin: Λεκανοπέδιο + brownfield: Πρώην Βιομηχανική Περιοχή cemetery: Κοιμητήριο commercial: Εμπορική Περιοχή conservation: Διατήρηση @@ -710,6 +711,7 @@ el: forest: Δάσος garages: Κλειστοί Χώροι Στάθμευσης grass: Γρασίδι + greenfield: Παρθένα Περιοχή industrial: Βιομηχανική Περιοχή landfill: Χωματερή meadow: Λιβάδι @@ -844,6 +846,7 @@ el: level_crossing: Ισόπεδη Διάβαση light_rail: Ελαφρύ Τρένο miniature: Μινιατούρα Σιδηρόδρομος + monorail: Μονοτρόχιος σιδηρόδρομος narrow_gauge: Σιδηρόδρομος Στενής Τροχιάς platform: Πλατφόρμα Σιδηροδρόμου preserved: Διατηρητέος Σιδηρόδρομος @@ -855,6 +858,7 @@ el: switch: Σιδηροδρομικά Σημεία tram: Τραμ tram_stop: Στάση Τραμ + yard: Σιδηροδρομικός Σταθμός Διαλογής shop: antiques: Αντίκες art: Κατάστημα Τέχνης @@ -877,6 +881,7 @@ el: convenience: Παντοπωλείο copyshop: Κατάστημα Φωτοαντιγράφων cosmetics: Κατάστημα Καλλυντικών + deli: Ντελικατέσεν department_store: Πολυκατάστημα discount: Εκπτωτικό Κατάστημα doityourself: Ιδιοκατασκευές @@ -977,18 +982,20 @@ el: key: title: Υπόμνημα tooltip: Υπόμνημα - tooltip_disabled: Το υπόμνημα είναι διαθέσιμο μόνο για το κανονικό επίπεδο + tooltip_disabled: Το υπόμνημα είναι διαθέσιμο μόνο για το Κανονικό στρώμα map: base: cycle_map: Χάρτης Ποδηλασίας + hot: Ανθρωπιστικός standard: Κανονικός transport_map: Συγκοινωνιακός Χάρτης copyright: © Συνεισφέροντες του OpenStreetMap layers: data: Δεδομένα Χάρτη - header: Επίπεδα Χάρτη + header: Στρώματα Χάρτη notes: Σημειώσεις Χάρτη overlays: Ενεργοποίηση επικαλύψεων για την αντιμετώπιση προβλημάτων του χάρτη + title: Στρώματα locate: popup: Είστε μεταξύ {distance} {unit} από αυτό το σημείο title: Προβολή της Τοποθεσίας μου @@ -1023,6 +1030,7 @@ el: embed: HTML format: "Μορφή:" image: Εικόνα + image_size: Η εικόνα θα εμφανίσει το κανονικό στρώμα στις include_marker: Συμπερίληψη δείκτη link: Σύνδεσμος ή HTML long_link: Σύνδεσμος @@ -1395,6 +1403,7 @@ el: 1: τερματικός σταθμός bridge: Μαύρο περίβλημα = γέφυρα bridleway: Μονοπάτι για Άλογα + brownfield: Πρώην βιομηχανική περιοχή building: Σημαντικό κτίριο byway: Παράδρομος cable: @@ -1482,6 +1491,8 @@ el: upload_trace: Αποστολή Ίχνους GPS delete: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή + description: + description_without_count: Αρχείο GPX από τον χρήστη %{user} edit: description: "Περιγραφή:" download: λήψη @@ -1910,7 +1921,10 @@ el: heading: Επιβεβαίωση χορήγησης ρόλου title: Επιβεβαίωση χορήγησης ρόλου revoke: + are_you_sure: Σίγουρα θέλετε να ανακλήσετε τον ρόλο «%{role}» από τον χρήση «%{name}»; confirm: Επιβεβαίωση + heading: Επιβεβαίωση ανάκλησης ρόλου + title: Επιβεβαίωση ανάκλησης ρόλου welcome_page: add_a_note: paragraph_1_html: Εάν θέλετε κάτι μικρό να διορθωθεί και δεν έχετε χρόνο να εγγραφείτε και να μάθετε πως να επεξεργάζεστε, είναι εύκολο να προσθέσετε μια σημείωση. diff --git a/config/locales/en.yml b/config/locales/en.yml index f33726357..aaf57e7e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -334,6 +334,7 @@ en: geocoder: search: title: + latlon: 'Results from Internal' us_postcode: 'Results from Geocoder.us' uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 83bbfea49..0d65d4a58 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -12,6 +12,7 @@ # Author: Petrus Adamus # Author: Timsk # Author: Tradukisto +# Author: Umbert' # Author: Yekrats eo: activerecord: @@ -163,8 +164,14 @@ eo: relation: rilato way: vojo note: + at_by_html: antaŭ %{when} fare de %{user} + at_html: antaŭ %{when} + closed: "Fermita:" + comments: "Komentoj:" description: "Priskribo:" last_modified: Laste ŝanĝita + opened: "Malfermita:" + title: Noto paging_nav: of: de showing_page: paĝo @@ -228,6 +235,7 @@ eo: zoom_or_select: Zomu aŭ elektu videndan mapareon tag_details: tags: "Etikedoj:" + wikipedia_link: La artikolo %{page} en Vikipedio timeout: sorry: Bedaŭrinde, la datumoj por la %{type} kun la identigilo %{id} alvenis tro malrapide. type: @@ -271,6 +279,23 @@ eo: user: Uzanto list: description: Foliumi lastajn ŝanĝojn en la mapo + description_bbox: Ŝanĝaroj en %{bbox} + description_friend: Ŝanĝaroj de viaj amikoj + description_nearby: Ŝanĝaroj de proksimaj uzuloj + description_user: Ŝanĝaroj de %{user} + description_user_bbox: Ŝanĝaroj de %{user} ene de %{bbox} + empty_anon_html: Ankoraŭ ne estis redaktoj. + empty_user_html: Ŝajne vi ankoraŭ ne redaktis. Por komenci bonvolu konsulti la konsilojn por komencantoj. + heading: Ŝanĝaroj + heading_bbox: Ŝanĝaroj + heading_friend: Ŝanĝaroj + heading_nearby: Ŝanĝaroj + heading_user: Ŝanĝaroj + heading_user_bbox: Ŝanĝaroj + title_friend: Ŝanĝaroj de viaj amikoj + title_nearby: Ŝanĝaroj de proksimaj uzuloj + timeout: + sorry: Pardonu; daŭris tro longe kompili la petitan liston de ŝanĝaroj. diary_entry: diary_comment: confirm: Konfirmi @@ -293,7 +318,10 @@ eo: newer_entries: Pli novaj enskriboj older_entries: Pli malnovaj enskriboj title: Uzantĵurnaloj + title_friends: Taglibroj de amikoj user_title: Ĵurnalo de %{user} + new: + title: Nova taglibra ero view: leave_a_comment: Komenti login: Ensaluti diff --git a/config/locales/es.yml b/config/locales/es.yml index 5aaeb6764..f801aa209 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -20,6 +20,7 @@ # Author: Peter17 # Author: Remux # Author: Rubenwap +# Author: Sim6 # Author: Toliño # Author: Translationista # Author: VegaDark @@ -65,8 +66,8 @@ es: changeset: Conjunto de cambios changeset_tag: Etiqueta del conjunto de cambios country: País - diary_comment: Comentario diario - diary_entry: Entrada diaria + diary_comment: Comentario de diario + diary_entry: Entrada del diario friend: Amigo language: Idioma message: Mensaje @@ -124,7 +125,7 @@ es: one: "Tiene la siguiente %{count} relación:" other: "Tiene las siguientes %{count} relaciones:" has_ways: - one: "Tiene el siguiente %{count} vía:" + one: "Tiene la siguiente %{count} vía:" other: "Tiene las siguientes %{count} vías:" no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios. show_area_box: Mostrar caja del área @@ -149,7 +150,7 @@ es: way: Editar vía larger: area: Ver área en un mapa más grande - node: Ver nodo en un mapa más grande + node: Ver el nodo en un mapa más grande note: Ver la nota en un mapa más grande relation: Ver la relación en un mapa más grande way: Ver la vía en un mapa más grande @@ -185,9 +186,9 @@ es: node_history_title: "Historial del nodo: %{node_name}" view_details: Ver detalles not_found: - sorry: Lo sentimos, el %{type} con ID %{id} no fue encontrado. + sorry: Lo sentimos, no se ha encontrado %{type} con ID %{id}. type: - changeset: conjunto de cambios + changeset: el conjunto de cambios node: el nodo relation: la relación way: la vía @@ -204,7 +205,7 @@ es: title: Nota paging_nav: of: de - showing_page: página + showing_page: la página redacted: message_html: La versión %{version} de este %{type} no se puede mostrar tal como ha sido redactada. Consulte %{redaction_link} para obtener más detalles. redaction: Redacción %{id} @@ -245,7 +246,7 @@ es: notes_layer_name: Ver notas object_list: api: Descargar esta área a través de la API - back: Volver a la lista de proyectos + back: Volver a la lista de objetos details: Detalles heading: Lista de objetos history: @@ -273,12 +274,12 @@ es: tag: La página en el wiki con la descripción de la etiqueta %{key}=%{value} wikipedia_link: El artículo %{page} en Wikipedia timeout: - sorry: Lo sentimos, los datos para el %{type} con el identificador %{id} han tardado demasiado tiempo en obtenerse. + sorry: Lo sentimos, los datos para %{type} con el identificador %{id} han tardado demasiado tiempo en obtenerse. type: - changeset: conjunto de cambios - node: nodo - relation: relación - way: vía + changeset: el conjunto de cambios + node: el nodo + relation: la relación + way: la vía way: download_xml: Descargar XML edit: Editar vía @@ -318,7 +319,7 @@ es: list: description: Examinar los cambios recientes hecho en el mapa description_bbox: Conjunto de cambios dentro de %{bbox} - description_friend: Conjuntos de cambios realizados por vuestros amigos + description_friend: Conjuntos de cambios realizados por tus amigos description_nearby: Conjuntos de cambios realizados por usuarios cercanos description_user: Conjunto de cambios por %{user} description_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox} @@ -332,12 +333,12 @@ es: heading_user_bbox: Conjuntos de cambios title: Conjuntos de cambios title_bbox: Conjunto de cambios dentro de %{bbox} - title_friend: Conjuntos de cambios realizados por vuestros amigos + title_friend: Conjuntos de cambios realizados por tus amigos title_nearby: Conjuntos de cambios realizados por usuarios cercanos title_user: Conjunto de cambios por %{user} title_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox} timeout: - sorry: Lo sentimos, la lista del conjunto de cambios que has solicitado ha tardado mucho tiempo en recuperarse. + sorry: Lo sentimos, la lista de conjuntos de cambios que has solicitado ha tardado mucho tiempo en recuperarse. diary_entry: comments: ago: hace %{ago} @@ -360,8 +361,8 @@ es: confirm: Confirmar edit_link: Editar esta entrada hide_link: Ocultar esta entrada - posted_by: Ingresado por %{link_user} el %{created} en %{language_link} - reply_link: Responder a la entrada + posted_by: Publicado por %{link_user} el %{created} en %{language_link} + reply_link: Responder a esta entrada edit: body: "Cuerpo:" language: "Idioma:" @@ -413,7 +414,7 @@ es: title: Diario de %{user} | %{title} user_title: Diario de %{user} editor: - default: Por defecto (actualmente % {nombre}) + default: Predeterminado (actualmente %{name}) id: description: iD (editor en el navegador) name: iD @@ -445,7 +446,7 @@ es: options: Opciones osm_xml_data: Datos OpenStreetMap en formato XML output: Resultado - paste_html: HTML para empotrar en otro sitio de internet + paste_html: Pegar código HTML para insertar en otro sitio de internet scale: Escala too_large: body: Esta área es demasiado grande para ser exportada como datos XML de OpenStreetMap. Por favor, acérquese o seleccione un área más pequeña, o utilice una de las siguientes fuentes para la descarga de datos masiva. @@ -499,8 +500,10 @@ es: title: ca_postcode: Resultados en Geocoder.CA geonames: Resultados en GeoNames + geonames_reverse: Resultados de GeoNames latlon: Resultados en Internal osm_nominatim: Resultados de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados en NPEMap / FreeThe Postcode us_postcode: Resultados en Geocoder.us search_osm_nominatim: @@ -551,7 +554,7 @@ es: cinema: Cine clinic: Clínica club: Club - college: Universidad o instituto + college: Instituto community_centre: Centro comunitario courthouse: Juzgado crematorium: Crematorio @@ -559,13 +562,13 @@ es: doctors: Consultorio médico dormitory: Residencia de estudiantes drinking_water: Agua potable - driving_school: Escuela de manejo + 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: Estación de bomberos + fire_station: Parque de bomberos food_court: Zona de restaurantes fountain: Fuente fuel: Gasolinera @@ -647,8 +650,8 @@ es: bus_guideway: Canal guiado de autobuses bus_stop: Parada de autobuses byway: Camino - construction: Autopista en construcción - cycleway: Carril bicicleta + construction: Vía en construcción + cycleway: Carril bici emergency_access_point: Acceso de emergencia footway: Sendero ford: Vado @@ -665,7 +668,7 @@ es: primary_link: Enlace de carretera principal proposed: Carretera propuesta raceway: Pista de carreras - residential: Residencial + residential: Calle rest_area: Área de descanso road: Carretera secondary: Carretera secundaria @@ -675,7 +678,7 @@ es: speed_camera: Radar steps: Escaleras stile: Escalera para atravesar verjas - street_lamp: Lámpara de calle + street_lamp: Farola tertiary: Carretera terciaria tertiary_link: Carretera terciaria track: Pista @@ -688,7 +691,7 @@ es: archaeological_site: Yacimiento arqueológico battlefield: Campo de batalla boundary_stone: Mojón - building: Edificio histórico + building: Edificio castle: Castillo church: Iglesia citywalls: Murallas de la ciudad @@ -703,7 +706,7 @@ es: ruins: Ruinas tomb: Tumba tower: Torre - wayside_cross: Camino cruzado + wayside_cross: Crucero wayside_shrine: Sepulcro wreck: Pecio landuse: @@ -711,8 +714,8 @@ es: basin: Cuenca brownfield: Solar vacante cemetery: Cementerio - commercial: Área Comercial - conservation: Conservación + commercial: Área de oficinas + conservation: Espacio natural protegido construction: Construcción farm: Granja farmland: Tierra de labranza @@ -763,7 +766,7 @@ es: sports_centre: Centro deportivo stadium: Estadio swimming_pool: Piscina - track: Pista de carreras + track: Pista de atletismo water_park: Parque acuático military: airfield: Aeródromo militar @@ -866,7 +869,7 @@ es: narrow_gauge: Ferrocarril de vía estrecha platform: Andén preserved: Vía ferroviaria preservada - proposed: Vía de tren propuesto + proposed: Vía de tren propuesta spur: Ramal ferroviario station: Estación de trenes stop: Parada de tren diff --git a/config/locales/et.yml b/config/locales/et.yml index 81011956f..a0e2c17c2 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -546,6 +546,9 @@ et: "yes": Sild building: "yes": Hoone + emergency: + fire_hydrant: Tuletõrjehüdrant + phone: Hädaabi telefon highway: bridleway: Ratsatee bus_stop: Bussipeatus @@ -564,6 +567,7 @@ et: secondary: Tugimaantee speed_camera: Kiiruskaamera steps: Trepp + street_lamp: Tänavavalgusti tertiary: Kohalik maantee unsurfaced: Katteta tee historic: @@ -582,6 +586,8 @@ et: museum: Muuseum ruins: Varemed tower: Torn + wayside_cross: Teeäärne rist + wayside_shrine: Teeäärne altar wreck: Vrakk landuse: cemetery: Surnuaed @@ -695,6 +701,7 @@ et: platform: Raudteeperroon spur: Raudtee harutee station: Raudteejaam + stop: Raudteepeatus subway: Metroojaam subway_entrance: Metroo sissepääs switch: Pöörangud @@ -722,6 +729,8 @@ et: furniture: Mööbel gallery: Galerii garden_centre: Aianduskeskus + gift: Kingipood + grocery: Toidupood hairdresser: Juuksur hardware: Rauakauplus insurance: Kindlustus @@ -730,8 +739,11 @@ et: laundry: Pesumaja market: Turg mobile_phone: Mobiiltelefonide pood + motorcycle: Mootorrattapood music: Muusikapood + optician: Prillipood pet: Lemmikloomapood + pharmacy: Apteek shoes: Kingapood shopping_centre: Kaubanduskeskus sports: Spordipood @@ -776,6 +788,7 @@ et: map: base: cycle_map: Rattakaart + standard: Tavakaart transport_map: Transpordikaart layers: data: Kaardi andmed @@ -958,6 +971,7 @@ et: title: OpenStreetMap märkused notifier: diary_comment_notification: + footer: Loe kommentaari lehel %{readurl}. Võid lisada oma kommentaari lehel %{commenturl} või vastata kommentaarile lehel %{replyurl}. header: "%{from_user} on kommenteerinud sinu hiljutist OpenStreetMap päeviku sissekannet pealkirjaga %{subject}:" hi: Tere, %{to_user}! subject: "[OpenStreetMap] %{user} kommenteeris sinu päeviku sissekannet" @@ -972,10 +986,24 @@ et: greeting: Tere, hopefully_you: Keegi (loodetavasti sina) soovib muuta oma %{server_url} meiliaadressi kujule %{new_address}. friend_notification: - had_added_you: "% {user} lisas sind OpenStreetMap'is sõbraks." + befriend_them: Sa võid ta lisada oma sõbraks aadressil %{befriendurl}. + had_added_you: "%{user} lisas sind OpenStreetMapis sõbraks." + see_their_profile: Tema profiiliga võid tutvuda aadressil %{userurl}. subject: "[OpenStreetMap] %{user} lisas sind oma sõbraks" gpx_notification: + and_no_tags: ja millel sildid puuduvad. + and_the_tags: "ja järgmised sildid:" + failure: + failed_to_import: "importimine ebaõnnestus. Siin on viga:" + more_info_1: Rohkem infot GPX importimise tõrgete ja selle kohta, kuidas + more_info_2: "neid vältida leiab:" + subject: "[OpenStreetMap] GPX importimine nurjus" greeting: Tere, + success: + loaded_successfully: laaditi üles edukalt %{trace_points} punkti võimalikust %{possible_points} punktist. + subject: "[OpenStreetMap] GPX Importimine õnnestus" + with_description: ", mille kirjeldus on" + your_gpx_file: Paistab, et sinu GPX-fail lost_password: subject: "[OpenStreetMap] Parooli lähtestamise taotlus" lost_password_html: @@ -987,6 +1015,7 @@ et: greeting: Tere, hopefully_you: Keegi (tõenäoliselt sina) on esitanud taotluse oma parooli lähtestamiseks antud meiliaadressiga openstreetmap.org kasutajakonto alt. message_notification: + footer_html: Sõnumit võib lugeda samuti lehel %{readurl} ja vastata sellele %{replyurl}. header: "%{from_user} on saatnud sulle OpenStreetMapi kaudu sõnumi teemaga %{subject}:" hi: Tere, %{to_user}, note_comment_notification: @@ -1022,15 +1051,18 @@ et: application: Rakenduse nimi issued_at: Väljastatud list_tokens: "Järgmised turvamärgid on rakendustele väljastatud sinu nime all:" - my_apps: Minu kliendirakendused + my_apps: Minu klientrakendused my_tokens: Minu autoriseeritud rakendused no_apps: Kas omad rakendust, mida soovid siin kasutamiseks registreerida, kasutades %{oauth} standardit? Selleks tuleb kõigepealt registreerida oma veebirakendus enne kui see saab teostada OAuth päringuid antud teenusele. register_new: Registreeri oma rakendus + registered_apps: "Sul on registreeritud on järgmised klientrakendused:" revoke: Tühista! title: Minu OAuth seaded new: submit: Registreeri title: Registreeri uus rakendus + not_found: + sorry: Kahjuks tüüpi %{type} ei leitud. show: confirm: Kas oled kindel? delete: Kustuta klient @@ -1273,6 +1305,7 @@ et: confirm_email: button: Kinnita heading: Kinnita e-posti aadressi muutmine + press confirm button: Kliki nupul kinnita oma uue e-posti aadressi kinnitamiseks. confirm_resend: failure: Kasutajat %{name} ei leitud. filter: @@ -1312,6 +1345,7 @@ et: help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Me saadame sinna lingi, mida saad kasutada oma parooli uuesti seadmiseks. new password button: Saada mulle uus salasõna notice email cannot find: Seda e-posti aadressi ei leitud. + notice email on way: Kahju, et sa parooli kaotasid :-( kuid ära muretse, peagi saad meili, et saaksid oma parooli ära muuta. title: Unustatud salasõna make_friend: already_a_friend: Sa oled kasutajaga %{name} juba sõber. @@ -1339,6 +1373,8 @@ et: nearby mapper: Lähedaloevad kaardistajad your location: Sinu asukoht remove_friend: + button: Eemalda sõprade hulgast + heading: Eemaldada %{user} sõprade hulgast? not_a_friend: "%{name} ei ole üks sinu sõpradest." success: "%{name} eemaldati sinu sõprade hulgast." reset_password: @@ -1374,8 +1410,8 @@ et: ct status: "Kaastöötingimused:" delete_user: kustuta see kasutaja description: Kirjeldus - diary: päevik - edits: muudatused + diary: Päevik + edits: Muudatused email address: "E-posti aadress:" friends_changesets: Sõprade muutuskogumid friends_diaries: Sõprade päevikusissekanded @@ -1384,11 +1420,12 @@ et: latest edit: "Viimane muudatus %{ago}:" m away: "%{count} meetri kaugusel" mapper since: "Kaardistaja alates:" - my comments: minu kommentaarid + my comments: Minu kommentaarid my diary: minu päevik my edits: minu muutmised my notes: minu märkused - my settings: minu seaded + my profile: Minu profiil + my settings: Minu seadistused my traces: minu jäljelogid nearby users: Teised lähedal asuvad kasutajad nearby_changesets: Lähedalasuvate kasutajate muutuskogumid @@ -1396,17 +1433,17 @@ et: new diary entry: uus päevikusissekanne no friends: Sa ei ole lisanud veel ühtegi sõpra. no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad läheduses. - notes: märkused + notes: Märkused oauth settings: oauth seaded remove as friend: eemalda sõprade hulgast role: administrator: See kasutaja on administraator moderator: See kasutaja on moderaator - send message: saada sõnum + send message: Saada sõnum settings_link_text: seaded spam score: "Rämpsposti tulemus:" status: "Staatus:" - traces: jäljelogid + traces: Jäljelogid unhide_user: muuda see kasutaja nähtavaks user location: Kasutaja asukoht your friends: Sinu sõbrad diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 31a20ac98..952d658ee 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -3,6 +3,7 @@ # Export driver: syck-pecl # Author: BMRG14 # Author: Baqeri +# Author: Ebraminio # Author: Grille chompa # Author: Hooshmand.hasannia # Author: Huji @@ -48,12 +49,14 @@ fa: display_name: نام نمایشی email: پست الکترونیکی languages: زبان‌ها - pass_crypt: کلمه عبور + pass_crypt: گذرواژه models: acl: دسترسی به لیست کنترل changeset: مجموعه تغییرات changeset_tag: برچسب Changeset country: کشور + diary_comment: نظر خاطرات روزانه + diary_entry: مدخل خاطرات روزانه friend: دوست language: زبان message: پیغام @@ -61,14 +64,23 @@ fa: node_tag: تگ گره notifier: آگاه‌گردان old_node: گره‎ قدیمی + old_node_tag: برچسپ گرهٔ قدیمی + old_relation: رابطهٔ قدیمی + old_relation_member: عضو رابطهٔ قدیمی + old_relation_tag: برچسپ رابطهٔ قدیمی old_way: راه قدیمی + old_way_node: گرهٔ راه قدیمی + old_way_tag: برچسپ راه قدیمی relation: ارتباط + relation_member: ضعضو رابطه + relation_tag: برچسپ رابطه session: نشست trace: ردیابی tracepoint: ردیابی نقطه tracetag: ردیابی برچسب user: کاربر user_preference: ترجیحات کاربر + user_token: نشان کاربر way: راه way_node: گره راه way_tag: برچسب راه @@ -124,10 +136,12 @@ fa: all: next_changeset_tooltip: تغییرات بعدی next_node_tooltip: گره بعدی + next_note_tooltip: یادداشت بعد next_relation_tooltip: ارتباط بعدی next_way_tooltip: راه بعدی prev_changeset_tooltip: تغییرات قبلی prev_node_tooltip: گره قبلی + prev_note_tooltip: یادداشت قبل prev_relation_tooltip: رابطه قبلی prev_way_tooltip: راه قبلی user: @@ -135,8 +149,8 @@ fa: next_changeset_tooltip: "%{user} ویرایش بعدی توسط" prev_changeset_tooltip: "%{user} قبلی ویرایش توسط" node: - download_xml: بارگیری XML - edit: ویرایش + download_xml: دریافت اکس‌ام‌ال + edit: ویرایش گره node: گره node_title: "گره: %{node_name}" view_history: نمایش تاریخچه @@ -144,7 +158,7 @@ fa: coordinates: "مختصات:" part_of: "بخشی از:" node_history: - download_xml: بارگیری XML + download_xml: دریافت اکس‌ام‌ال node_history: تاریخچه منطقه node_history_title: "تاریخچه منطقه: %{node_name}" view_details: نمایش جزئیات @@ -156,17 +170,26 @@ fa: relation: ارتباط way: راه note: + at_by_html: "%{when} پیش توسط %{user}" + at_html: "%{when} پیش" + closed: "بسته‌شده:" + closed_title: "بادداشت برطرف‌شده: %{note_name}" comments: "نظرات:" + description: "توضیحات:" + last_modified: "آخرین ویرایش:" + open_title: "یادداشت نامربوط: %{note_name}" + opened: "بازشده:" + title: یادداشت paging_nav: of: از - showing_page: صفحه نمایش + showing_page: صفحه redacted: type: node: گره relation: ارتباط way: راه relation: - download_xml: بارگیری XML + download_xml: دریافت اکس‌ام‌ال relation: ارتباط relation_title: "ارتباطات: %{relation_name}" view_history: نمایش تاریخچه @@ -174,7 +197,7 @@ fa: members: "اعضا:" part_of: "بخشی از:" relation_history: - download_xml: بارگیری XML + download_xml: دریافت اکس‌ام‌ال relation_history: تاریخچه ارتباطات relation_history_title: "تاریخچه ارتباطات: %{relation_name}" view_details: نمایش جزئیات @@ -185,19 +208,20 @@ fa: relation: ارتباط way: راه start_rjs: - data_frame_title: داده ها - data_layer_name: داده ها + data_frame_title: داده‌ها + data_layer_name: مرور نقشهٔ داده‌ها details: جزئیات edited_by_user_at_timestamp: "%{timestamp} در %{user} ویرایش توسط" hide_areas: پنهان‌کردن منطقه‌ها history_for_feature: "%{feature} تاریخچه برای" - load_data: بارگذاری داده ها + load_data: بارگیری داده‌ها loaded_an_area_with_num_features: " شما منطقه‌ای را بارگذاری کردید که شامل%{num_features} می‌شود. به طورکلی بعضی از مرورگرها نمی توانند با این مقدار اطلاعات تصویری کار کنند.کلا مرورگرها برای نمایش اطلاعات کمتر از 100 مورد در زمان در بهترین وضعیت هستند: و هر میزان دیگر میتواند مرورگر ار کند یا قفل کند.اگر شما میخواهید این اطلاعات دیده شود دکمه زیر را فشار دهید." loading: در حال بارگیری... manually_select: به صورت دستی منطقه دیگری را انتخاب کنید + notes_layer_name: مرور نکات object_list: api: بازیابی این منطقه از ای‌پی‌آی - back: نمایش فهرست موضوع + back: بازگشت به فهرست شیء details: جزئیات heading: لیست اجزاء history: @@ -215,6 +239,7 @@ fa: show_areas: نمایش منطقه‌ها show_history: نمایش سابقه unable_to_load_size: "نمی‌تواند بارگذاری کند: اندازه جعبه ارتباطی %{bbox_size} خیلی زیاد هست و باید کمتر از %{max_bbox_size} باشد" + view_data: نمایش داده‌های نمایش فعلی نقشه wait: صبر کنید... zoom_or_select: بزگنمایی کنید یا بخشی از منطقه را برای دیدن انتخاب کنید tag_details: @@ -231,8 +256,8 @@ fa: relation: ارتباط way: راه way: - download_xml: بارگیری XML - edit: ویرایش + download_xml: دریافت اکس‌ام‌ال + edit: ویرایش راه view_history: نمایش تاریخچه way: راه way_title: "راه: %{way_name}" @@ -242,7 +267,7 @@ fa: nodes: "گره‌ها:" part_of: "بخشی از:" way_history: - download_xml: بارگیری XML + download_xml: دریافت اکس‌ام‌ال view_details: نمایش جزئیات way_history: تاریخچهٔ راه way_history_title: "تاریخچهٔ راه: %{way_name}" @@ -254,10 +279,11 @@ fa: no_edits: (بدون ویرایش) show_area_box: نمایش جعبهٔ منطقه still_editing: (هنوز در حال ویرایش) + view_changeset_details: نمایش جزئیات مجموعهٔ تغییرات changeset_paging_nav: next: بعدی » previous: « قبلی - showing_page: نمایش صفحهٔ %{page} + showing_page: صفحهٔ %{page} changesets: area: منطقه comment: توضیح @@ -265,8 +291,25 @@ fa: saved_at: ذخیره شد در user: کاربر list: - description: تغییرات اخیر + description: مرور مشارکت‌های اخیر به نقشه + description_bbox: مجموعهٔ تغییرات درون %{bbox} + description_friend: مجموعهٔ تغییرات توسط دوستانتان + description_nearby: مجموعهٔ تغییرات توسط کاربران نزدیک + description_user: مجموعهٔ تغییرات %{user} + description_user_bbox: مجموعهٔ تغییرات توسط %{user} درون %{bbox} empty_anon_html: هنوز هیچ ویرایشی انجام نشده است. + heading: مجموعهٔ تغییرات + heading_bbox: مجموعهٔ تغییرات + heading_friend: مجموعهٔ تغییرات + heading_nearby: مجموعهٔ تغییرات + heading_user: مجموعهٔ تغییرات + heading_user_bbox: مجموعهٔ تغییرات + title: مجموعهٔ تغییرات + title_bbox: مجموعهٔ تغییرات درون %{bbox} + title_friend: مجموعهٔ تغییرات توسط دوستانتان + title_nearby: مجموعهٔ تغییرات توسط کاربران نزدیک + title_user: مجموعهٔ تغییرات %{user} + title_user_bbox: مجموعهٔ تغییرات توسط %{user} درون %{bbox} diary_entry: comments: ago: "% {پیش} پیش" @@ -276,7 +319,7 @@ fa: post: پست diary_comment: confirm: تأیید - hide_link: پنهان کردن این نظر + hide_link: پنهان‌کردن این نظر diary_entry: comment_count: one: 1 نظر @@ -736,7 +779,7 @@ fa: history: تاریخچه home: خانه intro_2_create_account: ایجاد حساب کاربری - intro_2_download: بارگیری + intro_2_download: دریافت intro_2_license: مجوز آزاد intro_2_use: استفاده کن log_in: ورود به سیستم @@ -760,7 +803,7 @@ fa: license_page: foreign: english_link: اصل انگلیسی - text: در زمان به وجود آمدن تداخل بین برگردان پارسی و %{english_original_link}، نوشته‌ی انگلیسی برتری دارد + text: در زمان به وجود آمدن تداخل بین برگردان فارسی و %{english_original_link}، نوشتهٔ انگلیسی برتری دارد title: درباره این ترجمه‌ها legal_babble: contributors_footer_1_html: برای اطلاعات بیشتر درباره این منابع و سایر منابع مورد استفاده برای پیشرفت اوپن‌استریت‌مپ، لطفا این پیوند را نگاه کنید. @@ -782,9 +825,9 @@ fa: title: صندوق دریافت message_summary: delete_button: حذف - read_button: علامت‌گذاری به عنوان خوانده‌شده + read_button: علامت‌گذاری به‌عنوان خوانده‌شده reply_button: پاسخ - unread_button: علامت‌گذاری به عنوان خوانده‌شده + unread_button: علامت‌گذاری به‌عنوان خوانده‌شده new: back_to_inbox: بازگشت به صندوق دریافت body: بدنه @@ -809,7 +852,7 @@ fa: reply_button: پاسخ subject: عنوان to: به - unread_button: علامت‌گذاری به عنوان خوانده‌شده + unread_button: علامت‌گذاری به‌عنوان خوانده‌شده sent_message_summary: delete_button: حذف note: @@ -894,10 +937,10 @@ fa: trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده است. این کار معمولاً نیم ساعت طول می‌کشد و در صورت تکمیل، رایانامه‌ای به شما فرستاده خواهد شد. upload_trace: ارسال ردیابی جی‌پی‌اس delete: - scheduled_for_deletion: فهرست پیگیری برای حذف کردن + scheduled_for_deletion: فهرست پی‌گیری برای حذف‌کردن edit: description: "شرح:" - download: بارگیری + download: دریافت edit: ویرایش filename: "نام پرونده:" heading: ویرایش رهگیری %{name} @@ -909,7 +952,7 @@ fa: tags: "برچسب‌ها:" tags_help: ویرگول مرزبندی شده title: ویرایش رهگیری %{name} - uploaded_at: ":بارگذاری شد" + uploaded_at: "بارگذاری شد:" visibility: "پدیداری:" visibility_help: به چه معنی است؟ list: @@ -921,9 +964,9 @@ fa: made_public: رسم‌کردن عمومی offline: heading: ذخیره بدون اینترنت جی‌پی‌اس - message: ذخیره جی‌پی‌اس و بارگذاری سامانه غیرقابل دسترس می‌باشد + message: ذخیره جی‌پی‌اس و بارگذاری سامانه غیرقابل دسترس است offline_warning: - message: سامانه بارگذاری جی‌پی‌اکس غیرقابل دسترس می‌باشد + message: سامانهٔ بارگذاری جی‌پی‌اکس غیرقابل دسترس است trace: ago: "%{time_in_words_ago} پیش" by: توسط @@ -960,7 +1003,7 @@ fa: view: delete_track: حذف این رهگیری description: "شرح:" - download: بارگیری + download: دریافت edit: ویرایش edit_track: ویرایش این رهگیری filename: "نام پرونده:" @@ -974,13 +1017,13 @@ fa: tags: "برچسب‌ها:" title: دیدن رهگیری %{name} trace_not_found: رهگیری یافت نشد! - uploaded: ":بارگذاری شد" + uploaded: "بارگذاری شد:" visibility: "پدیداری:" visibility: - identifiable: " قابل تشخیص(نقاط مرتب شده بر اساس زمان را در فهرست پیگیری به عنوان قابل تشخیص نشان دهید)" + identifiable: قابل شناسایی (نقاط مرتب‌شده بر اساس زمان را در فهرست پی‌گیری به‌عنوان قابل تشخیص نشان دهید) private: خصوصی (فقط به عنوان ناشناس ، نقاط نامشخص) - public: عمومی (نقاط مرتب نشده را در فهرست پیگیری به عنوان ناشناس نمایش دهید( - trackable: (قابل پیگیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس به اشتراک بگذارید + public: عمومی (نقاط مرتب نشده را در فهرست پی‌گیری به عنوان ناشناس نمایش دهید( + trackable: قابل پی‌گیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس به اشتراک بگذارید) user: account: contributor terms: @@ -1007,7 +1050,7 @@ fa: my settings: تنظیمات من new email address: "رایانامهٔ جدید:" new image: افزون یک تصویر - no home location: شما مجبور به وارد کردن موقعیت خانه‌تان نیستید + no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید. openid: link text: این چیست؟ openid: "OpenID:" @@ -1061,7 +1104,7 @@ fa: heading: ورود به سیستم login_button: ورود new to osm: به نقشهٔ باز شهری جدید؟ - password: "کلمه عبور:" + password: "گذرواژه:" remember: "به‌خاطر سپردن من:" title: ورود به سیستم logout: @@ -1090,7 +1133,7 @@ fa: email address: "رایانامه:" no_auto_account_create: متاسفانه در حال حاضر برای ما امکان ساخت خودکار حساب کاربری مقدور نیست openid: "%{logo} OpenID:" - password: "کلمه عبور:" + password: "گذرواژه:" terms accepted: با تشکر از پذیرش شرایط نویسندگان جدید! title: ایجاد حساب کاربری no_such_user: @@ -1103,13 +1146,13 @@ fa: your location: مکان حضور شما remove_friend: not_a_friend: "%{name} از دوستان شما نیست." - success: "%{name} از دوستان شما حذف شده است." + success: "%{name} از دوستان شما حذف شده‌است." reset_password: confirm password: "تایید گذرواژه:" flash changed: رمز عبور شما تغییر کرده است. flash token bad: آیا آن مورد دیافتی را یافتید؟آدرس اینترنتی را چک کنید - heading: بازیابی کلمه عبور برای %{user} - password: "کلمه عبور:" + heading: بازنشانی گذرواژهٔ %{user} + password: "گذرواژه:" reset: بازنشانی گذرواژه title: بازنشانی گذرواژه set_home: @@ -1168,7 +1211,7 @@ fa: oauth settings: تنظیمات oauth remove as friend: حذف به‌عنوان دوست role: - administrator: این کاربر سرپرست می‌باشد + administrator: این کاربر سرپرست است grant: administrator: به سرپرست دسترسی بدهید moderator: به سرپرست دسترسی بدهید diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 6b6fb1030..b527352cd 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -15,6 +15,7 @@ # Author: Silvonen # Author: Snidata # Author: Str4nd +# Author: Susannaanas # Author: Tomi Toivio # Author: Usp # Author: ZeiP @@ -98,7 +99,7 @@ fi: browse: changeset: changeset: "Muutoskokoelma: %{id}" - changesetxml: muutoskokoelman XML + changesetxml: Muutoskokoelman XML feed: title: Muutoskokoelma %{id} title_comment: Muutoskokoelma %{id} - %{comment} @@ -193,6 +194,7 @@ fi: last_modified: "Muokattu viimeksi:" open_title: "Ratkaisematon karttailmoitus: %{note_name}" opened: "Lähetetty:" + title: Karttailmoitus paging_nav: of: " /" showing_page: sivu @@ -439,9 +441,19 @@ fi: paste_html: Kopioi ja liitä tämä HTML-koodi verkkosivullesi scale: Mittakaava too_large: - body: Tämä alue on liian suuri OpenStreetMap XML-tiedoksi tuotavaksi. Lähennä karttaa tai valitse pienempi alue. + body: "Näin suurta aluetta ei voi viedä OpenStreetMap XML-tiedostona. Lähennä karttaa tai valitse pienempi alue, tai vaihtoehtoisesti lataa tiedosto joltakin seuraavista:" + geofabrik: + description: Säännöllisesti päivitetyt otteet maanosista, maista ja valituista kaupungeista + title: Geofabrik-lataukset heading: Liian suuri alue + metro: + description: Otteita maailman suurista kaupungeista ja niitä ympäröivistä alueista + title: Metro-otteet + other: + description: Muut lähteet ovat esillä OpenStreetMap-wikissä + title: Muut lähteet planet: + description: Säännöllisesti päivitettyjä kopioita täydellisestö OpenStreetMap-tietokannasta title: Planet OSM zoom: Zoom-taso start_rjs: @@ -480,8 +492,10 @@ fi: title: ca_postcode: Tulokset palvelusta Geocoder.CA geonames: Tulokset palvelusta GeoNames + geonames_reverse: Hakutulokset GeoNamesista latlon: Sisäiset tulokset osm_nominatim: Tulokset OpenStreetMap Nominatimista + osm_nominatim_reverse: Hakutulokset OpenStreetMap Nominatimista uk_postcode: Tulokset palvelusta NPEMap / FreeThe Postcode us_postcode: Tulokset palvelusta Geocoder.us search_osm_nominatim: @@ -489,10 +503,14 @@ fi: level10: Asuinalueen raja level2: Valtion raja level4: Osavaltion raja + level5: Alueen raja level6: Maan raja level8: Kunnan raja level9: Kylän raja prefix: + aerialway: + chair_lift: Tuolihissi + drag_lift: Vetohissi aeroway: aerodrome: Lentokenttä apron: Asemataso @@ -614,6 +632,9 @@ fi: "yes": Silta building: "yes": Rakennus + emergency: + fire_hydrant: Paloposti + phone: Hätäpuhelin highway: bridleway: Ratsastustie bus_guideway: Ohjattu linja-autokaista @@ -635,6 +656,7 @@ fi: platform: Asemalaituri primary: Kantatie primary_link: Kantatie + proposed: Suunnitteilla oleva tie raceway: Kilparata residential: Asuinkatu rest_area: Lepoalue @@ -646,6 +668,7 @@ fi: speed_camera: Nopeuskamera steps: Portaat stile: Aidanylitys + street_lamp: Katuvalaisin tertiary: Yhdystie tertiary_link: Yhdystie track: Metsätie @@ -661,6 +684,7 @@ fi: building: Rakennus castle: Linna church: Kirkko + citywalls: Kaupunginmuurit fort: Linnake house: Talo icon: Ikoni @@ -670,6 +694,7 @@ fi: monument: Muistomerkki museum: Museo ruins: Rauniot + tomb: Hautakammio tower: Torni wayside_cross: Tieristi wayside_shrine: Tienvarsialttari @@ -808,6 +833,7 @@ fi: locality: Paikkakunta moor: Nummi municipality: Kunta + neighbourhood: Naapurusto postcode: Postinumero region: Alue sea: Meri @@ -833,8 +859,10 @@ fi: narrow_gauge: Kapearaiteinen rautatie platform: Asemalaituri preserved: Museorautatie + proposed: Suunnitteilla oleva rautatie spur: Pistoraide station: Rautatieasema + stop: Rautatieseisake subway: Metroasema subway_entrance: Metron sisäänkäynti switch: Ratavaihde @@ -850,6 +878,7 @@ fi: beverages: Juomakauppa bicycle: Polkupyöräkauppa books: Kirjakauppa + boutique: Puoti butcher: Lihakauppa car: Autokauppa car_parts: Auton osia @@ -863,6 +892,7 @@ fi: convenience: Lähikauppa copyshop: Kopiointipalvelu cosmetics: Kosmetiikkakauppa + deli: Herkkukauppa department_store: Tavaratalo discount: Alennusmyymälä doityourself: Tee-se-itse @@ -899,13 +929,16 @@ fi: organic: Luomukauppa outdoor: Ulkoiluvälinekauppa 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 toys: Lelukauppa travel_agency: Matkatoimisto video: Videokauppa @@ -933,6 +966,7 @@ fi: viewpoint: Näköalapaikka zoo: Eläintarha tunnel: + culvert: Siltarumpu "yes": Tunneli waterway: artificial: Kanava @@ -958,19 +992,27 @@ fi: weir: Pato javascripts: close: Sulje + edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä. key: title: Karttamerkinnät tooltip: Merkkien selitykset + tooltip_disabled: Ei käytettävissä tässä karttanäkymässä map: base: cycle_map: Pyöräilykartta + hot: Ihmisystävällinen standard: Perinteinen transport_map: Joukkoliikenne + copyright: © OpenStreetMap-kartoittajat layers: data: Kartta-aineisto header: Karttanäkymä notes: Karttailmoitukset overlays: Nämä karttamerkinnät ovat tarkoitettu karttavirheiden korjaamiseen + title: Karttanäkymä + locate: + popup: Sijainti tarkkuudella {distance} {unit} tästä pisteestä + title: Näytä oma sijaintini zoom: in: Lähennä out: Loitonna @@ -985,7 +1027,7 @@ fi: comment: Kommentoi comment_and_resolve: Kommentoi + ratkaise commented_by: kommentoinut %{user} %{time} - commented_by_anonymous: kommentti anonyymiltä %{time} + commented_by_anonymous: kommentti tuntemattomalta käyttäjältä %{time} hide: Piilota opened_by: lähettänyt %{user} %{time} opened_by_anonymous: anonyymi loi tämän %{time} @@ -996,10 +1038,22 @@ fi: resolve: Ratkaise share: cancel: Peruuta - link: Linkki - long_link: Pitkä linkki + center_marker: Keskitä kartta karttamerkkiin + custom_dimensions: Rajaa alue itse + download: Lataa + embed: HTML-koodi + format: "Tiedostomuoto:" + image: Kartta kuvana + image_size: Kuva esitetään perinteisessä karttanäkymässä koossa + include_marker: Lisää karttamerkki + link: Linkki tai HTML-koodi + long_link: Linkki + paste_html: Upota karttaikkuna liittämällä tämä koodi verkkosivulle + scale: "Mittakaava:" short_link: Lyhyt linkki + short_url: Lyhyt osoite title: Jakaminen + view_larger_map: Näytä isommalla kartalla site: createnote_disabled_tooltip: Lähennä karttaa ennen karttavirheestä ilmoittamista. createnote_tooltip: Ilmoita karttavirheestä @@ -1012,12 +1066,14 @@ fi: community_blogs: Yhteisöblogit community_blogs_title: OpenStreetMap-yhteisön jäsenten blogit copyright: Tekijänoikeudet ja lisenssit + data: Tiedot documentation: Wiki documentation_title: Projektin ohjeet donate: Tue OpenStreetMapia %{link} laitteistopäivitysrahastoon. donate_link_text: lahjoittamalla edit: Muokkaa edit_with: "Muokkaa: %{editor}" + export_data: Vie tiedostona foundation: Säätiö foundation_title: OpenStreetMap-säätiö gps_traces: GPS-jäljet @@ -1026,7 +1082,7 @@ fi: help_centre: Ohjekeskus help_title: Projektin ohjesivusto history: Historia - home: kotipaikka + home: Siirry kotipaikkaan intro_1: OpenStreetMap on avoin ja vapaasti muokattava maailmankartta. Kaikki voivat osallistua sen tekemiseen. intro_2_create_account: luomalla ensin käyttäjätunnuksen intro_2_download: ladattavissa @@ -1139,13 +1195,13 @@ fi: title: Ei sellaista viestiä outbox: date: Päiväys - inbox: saapuneet + inbox: Saapuneet messages: one: Kansiossa on %{count} lähetetty viesti. other: Kansiossa on %{count} lähetettyä viestiä. my_inbox: "%{inbox_link}" no_sent_messages: Et ole lähettänyt vielä viestejä. Miksi et ottaisi yhteyttä joihinkin %{people_mapping_nearby_link}? - outbox: lähetetyt + outbox: Lähetetyt people_mapping_nearby: lähellä kartoittaviin käyttäjiin subject: Otsikko title: Lähetetyt @@ -1166,8 +1222,13 @@ fi: delete_button: Poista note: description: + closed_at_by_html: "%{user} ratkaissut %{when} sitten" closed_at_html: Ratkaistu %{when} sitten commented_at_by_html: "%{user} päivittänyt %{when} sitten" + commented_at_html: Päivitetty %{when} sitten + opened_at_by_html: "%{user} luonut %{when} sitten" + opened_at_html: Luotu %{when} sitten + reopened_at_by_html: "%{user} aktivoinut uudelleen %{when} sitten" reopened_at_html: Avattu uudelleen %{when} sitten entry: comment: Kommentti @@ -1175,10 +1236,19 @@ fi: mine: ago_html: "%{when} sitten" created_at: Luotu + creator: Tekijä description: Kuvaus + heading: Käyttäjän %{user} karttailmoitukset + id: Tunniste last_changed: Viimeksi muutettu + subheading: Käyttäjän %{user} kommentoimat ja luomat karttailmoitukset + title: Käyttäjän %{user} kommentoimat ja luomat huomautukset rss: closed: suljettu karttailmoitus (lähellä paikkaa %{place}) + commented: uusi kommentti (lähellä kohdetta %{place}) + description_area: Luettelo raportoiduista, kommentoiduista tai suljetuista huomautuksista omalla alueellasi [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})] + description_item: Karttailmoituksen %{id} RSS-syöte + opened: uusi huomautus (lähellä kohdetta %{place}) reopened: uudelleenavattu karttailmoitus (lähellä paikka %{place}) title: OpenStreetMapin karttailmoitukset notifier: @@ -1227,6 +1297,7 @@ fi: greeting: Hei! hopefully_you: Joku (mahdollisesti sinä) on pyytänyt tähän sähköpostiosoitteeseen rekisteröidyn openstreetmap.org-tunnuksen salasanan vaihtoa. message_notification: + footer_html: Lue viesti osoitteessa %{readurl} ja vastaa siihen osoitteessa %{replyurl}. header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:" hi: Hei %{to_user}! note_comment_notification: @@ -1244,6 +1315,8 @@ fi: details: Lisää tietoja merkinnästä löytyy osoitteesta %{url}. greeting: Hei! reopened: + commented_note: "%{commenter} on aktivoinut karttailmoituksen uudelleen. Tämä viesti lähetetään siksi, että olet kommentoinut tätä karttailmoitusta, joka on lähellä paikkaa %{place}." + subject_other: "[OpenStreetMap] %{commenter} on avannut karttailmoituksen uudelleen" subject_own: "[OpenStreetMap] %{commenter} on avannut karttamerkintäsi uudelleen" your_note: "%{commenter} on avannut karttamerkinnän uudelleen lähellä paikkaa %{place}." signup_confirm: @@ -1251,7 +1324,7 @@ fi: created: Joku (toivottavasti sinä) on luonut käyttäjätunnuksen osoitteessa %{site_url}. greeting: Hei! subject: "[OpenStreetMap] Tervetuloa OpenStreetMap-sovellukseen" - welcome: Tervetuloa OpenStreetMap-karttapalveluun! Haluaisimme kertoa joitain hyödyllisiä asioita, jotta pääset alkuun. + welcome: Käyttäjätilin vahvistamisen jälkeen haluaisimme kertoa joitain hyödyllisiä asioita, jotta pääset alkuun. oauth: oauthorize: allow_read_gpx: lukea yksityisiä GPS-jälkiäsi @@ -1260,6 +1333,7 @@ fi: allow_write_api: muokata karttaa allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallenna GPS-jälkiä. + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: muokata käyttäjäsi asetuksia request_access: Sovellus %{app_name} pyytää pääsyä käyttäjätiliisi %{user}. Tarkasta oikeudet, jotka tahdot antaa sovellukselle. Voit valita mielestäsi sopivat oikeudet. revoke: @@ -1278,6 +1352,7 @@ fi: allow_write_api: kartan muokkaaminen. allow_write_diary: päiväkirjamerkintöjen luominen ja kommentointi sekä kaveripyynnöt. allow_write_gpx: GPS-jälkien tallentaminen. + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: käyttäjäasetusten muuttaminen. callback_url: Takaisinsoiton verkko-osoite name: Nimi @@ -1308,6 +1383,7 @@ fi: allow_write_api: muokata karttaa allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallentaa GPS-jälkiä + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: muokata heidän käyttäjäasetuksiaan authorize_url: "Valtuuta URL-osoite:" confirm: Oletko varma? @@ -1475,6 +1551,11 @@ fi: upload_trace: Lähetä GPS-jälki delete: scheduled_for_deletion: Jälki on poistojonossa. + description: + description_with_count: + one: GPX-tiedosto, jossa on %{count} piste käyttäjältä %{user} + other: GPX-tiedosto, jossa on %{count} pistettä käyttäjältä %{user} + description_without_count: GPX-tiedosto käyttäjältä %{user} edit: description: "Kuvaus:" download: lataa @@ -1492,6 +1573,8 @@ fi: uploaded_at: "Lähetetty:" visibility: "Näkyvyys:" visibility_help: mitä tämä tarkoittaa? + georss: + title: OpenStreetMapin GPS-jäljet list: description: Selaa juuri lähetettyjä GPS-jälkiä empty_html: Sivu on tyhjä. Lähetä uusi GPS-jälki tai lue lisätietoja GPS-jälkien keräämisestä wikisivulta. @@ -1622,8 +1705,12 @@ fi: confirm: already active: Tämä tunnus on jo vahvistettu. button: Vahvista - heading: Vahvista käyttäjätunnuksen luominen + heading: Tarkista sähköpostisi! + introduction_1: Vahvistusviesti lähetetty. + introduction_2: Vahvista tilisi klikkaamalla sähköpostissa olevaa linkkiä ja voit aloittaa kartoituksen. press confirm button: Aktivoi uusi käyttäjätunnuksesi valitsemalla Vahvista. + reconfirm_html: Tarvittaessa voimme lähettää vahvistuksen sähköpostitse, klikkaa tästä. + unknown token: Vahvistuskoodi on vanhentunut tai sitä ei ole. confirm_email: button: Vahvista failure: Tällä tunnisteella on jo vahvistettu sähköpostiosoite. @@ -1645,6 +1732,8 @@ fi: showing: one: Näytetään sivu %{page} (%{first_item}/%{items}) other: Näytetään sivu %{page} (%{first_item}-%{last_item} / %{items}) + summary: "%{name} luotu %{date} osoitteesta %{ip_address}" + summary_no_ip: "%{name} luotu %{date}" title: Käyttäjät login: account is suspended: Valitettavasti käyttäjätilisi on jäädytetty epäilyttävän toiminnan seurauksena.
Ole hyvä ja ota yhteyttä webmasteriin jos haluat keskustella tästä. @@ -1685,7 +1774,7 @@ fi: remember: Muista minut title: Kirjautumissivu to make changes: OpenStreetMapin karttatietojen muuttaminen vaatii käyttäjätunnuksen. - with openid: "Kirjaudu OpenID-tunnuksilla:" + with openid: "Kirjaudu OpenID-tunnuksella:" with username: "Onko sinulla jo OpenStreetMap-tunnus? Kirjaudu sillä sisään:" logout: heading: Kirjaudu ulos OpenStreetMapista @@ -1706,16 +1795,19 @@ fi: heading: Lisätäänkö %{user} kaveriksi? success: "%{name} on nyt kaverisi." new: + about: + header: Muokkaa vapaasti + html: "

Toisin kuin muut karttapalvelut, OpenStreetMap on täysin yhteisön eli vapaaehtoisten ihmisten luoma. Palvelun käyttö, muokkaaminen ja lataaminen on täysin ilmaista ja vapaata.

\n

Aloita kartan kehittäminen rekisteröitymällä. Tämän jälkeen vahvista käyttäjätunnus napsauttamalla linkkiä sähköpostilla lähetettävän aktivointiviestissä.

" confirm email address: "Sähköpostiosoite uudelleen:" confirm password: "Salasana uudelleen:" contact_webmaster: Voit ottaa yhteyttä webmasteriin (englanniksi) saadaksesi oman käyttäjätunnuksen. Pyrimme vastaamaan pyyntöihin mahdollisimman pikaisesti. continue: Rekisteröidy display name: "Käyttäjätunnus:" - display name description: Julkisesti näkyvä käyttäjänimesi. Tätä voi myöhemmin muuttaa asetuksista. + display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin muuttaa asetuksista. email address: "Sähköpostiosoite:" license_agreement: Kun vahvistat tilisi sinun on sitouduttava osallistujan ehtoihin. no_auto_account_create: Automaattinen käyttäjätunnuksen luonti ei ole juuri nyt käytössä. - not displayed publicly: Sähköpostia ei näytetä palvelussa julkisesti. (Sivulla tietosuojakäytäntö on englanniksi lisätietoa tietosuojakäytännöistä.) + not displayed publicly: Ei näytetä julkisesti. Lisätietoja tietosuojakäytännöstä on saatavilla englanniksi. openid: "%{logo} OpenID:" openid association: "

OpenID-tunnustasi ei ole vielä yhdistetty OpenStreetMap-käyttäjätiliin.

\n" openid no password: OpenID:iä käytettäessä salasana ei ole pakollinen, mutta jotkut erikoistyökalut ja -palvelimet saattavat vaatia sen. @@ -1756,6 +1848,7 @@ fi: consider_pd: Edellisen sopimuksen lisäksi katson lisäyksieni olevan Public Domainissa consider_pd_why: mikä tämä on? decline: En hyväksy + guidance: "Tietoa, joka auttaa ymmärtämään nämä käsitteet: a ihmisluettava yhteenveto ja joitain epävirallisia käännöksiä" heading: Osallistujaehdot legale_names: france: Ranska @@ -1770,8 +1863,8 @@ fi: add as friend: Lisää kaveriksi ago: (%{time_in_words_ago} sitten) block_history: saadut estot - blocks by me: tekemäni estot - blocks on me: saadut estot + blocks by me: Tekemäni estot + blocks on me: Saadut estot comments: Kommentit confirm: Vahvista confirm_user: vahvista tämä käyttäjä @@ -1785,7 +1878,7 @@ fi: delete_user: poista käyttäjä description: Kuvaus diary: Päiväkirja - edits: muokkaukset + edits: Muokkaukset email address: "Sähköpostiosoite:" friends_changesets: kaverien muutoskokoelmat friends_diaries: kaverien päiväkirjamerkinnät @@ -1796,12 +1889,13 @@ fi: m away: "%{count} metrin päässä" mapper since: "Liittyi palveluun:" moderator_history: tehdyt estot - my comments: omat kommentit - my diary: oma päiväkirja + my comments: Omat kommentit + my diary: Oma päiväkirja my edits: Omat muokkaukset - my notes: omat karttailmoitukset - my settings: asetukset - my traces: omat jäljet + my notes: Omat karttailmoitukset + my profile: Profiili + my settings: Asetukset + my traces: Omat jäljet nearby users: Muut lähialueen käyttäjät nearby_changesets: lähialueen käyttäjien muutoskokoelmat nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät @@ -1810,7 +1904,7 @@ fi: no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä. notes: Karttailmoitukset oauth settings: oauth-asetukset - remove as friend: poista kavereista + remove as friend: Poista kavereista role: administrator: Tämä käyttäjä on ylläpitäjä. grant: @@ -1823,7 +1917,7 @@ fi: send message: Lähetä viesti settings_link_text: asetussivulla status: "Tila:" - traces: jäljet + traces: Jäljet unhide_user: piilota tämä käyttäjä user location: Käyttäjän sijainti your friends: Kaverit @@ -1937,6 +2031,24 @@ fi: heading: Vahvista roolin poistaminen title: Vahvista roolin poistaminen welcome_page: + add_a_note: + paragraph_1_html: Jos huomaat kartalla virheen, muttet halua korjata sitä itse, tee siitä karttavirheilmoitus. + paragraph_2_html: Se on helppoa! Siirry kartalle ja napsauta -kuvaketta. Siirrä kartalle ilmestyvä karttamerkki virheen kohdalle. Kirjoita virheestä lisätietoja Suomessa olevista virheistä suomeksi ja muualla olevista virheistä paikallisella kielellä tai englanniksi. Lopuksi tallenna ilmoitus, jolloin muut kartoittajat voivat korjata virheen. + title: Eikö muokkaaminen innosta? Ilmoita karttavirheistä! + basic_terms: + editor_html: Muokkausohjelma tai kartanmuokkain (engl. editor) on ohjelmisto tai verkkosivusto, jolla voi muokata karttaa. + node_html: Piste (engl. node) on pistemäinen kohde kartalla, kuten ravintola tai puu. Näitä kutsutaan paikkapisteiksi. Lisäksi osaa pisteistä kutsutaan viivapisteiksi. + paragraph_1_html: OpenStreetMapissa käytetään lukuisia, vain siinä esiintyviä termejä. Kun nämä termit ovat hallinnassa, olet jo voiton puolella! + tag_html: Tagi sisältää tietoja, joilla kerrotaan pisteen, viivan tai alueen käyttötarkoitus. Tällaisia tietoja on esimerkiksi ravintolan nimi tai kadun nopeusrajoitus. + title: Käsitteitä ja termistöä + way_html: Avoin viiva (engl. way) on viivamainen kohde, kuten katu tai joki. Suljettu viiva eli alue (engl. area) kuvaa aluetta, kuten järveä tai rakennusta. + introduction_html: Tervetuloa OpenStreetMapiin, ilmaiseen ja vapaasti muokattavaan maailmankarttaan. Rekisteröityminen on nyt tehty, joten voit eiköhän aloiteta kartan muokkaaminen. Tutustu ensin kuitenkin näihin perusasioihin. questions: + paragraph_1_html: Tarvitsetko apua OpenStreetMapin käytössä tai muokkaamisessa? Tutustu OpenStreetMapin ohjekeskukseen. title: Kysyttävää? + start_mapping: Aloita kartan muokkaaminen title: Tervetuloa! + whats_on_the_map: + off_html: Se ei sisällä mielipiteitä, kuten arvioita, historiallisia tai hypoteettisia ominaisuuksia, eikä tietoja tekijänoikeuksin suojatuista lähteistä. Ellei sinulla ole erityistä lupaa, älä kopioi verkko- tai paperikarttoja. + on_html: OpenStreetMap on paikka kartoittaa asioita, jotka ovat sekä todellisia että nykyisiä - se sisältää miljoonia rakennuksia, teitä ja muita yksityiskohtia paikoista. Voit kartoittaa mitä tahansa reaalimaailman piirteitä, jotka sinua kiinnostavat. + title: Mitä on kartalla diff --git a/config/locales/fr.yml b/config/locales/fr.yml index eb6964d80..0de7490b7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -507,8 +507,10 @@ fr: title: ca_postcode: Résultats depuis Geocoder.CA geonames: Résultats depuis GeoNames + geonames_reverse: Résultats de GeoNames latlon: Résultats internes osm_nominatim: Résultats de OpenStreetMap Nominatim + osm_nominatim_reverse: Résultats de OpenStreetMap Nominatim uk_postcode: Résultats depuis NPEMap / FreeThe Postcode us_postcode: Résultats depuis Geocoder.us search_osm_nominatim: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 611ddc818..4acac9465 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -479,8 +479,10 @@ gl: title: ca_postcode: Resultados desde Geocoder.CA geonames: Resultados desde GeoNames + geonames_reverse: Resultados desde GeoNames latlon: Resultados internos osm_nominatim: Resultados desde OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados desde OpenStreetMap Nominatim uk_postcode: Resultados desde NPEMap / FreeThe Postcode us_postcode: Resultados desde Geocoder.us search_osm_nominatim: diff --git a/config/locales/he.yml b/config/locales/he.yml index 94d238e0f..ffd714298 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -438,7 +438,7 @@ he: paste_html: להדביק HTML להטמעה באתר scale: קנה מידה too_large: - body: האזור גדול מכדי שאפשר יהיה לייצא אותו בתור נתוני XML של OpenStreetMap. נא להתקרב או לבחור אזור קטן יותר. + body: "האזור גדול מכדי שאפשר יהיה לייצא אותו בתור נתוני XML של OpenStreetMap. נא להתקרב או לבחור אזור קטן יותר, או להשתמש במקורות הבאים בשביל הורדות נתונים גדולות:" heading: האזור גדול מדי other: title: מקורות אחרים @@ -1026,6 +1026,7 @@ he: custom_dimensions: הגדרת ממדים בהתאמה אישית download: הורדה embed: HTML + format: "תסדיר:" image: תמונה image_size: התמונה תציג שכבה רגילה תחת link: קישור או HTML @@ -1062,7 +1063,7 @@ he: help_centre: מרכז עזרה help_title: אתר עזרה עבור המיזם history: היסטוריה - home: הביתה + home: מעבר למיקום הבית intro_1: OpenStreetMap היא מפה חופשית של כל העולם, שיוצרים אנשים כמוך. intro_2_create_account: נא ליצור חשבון משתמש intro_2_download: להוריד @@ -1305,7 +1306,7 @@ he: created: מישהו (בתקווה את או אתה) יצר חשבון באתר %{site_url}. greeting: אהלן! subject: "[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ" - welcome: אנחנו רוצים לברך אותך ולתת לך קצת מידע נוסף כדי שיהיה לך קל יותר להתחיל. + welcome: אחרי אמות החשבון שלך, נספק לך מידע נוסף שיעזור לך להתחיל. oauth: oauthorize: allow_read_gpx: לקרוא את מסלולי ה־GPS הפרטיים שלך. @@ -1680,7 +1681,7 @@ he: button: אישור heading: אימות חשבון משתמש press confirm button: נא ללחוץ על כפתור האישור כדי להפעיל את חשבונך. - unknown token: נראה שהאסימון הזה אינו קיים. + unknown token: נראה שקוד האישור הזה פג או שאינו קיים. confirm_email: button: אישור failure: כתובת הדוא״ל שלך כבר אושרה באסימון הזה. diff --git a/config/locales/it.yml b/config/locales/it.yml index 3e0fd7558..9b8b472bb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -443,11 +443,20 @@ it: paste_html: Incolla l'HTML per incapsulare nel sito web scale: Scala too_large: - body: Quest'area è troppo grande per essere esportata come Dati XML di OpenStreetMap. Si prega di zoomare o di selezionare un'area più piccola. + body: "Quest'area è troppo grande per essere esportata come Dati XML di OpenStreetMap. Si prega di zoomare, di selezionare un'area più piccola o di utilizzare uno delle seguenti fonti per il download di massa dei dati:" + geofabrik: + description: Estratti aggiornati regolarmente di continenti, paesi, e città selezionata + title: Geofabrik Downloads heading: Area troppo grande + metro: + description: Estratti per le principali città del mondo e le loro aree circostanti + title: Metro Extracts other: description: Ulteriori fonti elencate sul wiki di OpenStreetMap title: Altre fonti + planet: + description: Copie aggiornate regolarmente del database OpenStreetMap completo + title: Pianeta OSM zoom: Ingrandimento start_rjs: add_marker: Aggiungi un marcatore alla mappa @@ -485,8 +494,10 @@ it: title: ca_postcode: Risultati da Geocoder.CA geonames: Risultati da GeoNames + geonames_reverse: Risultati da GeoNames latlon: Risultati da Internal osm_nominatim: Risultati restituiti da OpenStreetMap Nominatim + osm_nominatim_reverse: Risultati restituiti da OpenStreetMap Nominatim uk_postcode: Risultati da NPEMap / FreeThe Postcode us_postcode: Risultati da Geocoder.us search_osm_nominatim: @@ -992,7 +1003,8 @@ it: tooltip_disabled: La legenda è disponibile solo per il livello Standard map: base: - cycle_map: Open Cycle Map + cycle_map: Mappa ciclabile + hot: Umanitario mapquest: MapQuest Open standard: Standard transport_map: Mappa dei trasporti @@ -1002,6 +1014,7 @@ it: header: Livelli mappa notes: Note sulla mappa overlays: Abilita sovrapposizioni per la risoluzione dei problemi della mappa + title: Livelli locate: popup: Ti trovi a {distanza} {unità} da questo punto title: Mostra la mia posizione @@ -1542,6 +1555,11 @@ it: upload_trace: Carica tracciato GPS delete: scheduled_for_deletion: Tracciato in attesa di essere eliminato + description: + description_with_count: + one: File GPX con %{count} punto da %{user} + other: File GPX con %{count} punti da %{user} + description_without_count: File GPX da %{user} edit: description: "Descrizione:" download: scaricati @@ -1559,6 +1577,8 @@ it: uploaded_at: "Caricato il:" visibility: "Visibilità:" visibility_help: che cosa significa questo? + georss: + title: Tracce GPS di OpenStreetMap list: description: Naviga fra i tracciati GPS caricati recentemente empty_html: Ancora niente qui. Carica una nuova traccia o leggi ulteriori informazioni sul tracciamento GPS nella pagina wiki. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4fc3914f3..917f77e2d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -460,8 +460,8 @@ ja: geocoder: description: title: - geonames: GeoNamesからの結果 - osm_nominatim: OpenStreetMap Nominatimからの位置 + geonames: GeoNames からの位置 + osm_nominatim: OpenStreetMap Nominatim からの位置 types: cities: 都市 places: 場所 @@ -485,9 +485,11 @@ ja: search: title: ca_postcode: Geocoder.CAからの結果 - geonames: GeoNamesからの結果 + geonames: GeoNames からの結果 + geonames_reverse: GeoNames からの結果 latlon: Internalからの結果 osm_nominatim: OpenStreetMap Nominatim からの結果 + osm_nominatim_reverse: OpenStreetMap Nominatim からの結果 uk_postcode: NPEMap / FreeThe Postcodeからの結果 us_postcode: Geocoder.usからの結果 search_osm_nominatim: @@ -879,7 +881,7 @@ ja: car_repair: 自動車修理 carpet: カーペット店 charity: チャリティ ショップ - chemist: 化学者 + chemist: 薬局 clothes: 洋服店 computer: コンピューターショップ confectionery: 駄菓子屋 @@ -1001,7 +1003,7 @@ ja: data: 地図データ header: 地図のレイヤー notes: 地図メモ - overlays: 地図のトラブルシューティングのためオーバーレイを有効にする + overlays: トラブルシューティング用の地図オーバーレイ title: レイヤー locate: popup: あなたはこの位置から{distance}{unit}以内にいます @@ -1066,7 +1068,7 @@ ja: export_data: データをエクスポート foundation: 財団 foundation_title: OpenStreetMap 財団 - gps_traces: GPSトレース + gps_traces: GPS トレース gps_traces_tooltip: トレースの管理 help: ヘルプ help_centre: ヘルプ センター @@ -1759,6 +1761,8 @@ ja: heading: "%{user} を友達に追加しますか?" success: "%{name} と友達になりました!" new: + about: + header: フリー、編集可能 confirm email address: "メール アドレスの確認:" confirm password: "パスワードの確認:" contact_webmaster: アカウントを作成できるよう、webmasterに連絡してください。 できるだけ早期に、あなたの希望に対応するように努めます。 @@ -2003,6 +2007,7 @@ ja: way_html: ウェイは線または領域です。道路、水路、湖、建物などが該当します。 questions: title: 何か質問はありますか? + start_mapping: マッピングを開始 title: ようこそ! whats_on_the_map: title: 地図上にあるもの diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 93fcae3ce..3dda0fa40 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -44,7 +44,7 @@ ko: languages: 언어 pass_crypt: 비밀번호 models: - acl: 접근 조절 목록 + acl: 통행 제한 목록 changeset: 바뀜집합 changeset_tag: 바뀜집합 태그 country: 국가 @@ -59,13 +59,13 @@ ko: old_node: 이전 노드 old_node_tag: 이전 노드 태그 old_relation: 이전 관계 - old_relation_member: 이전 관계 멤버 + old_relation_member: 이전 관계 구성원 old_relation_tag: 이전 관계 태그 old_way: 이전 길 old_way_node: 이전 길 노드 old_way_tag: 이전 길 태그 relation: 관계 - relation_member: 관계 멤버 + relation_member: 관계 구성원 relation_tag: 관계 태그 session: 세션 trace: 추적 @@ -152,14 +152,14 @@ ko: edit: 노드 편집 node: 노드 node_title: "노드: %{node_name}" - view_history: 내역 보기 + view_history: 역사 보기 node_details: coordinates: "좌표:" part_of: "포함되는 노드:" node_history: download_xml: XML 다운로드 - node_history: 노드 내역 - node_history_title: "노드 내역: %{node_name}" + node_history: 노드 역사 + node_history_title: "노드 역사: %{node_name}" view_details: 자세한 내용 보기 not_found: sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못했습니다. @@ -193,14 +193,14 @@ ko: download_xml: XML 다운로드 relation: 관계 relation_title: "관계: %{relation_name}" - view_history: 내역 보기 + view_history: 역사 보기 relation_details: - members: "멤버:" + members: "구성원:" part_of: "포함되는 관계:" relation_history: download_xml: XML 다운로드 - relation_history: 관계 내역 - relation_history_title: "관계 내역: %{relation_name}" + relation_history: 관계 역사 + relation_history_title: "관계 역사: %{relation_name}" view_details: 자세한 내용 보기 relation_member: entry_role: "%{type}에서 %{role}의 %{name}" @@ -214,14 +214,14 @@ ko: details: 자세한 사항 edited_by_user_at_timestamp: "%{timestamp}에 %{user}가 수정" hide_areas: 지역 숨기기 - history_for_feature: "%{feature}의 내역" + history_for_feature: "%{feature}의 역사" load_data: 데이터 불러오기 loaded_an_area_with_num_features: 당신은 특성을 가진 지역 %{num_features}개를 불러왔습니다. 일반적으로, 일부 브라우저에서는 이 데이터 개수를 모두 처리하지 못할 수도 있습니다. 일반적으로, 브라우저들은 대개 특성 %{max_features}개 이하를 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하세요. loading: 불러오는 중... manually_select: 다른 지역 선택 notes_layer_name: 참고 찾아보기 object_list: - api: API로부터 이 지역 회수 + api: API로부터 이 지역 얻기 back: 개체 목록으로 돌아가기 details: 자세한 사항 heading: 개체 목록 @@ -238,7 +238,7 @@ ko: way: 길 private_user: 비공개 사용자 show_areas: 지역 보이기 - show_history: 내역 보기 + show_history: 역사 보기 unable_to_load_size: "불러오기 실패: 표시하려는 지역(%{bbox_size})의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다." view_data: 현재 지도 보기에 대한 데이터 보기 wait: 잠시만 기다려 주세요... @@ -248,9 +248,9 @@ ko: wiki_link: key: "%{key} 태그에 대한 위키 설명 문서" tag: "%{key}=%{value} 태그에 대한 위키 설명 문서" - wikipedia_link: 위키백과에 %{page} 문서 있음 + wikipedia_link: 위키백과의 %{page} 문서 timeout: - sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터는 너무 오래 검색하려 했습니다. + sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다. type: changeset: 바뀜집합 node: 노드 @@ -259,7 +259,7 @@ ko: way: download_xml: XML 다운로드 edit: 길 편집 - view_history: 내역 보기 + view_history: 역사 보기 way: 길 way_title: "길: %{way_name}" way_details: @@ -271,8 +271,8 @@ ko: way_history: download_xml: XML 다운로드 view_details: 자세한 내용 보기 - way_history: 길 내역 - way_history_title: "길 내역: %{way_name}" + way_history: 길 역사 + way_history_title: "길 역사: %{way_name}" changeset: changeset: anonymous: 익명 @@ -294,7 +294,7 @@ ko: user: 사용자 list: description: 지도에 최근 기여 찾아보기 - description_bbox: "%{bbox} 안에서 바뀜집합" + description_bbox: "%{bbox} 안에서의 바뀜집합" description_friend: 내 친구의 바뀜집합 description_nearby: 근처 사용자의 바뀜집합 description_user: "%{user} 사용자의 바뀜집합" @@ -308,13 +308,13 @@ ko: heading_user: 바뀜집합 heading_user_bbox: 바뀜집합 title: 바뀜집합 - title_bbox: "%{bbox} 안에서 바뀜집합" + title_bbox: "%{bbox} 안에서의 바뀜집합" title_friend: 내 친구의 바뀜집합 title_nearby: 근처 사용자의 바뀜집합 title_user: "%{user} 사용자의 바뀜집합" title_user_bbox: "%{bbox} 안에서 %{user} 사용자의 바뀜집합" timeout: - sorry: 죄송합니다, 요청하는 바뀜집합 목록을 찾는데 너무 오래 걸립니다. + sorry: 죄송합니다, 요청하는 바뀜집합 목록을 얻는데 너무 오래 걸립니다. diary_entry: comments: ago: "%{ago} 전" @@ -450,8 +450,8 @@ ko: geocoder: description: title: - geonames: GeoNames에서 위치 - osm_nominatim: OpenStreetMap Nominatim에서 위치 + geonames: GeoNames에서의 위치 + osm_nominatim: OpenStreetMap Nominatim에서의 위치 types: cities: 도시 places: 장소 @@ -474,12 +474,14 @@ ko: no_results: 결과가 없습니다 search: title: - ca_postcode: Geocoder.CA ê²°ê³¼ - geonames: GeoNames ê²°ê³¼ + ca_postcode: Geocoder.CA에서의 ê²°ê³¼ + geonames: GeoNames에서의 ê²°ê³¼ + geonames_reverse: GeoNames에서의 ê²°ê³¼ latlon: 내부 ê²°ê³¼ - osm_nominatim: OpenStreetMap Nominatim ê²°ê³¼ - uk_postcode: NPEMap / FreeThe Postcode ê²°ê³¼ - us_postcode: Geocoder.us ê²°ê³¼ + osm_nominatim: OpenStreetMap Nominatim에서의 ê²°ê³¼ + osm_nominatim_reverse: OpenStreetMap Nominatim에서의 ê²°ê³¼ + uk_postcode: NPEMap / FreeThe Postcode에서의 ê²°ê³¼ + us_postcode: Geocoder.us에서의 ê²°ê³¼ search_osm_nominatim: admin_levels: level10: 교외 경계 @@ -505,7 +507,7 @@ ko: amenity: WLAN: 와이파이 액세스 airport: 공항 - arts_centre: 문예 회관 + arts_centre: 예술 회관 artwork: 예술 작품 atm: ATM auditorium: 강당 @@ -514,28 +516,28 @@ ko: bbq: BBQ bench: 벤치 bicycle_parking: 자전거 주차장 - bicycle_rental: 자전거 대여소 + bicycle_rental: 자전거 대여 biergarten: 비어 가든 brothel: 매음굴 bureau_de_change: 환전소 bus_station: 버스 정류장 cafe: 카페 car_rental: 자동차 대여 - car_sharing: 자동차 공유 + car_sharing: ì¹´ 셰어링 car_wash: 세차장 casino: 카지노 charging_station: 충전 스테이션 cinema: 영화관 clinic: 진료소 club: 클럽 - college: 대학 + college: 전문대학 community_centre: 커뮤니티 센터 courthouse: 법원 crematorium: 화장장 dentist: 치과 doctors: 의원 dormitory: 기숙사 - drinking_water: 식수대 + drinking_water: 식수 driving_school: 운전 학교 embassy: 대사관 emergency_phone: 긴급 전화 @@ -597,7 +599,7 @@ ko: toilets: 화장실 townhall: 마을 회관 university: 대학교 - vending_machine: 자동판매기 + vending_machine: 자동 판매기 veterinary: 동물병원 village_hall: 주민센터 waste_basket: 쓰레기통 @@ -621,7 +623,7 @@ ko: phone: 긴급 전화 highway: bridleway: 승마로 - bus_guideway: 버스 전용 도로 + bus_guideway: 가이드 버스 차선 bus_stop: 버스 정류장 byway: 옆길 construction: 건설 중인 고속도로 @@ -679,7 +681,7 @@ ko: museum: 박물관 ruins: 유적 tomb: 무덤 - tower: 타워 + tower: 탑 wayside_cross: 도로변의 십자가 wayside_shrine: 길가의 신사 wreck: 난파선 @@ -770,13 +772,13 @@ ko: marsh: 습지 moor: 습지 mud: 진흙 - peak: 정상 + peak: 산정상 point: 지점 reef: 암초 ridge: 산등성이 river: 강 rock: 바위 - scree: 급사면장 + scree: 급사면 scrub: 우거진 숲 shoal: 얕은 ê³³ spring: 온천 @@ -790,16 +792,16 @@ ko: wetlands: 습지 wood: 산림 office: - accountant: 회계사 사무실 + accountant: 회계 사무소 architect: 건축사 company: 회사 employment_agency: 직업 소개소 - estate_agent: 공인 중개사 - government: 정부 기관 - insurance: 보험 사무실 + estate_agent: 부동산 중개 + government: 관청 + insurance: 보험 사무소 lawyer: 변호사 사무실 ngo: NGO 사무실 - telecommunication: 통신사 + telecommunication: 통신 사무실 travel_agent: 여행사 "yes": 사무실 place: @@ -813,7 +815,7 @@ ko: houses: 주택 island: 섬 islet: 작은 섬 - isolated_dwelling: 분리된 주택 + isolated_dwelling: 독립 주택 locality: 지역 moor: 습지 municipality: 시정촌 @@ -824,14 +826,14 @@ ko: state: 시/도/주 subdivision: 구분 suburb: 교외 - town: 탑 + town: 마을 unincorporated_area: 비법인 지역 village: 마을 railway: abandoned: 폐지된 철도 construction: 건설 중인 철도 - disused: 폐선한 철도 - disused_station: 폐선한 철도역 + disused: 폐선된 철도 + disused_station: 폐선된 철도역 funicular: 케이블 ì¹´ halt: 기차 정지 historic_station: 역사적인 철도역 @@ -860,18 +862,18 @@ ko: bakery: 제과점 beauty: 미용실 beverages: 음료 가게 - bicycle: 자전거 상점 + bicycle: 자전거 가게 books: 서점 boutique: 부티크 butcher: 정육점 - car: 자동차 상점 - car_parts: 자동차 부품 상점 - car_repair: 자동차 정비소 + car: 자동차 판매점 + car_parts: 자동차 부품점 + car_repair: 자동차 수리점 carpet: 카펫 가게 charity: 자선 가게 - chemist: 화학자 + chemist: 화학품점 clothes: 의류 상점 - computer: 컴퓨터 가게 + computer: 컴퓨터 상점 confectionery: 과자 가게 convenience: 편의점 copyshop: 복사점 @@ -881,7 +883,7 @@ ko: discount: 할인점 doityourself: Do-It-Yourself dry_cleaning: 드라이 클리닝 - electronics: 전자 제품 상점 + electronics: 전자 제품 가게 estate_agent: 공인 중개사 farm: 농장 가게 fashion: 패션 상점 @@ -889,30 +891,30 @@ ko: florist: 꽃집 food: 음식 가게 funeral_directors: 장례식장 - furniture: 가구 + furniture: 가구점 gallery: 갤러리 - garden_centre: 정원 센터 + garden_centre: 원예 용품점 general: 일반 상점 - gift: 선물 상점 + gift: 선물 가게 greengrocer: 청과상 grocery: 식료품 상점 - hairdresser: 미용실 - hardware: 집개선 상점 - hifi: 하이파이 + hairdresser: 이발소 + hardware: 철물점 + hifi: 고급 오디오 insurance: 보험 - jewelry: 보석 가게 + jewelry: 보석 상점 kiosk: 키오스크 숍 laundry: 세탁소 - mall: 몰 + mall: 쇼핑몰 market: 시장 - mobile_phone: 휴대 전화 상점 + mobile_phone: 휴대폰 상점 motorcycle: 모터사이클 상점 - music: 음악 상점 - newsagent: 신문 판매대 + music: 음반 가게 + newsagent: 신문 판매소 optician: 안경점 organic: 유기농 식품 상점 outdoor: 아웃도어 상점 - pet: 애완 가게 + pet: 애완 동물 가게 pharmacy: 약국 photo: 사진관 salon: 가게 @@ -923,7 +925,7 @@ ko: stationery: 문구점 supermarket: 수퍼마켓 tailor: 양복점 - toys: 장난감 가게 + toys: 완구점 travel_agency: 여행사 video: 비디오 가게 wine: 주점 @@ -932,7 +934,7 @@ ko: alpine_hut: 고산장 artwork: 예술 작품 attraction: 견인 - bed_and_breakfast: 잠자기와 아침 식사 + bed_and_breakfast: 잠자기와 아침 식사(민박) cabin: 오두막 camp_site: 캠프장 caravan_site: 캐러밴 사이트 @@ -1048,7 +1050,7 @@ ko: layouts: community: 커뮤니티 community_blogs: 커뮤니티 블로그 - community_blogs_title: OpenStreetMap 커뮤니티 회원 블로그 + community_blogs_title: OpenStreetMap 커뮤니티의 구성원에서의 블로그 copyright: 저작권 및 라이선스 data: 데이터 documentation: 설명서 @@ -1065,14 +1067,14 @@ ko: help: 도움말 help_centre: 도움말 센터 help_title: 프로젝트에 대한 도움말 사이트 - history: 내역 + history: 역사 home: 집 위치로 가기 intro_1: OpenStreetMap은 여러분같은 사람에 의해 만들어진 우리 모두의 전세계 지도입니다. - intro_2_create_account: 계정을 만들 수 있습니다 + intro_2_create_account: 사용자 계정을 만드세요 intro_2_download: 다운로드 intro_2_html: 데이터는 %{license}에 따라 자유롭게 %{download}와 %{use}할 수 있습니다. 지도를 개선하려면 %{create_account}. intro_2_license: 오픈 라이선스 - intro_2_use: 이용 + intro_2_use: 사용 log_in: 로그인 log_in_tooltip: 기존 계정으로 로그인 logo: @@ -1107,16 +1109,16 @@ ko: attribution_example: alt: 웹페이지에 OpenStreetMap에 표시하는 방법의 예 title: 저작자 표시 예 - contributors_at_html: "오스트리아: Stadt Wien\n(CC BY로 배포),\nLand Vorarlberg와\nLand Tirol (CC-BY AT with amendments로 배포)에서의\n데이터를 포함합니다." - contributors_ca_html: "캐나다: GeoBase®, GeoGratis\n(© Department of Natural Resources Canada),\nCanVec (© Department of Natural\nResources Canada)ê³¼ StatCan (Geography Division,\nStatistics Canada)에서의 데이터를 포함합니다." + contributors_at_html: "오스트리아: Stadt Wien\n(CC BY에 따름),\nLand Vorarlberg와\nLand Tirol (개정된 CC-BY AT에 따름)에서의\n데이터를 포함합니다." + contributors_ca_html: "캐나다: GeoBase®, GeoGratis\n(© 캐나다 천연자원부),\nCanVec (© 캐나다\n천연자원부)ê³¼ StatCan (캐나다 연방통계청,\n지리부)에서의 데이터를 포함합니다." contributors_footer_1_html: "자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한\n기타 자료에 대해서는 OpenStreetMap 위키에 있는 기여자 문서\n를 참고하세요." contributors_footer_2_html: "OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가\nOpenStreetMap을 보증하거나 어떠한 보증도 제공하거나\n어떠한 책임도 진다는 것을 의미하지 않습니다." contributors_fr_html: "프랑스: Direction Générale des Impôts에서의\n데이터를 포함합니다." - contributors_gb_html: "연합 왕국(영국): Ordnance\nSurvey 데이터를 포함합니다. © 2010년 12월 Crown\n저작권과 데이터베이스 권리." - contributors_intro_html: "기여자는 수천 명의 개인입니다. 또한 국립지도 제작 기관과\n같은 다른 소스의 공개 가능한 라이센스의 데이터를 포함합니다:" - contributors_nl_html: "네덜란드: © 2007년\nAND 데이터(www.and.com)를 포함합니다." + contributors_gb_html: "United Kingdom: 육지 측량 데이터\n© Crown 저작권 및 데이터베이스 권리\n2010-12를 포함합니다." + contributors_intro_html: "우리의 기여자는 수천 명의 개인입니다. 또한 국립지도 제작 기관과\n같은 다른 소스의 공개 가능한 라이센스의 데이터를 포함합니다:" + contributors_nl_html: "네덜란드: © AND 데이터, 2007년\n(www.and.com)을 포함합니다." contributors_nz_html: "뉴질랜드: Land Information New Zealand에서의\n데이터를 포함합니다. Crown이 저작권을 소유합니다." - contributors_title_html: 기여자 + contributors_title_html: 우리의 기여자 contributors_za_html: "남아프리카 공화국: Chief Directorate:\nNational Geo-Spatial Information에서의 데이터를\n포함합니다. State가 저작권을 소유합니다." credit_1_html: "“© OpenStreetMap 기여자”로 제작진을 넣어야\n합니다." credit_2_html: "또한 명확하게 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며,\n지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.\n이 저작권 문서로\n링크하여 이렇게 할 수 있습니다.\n또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과\n라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는\n매체(예를 들어 인쇄 작업)에서는 opendatacommons.org와\nopenstreetmap.org('OpenStreetMap'을 전체 주소로 확장)로\n독자에 직접 알려주세요. 관련 있다면 creativecommons.org로 알려주세요." @@ -1144,7 +1146,7 @@ ko: date: 날짜 from: 보낸 사람 messages: "%{new_messages}와 %{old_messages}가 있습니다" - my_inbox: 내 쪽지함 + my_inbox: 내 받은 쪽지함 new_messages: one: 새 메시지 %{count}개 other: 새 메시지 %{count}개 @@ -1179,13 +1181,13 @@ ko: title: 메시지가 없습니다. outbox: date: 날짜 - inbox: 받은 편지함 + inbox: 받은 쪽지함 messages: one: 메시지 %{count}개를 보냈습니다 other: 메시지 %{count}개를 보냈습니다 my_inbox: 내 %{inbox_link} no_sent_messages: 아직 보낸 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를 찾아보는 것은 어떨까요? - outbox: 보낸 편지함 + outbox: 보낸 쪽지함 people_mapping_nearby: 근처에 매핑한 사람 subject: 제목 title: 보낸 쪽지함 @@ -1326,7 +1328,7 @@ ko: create: flash: 성공적으로 정보를 등록했습니다 destroy: - flash: 클라이언트 응용 프로그램 등록을 파괴했습니다 + flash: 클라이언트 응용 프로그램 등록을 파기했습니다 edit: submit: 편집 title: 응용 프로그램 편집 @@ -1385,9 +1387,9 @@ ko: create: flash: 교정을 만들었습니다. destroy: - error: 이 교정을 파괴하는 중에 오류가 발생했습니다. - flash: 교정을 파괴했습니다. - not_empty: 교정이 비어 있지 않습니다. 파괴하기 전에 이 교정에 속하는 모든 버전을 교정 취소하세요. + error: 이 교정을 파기하는 중에 오류가 발생했습니다. + flash: 교정을 파기했습니다. + not_empty: 교정이 비어 있지 않습니다. 파기하기 전에 이 교정에 속하는 모든 버전을 교정 취소하세요. edit: description: 설명 heading: 교정 편집 @@ -1488,8 +1490,8 @@ ko: station: 철도역 subway: 지하철 summit: - - 정상 - - 정상 + - 산꼭대기 + - 산정상 tourist: 관광 명소 track: 추적 tram: @@ -1753,7 +1755,7 @@ ko: alt: 야후 OpenID로 로그인 title: 야후로 로그인 password: "비밀번호:" - register now: 지금 등록할 수 있습니다 + register now: 지금 등록하세요 remember: 로그인 상태를 기억하기 title: 로그인 to make changes: OpenStreetMap 데이터를 바꾸려면 계정이 있어야 합니다. @@ -1853,7 +1855,7 @@ ko: confirm: 확인 confirm_user: 이 사용자 확인 create_block: 이 사용자를 차단 - created from: "만든 날:" + created from: "만든 위치:" ct accepted: "%{ago} 전에 승인함" ct declined: 거부됨 ct status: "기여자 약관:" @@ -1892,12 +1894,12 @@ ko: role: administrator: 이 사용자는 관리자입니다 grant: - administrator: 관리자 접근 허가 - moderator: 운영자 접근 허가 + administrator: 관리자 권한 부여 + moderator: 운영자 권한 부여 moderator: 이 사용자는 운영자입니다 revoke: - administrator: 관리자 접근 해제 - moderator: 운영자 접근 해제 + administrator: 관리자 권한 해제 + moderator: 운영자 권한 해제 send message: 메시지 보내기 settings_link_text: 설정 spam score: "스팸 점수:" @@ -1940,8 +1942,8 @@ ko: heading: 사용자 차단 목록 title: 사용자 차단 model: - non_moderator_revoke: 사회자가 차단을 해제해야 합니다. - non_moderator_update: 사회자가 차단을 만들거나 업데이트해야 합니다. + non_moderator_revoke: 차단을 해제하려면 운영자여야 합니다. + non_moderator_update: 차단을 만들거나 바꾸려면 운영자여야 합니다. new: back: 모든 차단 보기 heading: "%{name} 사용자 차단" diff --git a/config/locales/lb.yml b/config/locales/lb.yml index e2aa7ff9d..58c76b472 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -251,6 +251,7 @@ lb: title: ca_postcode: Resultater vu Geocoder.ca geonames: Resultater vu GeoNames + geonames_reverse: Resultater vun GeoNames latlon: Resultater vun Internal uk_postcode: Resultater vun NPEMap / FreeThe Postcode us_postcode: Resultater vu Geocoder.us @@ -523,8 +524,8 @@ lb: subject: Sujet title: Noriicht schécken no_such_message: - heading: Keen esou ee Message - title: Keen esou ee Message + heading: Kee sou ee Message + title: Kee sou ee Message outbox: date: Datum subject: Sujet @@ -722,7 +723,7 @@ lb: flash success: All Är Ännerunge sinn elo ëffentlech, an Dir däerft elo änneren. list: confirm: Erausgesichte Benotzer confirméieren - empty: Et goufe keng esou Benotzer fonnt + empty: Et goufe keng sou Benotzer fonnt heading: Benotzer hide: Erausgesichte Benotzer vrstoppen title: Benotzer @@ -731,7 +732,7 @@ lb: heading: Umellen login_button: Umellen lost password link: Hutt Dir Äert Passwuert vergiess? - new to osm: Nei bäi OpenStreetMap? + new to osm: Nei bei OpenStreetMap? openid_providers: google: title: Alogge mat Google @@ -769,7 +770,7 @@ lb: title: Mellt Iech un no_such_user: heading: De Benotzer %{user} gëtt et net - title: Esou e Benotzer gëtt et net + title: Sou e Benotzer gëtt et net popup: friend: Frënn remove_friend: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 8f88201e1..fb49ebb0a 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1001,6 +1001,7 @@ lv: header: Kartes slāņi notes: Kartes piezÄ«mes overlays: Iespējot pārklājumus, lai novērstu trÅ«kumus kartei + title: Slāņi locate: popup: Tu esi {distance} {unit} no Å¡Ä« punkta title: RādÄ«t manu atraÅ¡anās vietu @@ -1847,7 +1848,7 @@ lv: you need to accept or decline: LÅ«dzu izlasi un vai nu pieņem vai noraidi jaunos Veidotāju Noteikumus, lai turpinātu. view: activate_user: aktivizēt Å¡o lietotāju - add as friend: Pievienot kā Draugu + add as friend: Pievienot kā draugu ago: (pirms %{time_in_words_ago}) block_history: saņemtie bloķējumi blocks by me: Manis pieÅ¡Ä·irtie Bloki @@ -1876,7 +1877,7 @@ lv: m away: "%{count} m attālumā" mapper since: "Kartētājs kopÅ¡:" moderator_history: dotie bloķējumi - my comments: Mani Komentāri + my comments: Mani komentāri my diary: Mana Dienasgrāmata my edits: Mani Labojumi my notes: Manas kartes PiezÄ«mes @@ -1889,9 +1890,9 @@ lv: new diary entry: jauns dienasgrāmatas ieraksts no friends: Tu vēl neesi pievienojis draugus. no nearby users: Nav citu lietotāju kas tuvumā kartētu. - notes: Kartes PiezÄ«mes + notes: Kartes piezÄ«mes oauth settings: OAuth uzstādÄ«jumi - remove as friend: Atcelt DraudzÄ«bu + remove as friend: Atcelt draudzÄ«bu role: administrator: Å is lietotājs ir administrators grant: @@ -1901,7 +1902,7 @@ lv: revoke: administrator: Atņemt administratora tiesÄ«bas moderator: Atņemt moderatora tiesÄ«bas - send message: NosÅ«tÄ«t Ziņojumu + send message: NosÅ«tÄ«t ziņojumu settings_link_text: uzstādÄ«jumi spam score: "Surogātpasta rādÄ«tājs:" status: "Statuss:" diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 52002099f..c188b58b8 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -477,8 +477,10 @@ mk: title: ca_postcode: Резултати од Geocoder.CA geonames: Резултати од GeoNames + geonames_reverse: Резултати од GeoNames latlon: Внатрешни резултати osm_nominatim: Резултати од OpenStreetMap Nominatim + osm_nominatim_reverse: Резултати од OpenStreetMap Nominatim uk_postcode: Резултати од NPEMap / FreeThe Postcode us_postcode: Резултати од Geocoder.us search_osm_nominatim: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 73463e029..c2cdc7642 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -487,8 +487,10 @@ nl: title: ca_postcode: Resultaten van Geocoder.CA geonames: Resultaten van GeoNames + geonames_reverse: Resulaten van GeoNames latlon: Resultaten van intern osm_nominatim: Resultaten van OpenStreetMap Nominatim + osm_nominatim_reverse: Resultaten van OpenStreetMap Nominatim uk_postcode: Resultaten van NPEMap / FreeThe Postcode us_postcode: Resultaten van Geocoder.us search_osm_nominatim: @@ -995,6 +997,7 @@ nl: map: base: cycle_map: Fietskaart + hot: Humanitarian mapquest: MapQuest Open standard: Standaard transport_map: Transport Map @@ -1004,6 +1007,7 @@ nl: header: Kaartlagen notes: Opmerkingen bij kaarten overlays: Overlays inschakelen om fouten in de kaart te kunnen identificeren + title: Lagen locate: popup: U bent binnen {distance} {unit} van dit punt title: Uw locatie weergeven @@ -1545,6 +1549,11 @@ nl: upload_trace: GPS-track uploaden delete: scheduled_for_deletion: Trace staat op de lijst voor verwijdering + description: + description_with_count: + one: GPX-bestand met één punt van %{user} + other: GPX-bestand met %{count} punten van %{user} + description_without_count: GPX-bestand van %{user} edit: description: "Beschrijving:" download: downloaden @@ -1562,6 +1571,8 @@ nl: uploaded_at: "Geüpload op:" visibility: "Zichtbaarheid:" visibility_help: wat betekent dit? + georss: + title: OpenStreetMap GPS-traces list: description: Recente GPS-trackuploads bekijken empty_html: Hier is nog niets te zien. Upload een nieuwe trace of kom meer te weten over GPS tracen op de wikipagina. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 67b29a908..3fa8f1c7c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -91,7 +91,7 @@ pl: user_token: Token użytkownika way: Droga way_node: Węzeł drogi - way_tag: Tag drogi + way_tag: Znacznik drogi application: require_cookies: cookies_needed: Wydaje się, że masz wyłączoną obsługę ciasteczek (cookies) w swojej przeglądarce internetowej – włącz ją, zanim przejdziesz dalej. @@ -106,7 +106,7 @@ pl: changesetxml: XML w formacie zestawu zmian feed: title: Zestaw zmian %{id} - title_comment: Zestaw zmian %{id} – %{comment} + title_comment: Zestaw zmian %{id} - %{comment} osmchangexml: XML w formacie osmChange title: Zestaw zmian changeset_details: @@ -124,14 +124,14 @@ pl: one: "Zawiera następującą %{count} relację:" other: "Zawiera następujących %{count} relacji:" has_ways: - few: "Zawiera następujące %{count} drogi:" - one: "Zawiera następującą %{count} drogę:" - other: "Zawiera następujących %{count} dróg:" + few: "Zawiera następujące %{count} linie:" + one: "Zawiera następującą %{count} linię:" + other: "Zawiera następujących %{count} linii:" no_bounding_box: Ten zestaw zmian został zapisany bez obszaru edycji. show_area_box: Pokaż obszar prostokątu common_details: changeset_comment: "Komentarz:" - deleted_at: "Usunięte dnia:" + deleted_at: "Usunięto:" deleted_by: "Usunięte przez:" edited_at: "Edytowano:" edited_by: "Edytowane przez:" @@ -193,7 +193,7 @@ pl: relation: relacja way: droga note: - at_by_html: "%{when} temu przez użytkownika %{user}" + at_by_html: "%{when} temu przez %{user}" at_html: "%{when} temu" closed: "Zamknięto:" closed_title: "Rozwiązana uwaga: %{note_name}" @@ -239,11 +239,11 @@ pl: edited_by_user_at_timestamp: Edytowany przez %{user} ostatni raz %{timestamp} hide_areas: Ukryj obszary history_for_feature: Historia zmian dla %{feature} - load_data: Załaduj dane + load_data: Wczytaj dane loaded_an_area_with_num_features: Wczytano obszar zawierający %{num_features} obiektów. Niektóre przeglądarki internetowe mogą nie radzić sobie z wyświetleniem tej ilości danych. Na ogół przeglądarki działają najlepiej przy wyświetlaniu mniej niż %{max_features} obiektów jednocześnie, w przeciwnym przypadku przeglądarka może działać powoli lub przestać odpowiadać. Jeśli jesteś pewien, że chcesz wyświetlić dane, kliknij przycisk poniżej. loading: Wczytywanie... manually_select: Ręcznie zaznacz inny obszar - notes_layer_name: Przeglądaj notatki + notes_layer_name: Przeglądaj uwagi object_list: api: Pobierz ten obszar z API back: Powrót do listy obiektów @@ -270,13 +270,13 @@ pl: tag_details: tags: "Znaczniki:" wiki_link: - key: Strona wiki dla etykiety %{key} - tag: Strona wiki dla etykiety %{key}=%{value} + key: Strona wiki dla znacznika %{key} + tag: Strona wiki dla znacznika %{key}=%{value} wikipedia_link: Artykuł %{page} w Wikipedii timeout: sorry: Niestety, pobranie danych dla %{type} o identyfikatorze %{id} trwało zbyt długo. type: - changeset: Zestaw zmian + changeset: zestaw zmian node: węzeł relation: relacja way: droga @@ -320,9 +320,9 @@ pl: description: Ostatnie zmiany description_bbox: Zestawy zmian na obszarze %{bbox} description_friend: Zestawy zmian twoich znajomych - description_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu - description_user: Zestawy zmian utworzone przez użytkownika %{user} - description_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} + description_nearby: Zestawy zmian pobliskich użytkowników + description_user: Zestawy zmian użytkownika %{user} + description_user_bbox: Zestawy zmian użytkownika %{user} w %{bbox} empty_anon_html: Nie podjęto jeszcze edycji. empty_user_html: Wygląda na to, że jeszcze nie edytowałeś. Aby zacząć, zapoznaj się z naszym Przewodnikiem dla początkujących. heading: Zestawy zmian @@ -334,9 +334,9 @@ pl: title: Zestawy zmian title_bbox: Zestawy zmian w %{bbox} title_friend: Zestawy zmian twoich znajomych - title_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu - title_user: Zestawy zmian utworzone przez użytkownika %{user} - title_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} + title_nearby: Zestawy zmian pobliskich użytkowników + title_user: Zestawy zmian użytkownika %{user} + title_user_bbox: Zestawy zmian użytkownika %{user} w %{bbox} timeout: sorry: Niestety, pobieranie listy zestawów zmian, którą chciałeś zobaczyć, trwało zbyt długo. diary_entry: @@ -395,7 +395,7 @@ pl: recent_entries: Ostatnie wpisy do dziennika title: Dzienniki użytkowników title_friends: Dzienniki znajomych - title_nearby: Dzienniki najbliższych użytkowników + title_nearby: Dzienniki pobliskich użytkowników user_title: Dziennik użytkownika %{user} location: edit: Edytuj @@ -417,13 +417,13 @@ pl: editor: default: Domyślnie (obecnie %{name}) id: - description: iD (edycja w przeglądarce) + description: iD (w przeglądarce) name: iD potlatch: - description: Potlatch 1 (edycja w przeglądarce) + description: Potlatch 1 (w przeglądarce) name: Potlatch 1 potlatch2: - description: Potlatch 2 (edycja w przeglądarce) + description: Potlatch 2 (w przeglądarce) name: Potlatch 2 remote: description: JOSM lub Markaartor @@ -434,7 +434,7 @@ pl: area_to_export: Obszar do eksportu embeddable_html: Kod HTML do osadzenia export_button: Eksportuj - export_details: Dane OpenStreetMap udostępnione są na licencji Open Data Commons Open Database License. + export_details: Dane OpenStreetMap udostępnione są na licencji Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format eksportu image_size: Rozmiar obrazka @@ -451,8 +451,15 @@ pl: scale: Skala too_large: body: "Ten obszar jest zbyt duży, aby go wyeksportować jako dane XML OpenStreetMap. Przybliż się, wybierz mniejszy obszar, lub użyj jednego ze następujących źródeł aby objąć pobierane dane:" + geofabrik: + description: Regularnie aktualizowane migawki kontynentów, państw i wybranych miast + title: Pliki Geofabrik heading: Obszar zbyt duży + metro: + description: Migawki dużych miast i otaczających je obszarów + title: Metro Extracts other: + description: Dodatkowe źródła wymienione w OpenStreetMap wiki title: Inne źródła planet: description: Regularnie aktualizowane kopie całej bazy danych OpenStreetMap @@ -494,8 +501,10 @@ pl: title: ca_postcode: Wyniki z Geocoder.CA geonames: Wyniki z GeoNames + geonames_reverse: Wyniki z GeoNames latlon: Wyniki z Internal osm_nominatim: Wyniki z OpenStreetMap Nominatim + osm_nominatim_reverse: Wyniki z OpenStreetMap Nominatim uk_postcode: Wyniki z NPEMap / FreeThe Postcode us_postcode: Wyniki z Geocoder.us search_osm_nominatim: @@ -533,7 +542,7 @@ pl: bench: Ławka bicycle_parking: Parking rowerowy bicycle_rental: Wypożyczalnia rowerów - biergarten: Ogród piwny + biergarten: Ogródek piwny brothel: Dom publiczny bureau_de_change: Kantor bus_station: Stacja autobusowa @@ -994,6 +1003,7 @@ pl: weir: Jaz javascripts: close: Zamknij + edit_help: Przesuń mapę i powiększ miejsce, które chcesz edytować, a następnie kliknij tutaj. key: title: Legenda tooltip: Legenda @@ -1009,6 +1019,7 @@ pl: header: Warstwy mapy notes: Uwagi overlays: Włącz nakładki do rozwiązywania problemów na mapie + title: Warstwy locate: title: Pokaż moje położenie zoom: @@ -1017,7 +1028,7 @@ pl: notes: new: add: Dodaj uwagę - intro: Informacja, którą wprowadzasz, będzie wyświetlana dla innych użytkowników w celu poprawy jakości mapy. Podaj więc jak najwięcej szczegółów oraz ustal pozycję markera tak dokładnie, jak to możliwe. + intro: W celu poprawy jakości mapy informacja, którą wprowadzisz będzie widoczna dla pozostałych maperów. Podaj więc jak najwięcej szczegółów oraz umieść znacznik w możliwie najdokładniejszej pozycji. show: anonymous_warning: Uwaga zawiera komentarze anonimowych użytkowników, które powinny być niezależnie zweryfikowane. closed_by: rozwiązana przez %{user} o %{time} @@ -1053,7 +1064,7 @@ pl: view_larger_map: Większy widok mapy site: createnote_disabled_tooltip: Przybliż mapę, by dodać uwagę - createnote_tooltip: Dodaj uwagę na mapie + createnote_tooltip: Zgłoś błąd lub dodaj uwagę na mapie edit_disabled_tooltip: Powiększ, aby edytować mapę edit_tooltip: Edytuje mapę history_disabled_tooltip: Powiększ, aby zobaczyć zmiany w tym obszarze @@ -1090,7 +1101,7 @@ pl: log_in_tooltip: Zaloguj się logo: alt_text: Logo OpenStreetMap - logout: Wyloguj się + logout: wyloguj się make_a_donation: text: Przekaż darowiznę title: Wspomóż OpenStreetMap za pomocą darowizny pieniężnej @@ -1241,12 +1252,12 @@ pl: heading: Uwagi użytkownika %{user} id: Identyfikator last_changed: Ostatnio zmieniono - subheading: Uwagi utworzone lub skomentowane przez użytkownika %{user} - title: Uwagi utworzone lub skomentowane przez użytkownika %{user} + subheading: Uwagi utworzone lub skomentowane przez %{user} + title: Uwagi utworzone lub skomentowane przez %{user} rss: closed: "zamknięta uwaga (w lokalizacji: %{place})" commented: nowy komentarz (w pobliżu %{place}) - description_area: Lista notatek stworzonych, skomentowanych lub zamkniętych w Twojej okolicy [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_area: Lista uwag stworzonych, skomentowanych lub zamkniętych w Twojej okolicy [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: Kanał RSS dla uwagi %{id} opened: "nowa uwaga (w lokalizacji: %{place})" reopened: "ponownie aktywowana uwaga (w lokalizacji: %{place})" @@ -1303,22 +1314,22 @@ pl: note_comment_notification: anonymous: Anonimowy użytkownik closed: - commented_note: "%{commenter} rozwiązał uwagę, którą skomentowałeś. Notatka znajduje się w lokalizacji: %{place}." - subject_other: "[OpenStreetMap] %{commenter} rozwiązał interesującą cię uwagę" + commented_note: "%{commenter} rozwiązał uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} rozwiązał interesującą Cię uwagę" subject_own: "[OpenStreetMap] %{commenter} rozwiązał Twoją uwagę" - your_note: "%{commenter} rozwiązał jedną z twoich notatek na mapie w pobliżu %{place}." + your_note: "%{commenter} rozwiązał jedną z Twoich uwag na mapie w lokalizacji: %{place}." commented: - commented_note: "%{commenter} zostawił komentarz do uwagi, którą skomentowałeś. Notatka znajduje się w lokalizacji: %{place}." - subject_other: "[OpenStreetMap] %{commenter} skomentował interesującą cię uwagę" + commented_note: "%{commenter} zostawił komentarz do uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} skomentował interesującą Cię uwagę" subject_own: "[OpenStreetMap] %{commenter} skomentował Twoją uwagę" - your_note: "%{commenter} zostawił komentarz do jednej z twoich notatek na mapie w pobliżu %{place}." - details: Więcej informacji na temat uwagi można znaleźć na %{url}. + your_note: "%{commenter} zostawił komentarz do jednej z Twoich uwag na mapie w lokalizacji: %{place}." + details: "Więcej informacji na temat uwagi można znaleźć pod adresem: %{url}." greeting: Witaj, reopened: - commented_note: "%{commenter} ponownie aktywował uwagę, którą skomentowałeś. Notatka znajduje się w lokalizacji: %{place}." - subject_other: "[OpenStreetMap] %{commenter} ponownie aktywował interesującą cię uwagę" - subject_own: "[OpenStreetMap] %{commenter} ponownie aktywował jedną z Twoich notatek" - your_note: "%{commenter} ponownie aktywował jedną z twoich notatek na mapie w pobliżu %{place}" + commented_note: "%{commenter} ponownie aktywował uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} ponownie aktywował interesującą Cię uwagę" + subject_own: "[OpenStreetMap] %{commenter} ponownie aktywował jedną z Twoich uwag" + your_note: "%{commenter} ponownie aktywował jedną z Twoich uwag na mapie w lokalizacji: %{place}" signup_confirm: confirm: "Musimy upewnić się, że wniosek pochodzi od ciebie, dlatego kliknij na łącze poniżej, aby potwierdzić założenie konta:" created: Ktoś (mamy nadzieję, że ty) właśnie założył konto w %{site_url}. @@ -1333,7 +1344,7 @@ pl: allow_write_api: modyfikuj mapę allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. allow_write_gpx: prześlij ślady GPS - allow_write_notes: modyfikowanie notatek. + allow_write_notes: modyfikowanie uwag. allow_write_prefs: modyfikowanie preferencji Twojego konta request_access: Aplikacja %{app_name} żąda dostępu do Twojego konta użytkownika - %{user}. Sprawdź, czy chcesz pozwolić aplikacji na poniższe działania. Możesz wybrać dowolną liczbę opcji. revoke: @@ -1352,7 +1363,7 @@ pl: allow_write_api: modyfikacja mapy. allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. allow_write_gpx: przesyłanie śladów GPS. - allow_write_notes: modyfikowanie notatek. + allow_write_notes: modyfikowanie uwag. allow_write_prefs: modyfikacja ich ustawień. callback_url: Adres URL odwołania zwrotnego name: Nazwa @@ -1383,7 +1394,7 @@ pl: allow_write_api: modyfikacja mapy. allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. allow_write_gpx: przesyłanie śladów GPS. - allow_write_notes: modyfikowanie notatek. + allow_write_notes: modyfikowanie uwag. allow_write_prefs: modyfikacja ich ustawień. authorize_url: "URL upoważnienia:" confirm: Jesteś pewien? @@ -1551,6 +1562,11 @@ pl: upload_trace: Wgraj ślad GPS delete: scheduled_for_deletion: Ślad oczekuje na skasowanie + description: + description_with_count: + one: Plik GPX z %{count} punktem od %{user} + other: Plik GPX z %{count} punktami od %{user} + description_without_count: Plik GPX od %{user} edit: description: "Opis:" download: pobierz @@ -1568,6 +1584,8 @@ pl: uploaded_at: "Wysłano:" visibility: "Widoczność:" visibility_help: co to znaczy? + georss: + title: Ślady GPS OpenStreetMap list: description: Przeglądaj najnowsze dodane ścieżki GPS empty_html: Nic tu jeszcze nie ma. Prześlij nowy ślad lub dowiedz się więcej o śledzeniu GPS na stronie wiki. @@ -1732,7 +1750,7 @@ pl: login: account is suspended: Twoje konto zostało zawieszone ze względu na podejrzaną aktywność.
Skontaktuj się z webmasterem, jeśli chcesz przedyskutować blokadę. account not active: Niestety Twoje konto nie jest jeszcze aktywne.
Otwórz link zawarty w mailu potwierdzenia założenia konta, aby je aktywować lub poproś o ponowne przesłanie maila. - auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię. + auth failure: Niestety, podane dane nie pozwoliły na zalogowanie. create account minute: Utwórz konto. To zajmuje tylko minutę. email or username: "Adres email lub nazwa użytkownika:" heading: Logowanie @@ -1789,6 +1807,9 @@ pl: heading: Dodać %{user} do listy przyjaciół? success: "%{name} jest teraz twoim znajomym!" new: + about: + header: Darmowa i edytowalna + 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.

confirm email address: "Potwierdzenie adresu e-mail:" confirm password: "Potwierdzenie hasła:" contact_webmaster: Skontaktuj się proszę się z webmasterem, aby utworzyć konto. Postaramy się zająć się Twoją prośbą tak szybko, jak to będzie możliwe. @@ -1855,8 +1876,8 @@ pl: add as friend: dodaj do znajomych ago: (%{time_in_words_ago} temu) block_history: otrzymane blokady - blocks by me: nałożone blokady - blocks on me: otrzymane blokady + blocks by me: Nałożone blokady + blocks on me: Otrzymane blokady comments: komentarze confirm: Potwierdź confirm_user: zatwierdź tego użytkownika @@ -1869,7 +1890,7 @@ pl: deactivate_user: dezaktywuj tego użytkownika delete_user: usuń to konto description: Opis - diary: Dziennik + diary: dziennik edits: edycje email address: Adres e‐mail friends_changesets: zestawy zmian znajomych @@ -1894,7 +1915,7 @@ pl: new diary entry: nowy wpis w dzienniku no friends: Nie masz jeszcze dodanych żadnych znajomych. no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania w tej okolicy. - notes: Uwagi + notes: uwagi oauth settings: ustawienia oauth remove as friend: Usuń ze znajomych role: @@ -2025,7 +2046,9 @@ pl: title: Potwierdź cofanie roli welcome_page: add_a_note: - title: Nie masz czasu na edycję? Zgłoś błąd dodając uwagę! + paragraph_1_html: Jeśli chcesz wprowadzić małą zmianę, ale nie masz czasu na rejestrację i poznanie sposobów edycji, możesz łatwo dodać uwagę. + paragraph_2_html: "Wystarczy, że przejdziesz na mapę i klikniesz ikonę: . Ta czynność doda znacznik, który możesz przesunąć przez przeciągnięcie. Dodaj swoją uwagę i zapisz ją - inni maperzy zajmą się twoim zgłoszeniem." + title: Nie masz czasu na edycję? Dodaj uwagę! basic_terms: editor_html: Edytor to program lub strona która pozwala na edycję mapy. node_html: Węzeł to punkt na mapie, np. latarnia lub drzewo. @@ -2035,6 +2058,7 @@ pl: way_html: Linia to droga lub obszar, np. ulica, rzeka, jezioro lub budynek. introduction_html: Witamy w OpenStreetMap, wolnej mapie świata. Teraz gdy masz już konto, możesz przystąpić do mapowania. Oto krótki przewodnik z najważniejszymi rzeczami, o których musisz wiedzieć. questions: + paragraph_1_html: Potrzebujesz pomocy przy mapowaniu lub nie wiesz jak używać OpenStreetMap? Odpowiedzi na twoje pytania uzyskasz na stronie pomocy. title: Jakieś pytania? start_mapping: Rozpocznij mapowanie title: Witaj! diff --git a/config/locales/pt.yml b/config/locales/pt.yml index d2e7a5eef..b108a9877 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -108,7 +108,7 @@ pt: belongs_to: "Feito por:" bounding_box: "Área delimitadora:" box: caixa - closed_at: "Fechado em:" + closed_at: Concluído há created_at: "Criado em:" has_nodes: one: "Tem %{count} nó:" @@ -362,7 +362,7 @@ pt: location: "Localização:" longitude: "Longitude:" marker_text: Localização da entrada do diário - save_button: Salvar + save_button: Gravar subject: "Assunto:" title: Editar entrada do diário use_map_link: usar mapa @@ -402,7 +402,7 @@ pt: leave_a_comment: Deixar um comentário login: Entrar login_to_leave_a_comment: "%{login_link} para deixar um comentário" - save_button: Salvar + save_button: Gravar title: Diário de %{user} | %{title} user_title: Diário de %{user} editor: @@ -442,9 +442,19 @@ pt: scale: Escala too_large: body: Esta área é demasiado grande para exportar em XML do OpenStreetMap. Por favor aproxime a vista ou selecione uma área mais pequena. + geofabrik: + description: Extratos atualizados regularmente de continentes, países e cidades selecionadas + title: Downloads do Geofabrik heading: Área Muito Grande + metro: + description: Extratos das principais cidades do mundo e seus arredores + title: Extratos do Metro other: + description: Fontes adicionais listadas no wiki do OpenStreetMap title: Outras Fontes + planet: + description: Cópias atualizadas regularmente da base de dados completa do OpenStreetMap + title: Planeta OSM zoom: Zoom start_rjs: add_marker: Adicionar um ponto de interesse no mapa @@ -482,12 +492,18 @@ pt: title: ca_postcode: Resultados de Geocoder.CA geonames: Resultados de GeoNames + geonames_reverse: Resultados de GeoNames latlon: Resultados Internos osm_nominatim: Resultados de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados de NPEMap / FreeThe Postcode us_postcode: Resultados de Geocoder.us search_osm_nominatim: prefix: + aerialway: + chair_lift: Teleférico + drag_lift: Elevador de esqui + station: Estação de elevador de esqui aeroway: aerodrome: Aeródromo apron: Plataforma de estacionamento @@ -581,6 +597,7 @@ pt: shower: Chuveiro social_centre: Centro social social_club: Clube Social + social_facility: Serviços sociais studio: Estúdio supermarket: Supermercado swimming_pool: Piscina @@ -592,6 +609,7 @@ pt: university: Universidade vending_machine: Máquina de venda automática veterinary: Clínica veterinária + village_hall: Junta de Freguesia waste_basket: Caixote do Lixo wifi: Acesso WiFi youth_centre: Centro de juventude @@ -610,6 +628,7 @@ pt: "yes": Edifício emergency: fire_hydrant: Boca de incêndio + phone: Telefone de emergência highway: bridleway: Pista de cavalos bus_guideway: Faixa de Autocarros de Guia @@ -631,6 +650,7 @@ pt: platform: Plataforma de embarque primary: Estrada Nacional (Primária) primary_link: Ligação a Estrada Nacional (Primária) + proposed: Estrada em planeamento raceway: Autódromo residential: Rua residencial rest_area: Área de descanso @@ -658,6 +678,7 @@ pt: building: Edifício castle: Castelo church: Igreja + citywalls: Muralhas da cidade fort: Forte house: Casa icon: Ícone @@ -667,6 +688,7 @@ pt: monument: Monumento museum: Museu ruins: Ruínas + tomb: Tumba tower: Torre wayside_cross: Cruzeiro wayside_shrine: Alminhas @@ -745,6 +767,8 @@ pt: cliff: Precipício crater: Cratera dune: Duna + feature: Recurso natural + fell: Encosta fjord: Fiorde forest: Floresta geyser: Geiser @@ -764,6 +788,7 @@ pt: rock: Rocha scree: Escarpa de Roxas Soltas scrub: Matagal + shoal: Banco de areia spring: Nascente stone: Pedra strait: Estreito @@ -802,6 +827,7 @@ pt: locality: Localidade moor: Ancoradouro municipality: Município + neighbourhood: Bairro postcode: Código postal region: Região sea: Mar @@ -827,8 +853,10 @@ pt: narrow_gauge: Ferrovia de Bitola Estreita platform: Plataforma ferroviária preserved: Ferrovia Preservada + proposed: Ferrovia em planeamento spur: Pequeno Ramal Ferroviário station: Estação Ferroviária + stop: Paragem ferroviária subway: Estação de Metropolitano subway_entrance: Entrada para Estação de Metropolitano switch: Agulha de ferrovia @@ -844,6 +872,7 @@ pt: beverages: Loja de Bebidas bicycle: Loja de Bicicletas books: Livraria + boutique: Boutique butcher: Talho car: Oficina car_parts: Loja de Peças para Automóvel @@ -857,6 +886,7 @@ pt: convenience: Loja de Conveniência copyshop: Centro de Cópias cosmetics: Loja de cosméticos + deli: Charcutaria department_store: Loja de Departamento / Grande Armazém discount: Loja de Descontos doityourself: Bricolage @@ -955,18 +985,23 @@ pt: weir: Represa javascripts: close: Fechar + edit_help: Mova o mapa e amplie a localização que pretende editar e depois clique aqui. key: title: Legenda tooltip: Legenda map: base: cycle_map: Mapa de Ciclismo + hot: Humanitário standard: Mapa Padrão transport_map: Transportes Públicos + copyright: © Colaboradores do OpenStreetMap layers: data: Dados técnicos do mapa header: Camadas do Mapa notes: Erros reportados no mapa + overlays: Ativar sobreposições para solucionar problemas do mapa + title: Camadas locate: popup: Está a {distance} {unit} deste ponto title: Mostrar a minha localização @@ -995,17 +1030,22 @@ pt: resolve: Marcar como Resolvido share: cancel: Cancelar + center_marker: Centrar o mapa no marcador custom_dimensions: Definir dimensões personalizadas download: Descarregar embed: HTML format: "Formato:" image: Imagem + image_size: A imagem mostrará a camada padrão em + include_marker: Incluir marcador link: Ligação ou HTML - long_link: Lig.Longa + long_link: Link + paste_html: Colar HTML para incorporar na página web scale: "Escala:" short_link: Lig.Curta short_url: URL curto title: Partilhar + view_larger_map: Ver mapa maior site: createnote_disabled_tooltip: A área do mapa é demasiado grande. Amplie o mapa para poder reportar um erro createnote_tooltip: Reportar erro no mapa @@ -1034,7 +1074,7 @@ pt: help_centre: Fórum de Ajuda help_title: Fórum onde pode colocar dúvidas sobre o projeto history: Histórico - home: Início + home: Ir para a localização inicial intro_1: O OpenStreetMap é um mapa mundial livre, feito por pessoas de todo o mundo. intro_2_create_account: Crie uma conta de utilizador intro_2_download: descarregar @@ -1502,6 +1542,11 @@ pt: upload_trace: Carregar um Trilho GPS delete: scheduled_for_deletion: Trilho programado para eliminação + description: + description_with_count: + one: Ficheiro GPX com %{count} ponto de %{user} + other: Ficheiro GPX com %{count} pontos de %{user} + description_without_count: Ficheiro GPX de %{user} edit: description: "Descrição:" download: descarregar @@ -1519,6 +1564,8 @@ pt: uploaded_at: "Mandado em:" visibility: "Visibilidade:" visibility_help: o que significa isto? + georss: + title: Trilhos GPS do OpenStreetMap list: description: Ver trilhos GPS carregados recentemente empty_html: Ainda não enviou nenhum trilho GPS. Envie um novo trilho GPS ou saiba mais sobre trilhos GPS na página wiki (em inglês). @@ -1648,9 +1695,12 @@ pt: confirm: already active: Esta conta já foi confirmada. button: Confirmar - heading: Confirmar a conta de utilizador + heading: Verifique o seu email! + introduction_1: Enviámos-lhe um e-mail de confirmação. + introduction_2: Confirme a sua conta clicando no link no e-mail e assim poderá iniciar o mapeamento. press confirm button: Pressione o botão de confirmação abaixo para ativar a tua conta. - unknown token: Parece que esse Token não existe. + reconfirm_html: Se precisar lhe reenviemos o e-mail de confirmação, clique aqui. + unknown token: Esse código de confirmação expirou ou não existe. confirm_email: button: Confirmar failure: Um e-mail já foi confirmado com este código. @@ -1810,7 +1860,7 @@ pt: confirm_user: confirmar esse utilizador create_block: bloquear este utilizador created from: "Criado em:" - ct accepted: Aceitou há %{ago} + ct accepted: Aceite há %{ago} ct declined: Rejeitou ct status: "Termos de Colaborador:" ct undecided: Indeciso diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 687893e73..876a40bfc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -512,8 +512,10 @@ ru: title: ca_postcode: Результаты от Geocoder.CA geonames: Результаты от GeoNames + geonames_reverse: Результаты с GeoNames latlon: Внутренние результаты osm_nominatim: Результаты, полученные из OpenStreetMap Nominatim + osm_nominatim_reverse: Результаты с OpenStreetMap Nominatim uk_postcode: Результаты от NPEMap / FreeThe Postcode us_postcode: Результаты от Geocoder.us search_osm_nominatim: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index a5c0dc4b9..450d9ae08 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1064,7 +1064,7 @@ sl: help_centre: Center za pomoč help_title: Spletno mesto za pomoč projekta history: Zgodovina - home: domov + home: Domov intro_1: OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi. intro_2_create_account: Ustvarite uporabniÅ¡ki račun intro_2_download: prenesejo @@ -1075,7 +1075,7 @@ sl: log_in_tooltip: Vstop s svojim obstoječim uporabniÅ¡kim računom logo: alt_text: OpenStreetMap logotip - logout: odjava + logout: Odjava make_a_donation: text: Prispevajte finančna sredstva title: Podprite OpenStreetMap z denarnim prispevkom @@ -1824,12 +1824,12 @@ sl: you need to accept or decline: Prosimo preberite in nato sprejmite ali zavrnite nove "Contributor Terms". view: activate_user: aktiviraj uporabnika - add as friend: dodaj med prijatelje + add as friend: Dodaj med prijatelje ago: (%{time_in_words_ago}) block_history: prejete blokade - blocks by me: moje blokade - blocks on me: blokade mene - comments: komentarji + blocks by me: Moje blokade + blocks on me: Blokade mene + comments: Pripombe confirm: Potrdi confirm_user: potrdi uporabnika create_block: blokiraj uporabnika @@ -1841,8 +1841,8 @@ sl: deactivate_user: dezaktiviraj uporabnika delete_user: izbriÅ¡i uporabnika description: Opis - diary: dnevnik - edits: prispevki + diary: Dnevnik + edits: Prispevki email address: "E-poÅ¡tni naslov:" friends_changesets: paketi sprememb prijateljev friends_diaries: dnevniki prijateljev @@ -1853,21 +1853,21 @@ sl: m away: oddaljen %{count} m mapper since: "Kartograf od:" moderator_history: dane blokade - my comments: moji komentarji - my diary: moj dnevnik - my edits: moji prispevki - my notes: moje opombe na zemljevidu - my settings: moje nastavitve - my traces: moje sledi + my comments: Moje pripombe + my diary: Moj dnevnik + my edits: Moji prispevki + my notes: Moje beležke + my settings: Moje nastavitve + my traces: Moje sledi nearby users: Drugi bližnji uporabniki nearby_changesets: paketi sprememb bližnjih uporabnikov nearby_diaries: dnevniÅ¡ki vnosi bližnjih uporabnikov new diary entry: nov vnos v dnevnik no friends: Niste Å¡e dodali nobenih prijateljev. no nearby users: Ni Å¡e drugih uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i bližini. - notes: opombe na zemljevidu + notes: Beležke na zemljevidu oauth settings: OAuth nastavitve - remove as friend: odstrani prijatelja + remove as friend: Odstrani prijatelja role: administrator: Ta uporabnik je administrator grant: @@ -1877,11 +1877,11 @@ sl: revoke: administrator: Odvzemi administratorski dostop moderator: Odvzemi moderatorski dostop - send message: poÅ¡lji sporočilo + send message: PoÅ¡lji sporočilo settings_link_text: vaÅ¡ih nastavitvah spam score: "Rezultat spama:" status: "Stanje:" - traces: sledi + traces: Sledi unhide_user: prikaži uporabnika user location: Lokacija uporabnika your friends: VaÅ¡i prijatelji diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 915460e3b..5c802bc74 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -272,7 +272,7 @@ sv: tag_details: tags: "Taggar:" wiki_link: - key: Wiki-beskrivningssidan för %{key} taggen + key: Wiki-beskrivningssidan för %{key}-taggen tag: Wiki-beskrivningssidan för %{key}=%{value}-taggen wikipedia_link: Artikeln om %{page} pÃ¥ Wikipedia timeout: @@ -502,8 +502,10 @@ sv: title: ca_postcode: Resultat frÃ¥n Geocoder.CA geonames: Resultat frÃ¥n GeoNames + geonames_reverse: Resultat frÃ¥n GeoNames latlon: Resultat frÃ¥n OpenStreetMap osm_nominatim: Resultat frÃ¥n OpenStreetMap Nominatim + osm_nominatim_reverse: Resultat frÃ¥n OpenStreetMap Nominatim uk_postcode: Resultat frÃ¥n NPEMap / Free The Postcode us_postcode: Resultat frÃ¥n Geocoder.us search_osm_nominatim: @@ -1019,6 +1021,7 @@ sv: header: Kartskikt notes: Kartanteckningar overlays: Aktivera lager för felsökning av kartan + title: Lager locate: popup: Du är inom {distance} {unit} frÃ¥n denna punkt title: Visa min position @@ -1096,8 +1099,8 @@ sv: intro_2_create_account: Skapa ett användarkonto intro_2_download: ladda ner intro_2_html: Informationen är fri att %{download} och %{use} under dess %{license}. %{create_account} för att förbättra kartan. - intro_2_license: Öppna licens - intro_2_use: användning + intro_2_license: öppna licens + intro_2_use: använda intro_2_use_url: http://wiki.openstreetmap.org/wiki/Sv:Using_OpenStreetMap log_in: logga in log_in_tooltip: Logga in med ditt konto @@ -1137,7 +1140,7 @@ sv: title: Exempel pÃ¥ källhänvisning. contributors_at_html: "Österrike: InnehÃ¥ller data frÃ¥n\nStadt Wien (under licensen\nCC BY),\nLand Vorarlberg och\nLand Tirol (under licensen CC-BY AT med ändringar)." contributors_ca_html: "Kanada: InnehÃ¥ller data frÃ¥n\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), och StatCan (Geography Division,\n Statistics Canada)." - contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, var god se sidan om bidragsgivare\npÃ¥ OpenStreetMaps Wiki." + contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, se sidan om bidragsgivare\npÃ¥ OpenStreetMaps Wiki." contributors_footer_2_html: " Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger nÃ¥gon som helst garanti eller\n tar pÃ¥ sig nÃ¥got ansvar." contributors_fr_html: "Frankrike: InnehÃ¥ller data\n frÃ¥n Direction Générale des Impôts." contributors_gb_html: "Storbritannien: InnehÃ¥ller Ordnance\nSurvey data © Crown copyright and database right\n2010-12." @@ -1147,22 +1150,22 @@ sv: contributors_title_html: VÃ¥ra bidragsgivare contributors_za_html: "Sydafrika: InnehÃ¥ller data frÃ¥n\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." credit_1_html: "Vi kräver att din källhänvisning bestÃ¥r av “© OpenStreetMaps\nbidragsgivare”." - credit_2_html: "Du mÃ¥ste ocksÃ¥ göra klart att datat är tillgängligt under licensen\nOpen Database License, och om du använder vÃ¥ra kartrutor, att kartografin är\ntillgängligt under licensen CC-BY-SA. Du kan göra detta genom att länka till\ndenna sida om upphovsrätt.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslÃ¥r vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org,\noch om relevant till creativecommons.org." + credit_2_html: "Du mÃ¥ste ocksÃ¥ göra klart att datan är tillgänglig under licensen\nOpen Database License, och om du använder vÃ¥ra kartrutor, att kartografin är\ntillgänglig under licensen CC-BY-SA. Du kan göra detta genom att länka till\ndenna sida om upphovsrätt.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslÃ¥r vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org." credit_3_html: "För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.\nTill exempel:" credit_title_html: Hur du anger OpenStreetMap som källa infringement_1_html: "Bidragsgivare till OSM pÃ¥minns om att aldrig lägga till data frÃ¥n\nupphovsrättsskyddade källor (t.ex. Google Maps och tryckta kartor) utan\nuttryckligt tillstÃ¥nd frÃ¥n upphovsrättsinnehavarna." - infringement_2_html: "Om du tror att upphovsrättsskyddat material felaktigt\nlagts in i OpenStreetMaps databas eller till denna webbsidan, var god se\nvÃ¥rt borttagningsförfarande\neller fyll direkt i vÃ¥rt online-formulär." + infringement_2_html: "Om du tror att upphovsrättsskyddat material felaktigt har\nlagts in i OpenStreetMaps databas eller till den här webbplatsen, se\nvÃ¥rt borttagningsförfarande\neller fyll i vÃ¥rt online-formulär direkt." infringement_title_html: UpphovsrättsintrÃ¥ng intro_1_html: "OpenStreetMap är öppen data, gjord tillgänglig under licensen Open Data\nCommons Open Database License (ODbL)." intro_2_html: "Du är fri att kopiera, distribuera, överföra och anpassa vÃ¥r data,\nsÃ¥ länge du anger OpenStreetMap och dess bidragsgivare som källa.\nOm du ändrar eller bygger vidare pÃ¥ vÃ¥r data kan du\nendast distribuera resultatet under samma licens. Den\nfullständiga juridiska\ntexten förklarar dina rättigheter och skyldigheter." intro_3_html: "Kartografin i vÃ¥ra kartrutor, och vÃ¥r dokumentation, är\ntillgängliga under licensen Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." - more_1_html: "Läs mer om användning av vÃ¥r data, och hur du anger oss som källa, pÃ¥ vÃ¥r juridisk\nFAQ." + more_1_html: "Läs mer om användning av vÃ¥r data, och hur du anger oss som källa, pÃ¥ vÃ¥r juridiska\nFAQ." more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahÃ¥lla nÃ¥got\ngratis kart-API för tredjepartsutvecklare.\nSe vÃ¥ran användningspolicy för API,\nanvändningspolicy för kartrutor\noch användningspolicy för Nominatim." more_title_html: Mer information title_html: Upphovsrätt och licens native: mapping_link: börja kartlägga - native_link: Svensk version + native_link: svensk version text: Du tittar pÃ¥ den engelska versionen av sidan om upphovsrätt. Du kan gÃ¥ tillbaka till %{native_link} pÃ¥ den här sidan eller sluta läsa om upphovsrätt och %{mapping_link}. title: Om denna sida message: @@ -1289,7 +1292,7 @@ sv: and_the_tags: "och följande taggar:" failure: failed_to_import: "misslyckats med att importera. Här är felet:" - more_info_1: Mer information om GPX importfel och hur man undviker dem + more_info_1: Mer information om importfel av GPX och hur man undviker dem more_info_2: "de kan hittas pÃ¥:" subject: "[OpenStreetMap] Misslyckades importera GPX" greeting: Hej, @@ -1317,20 +1320,20 @@ sv: closed: commented_note: "%{commenter} har löst en kartanteckning du har kommenterat. Anteckningen är nära %{place}." subject_other: "[OpenStreetMap] %{commenter} har löst en anteckning som du är intresserad av" - subject_own: "[OpenStreetMap] %{commenter} har kommenterat en av dina anteckningar" + subject_own: "[OpenStreetMap] %{commenter} har löst en av dina anteckningar" your_note: "%{commenter} har kommenterat en av dina kartanteckningar i närheten av %{place}." commented: commented_note: "%{commenter} har kommenterat en kartanteckning som du tidigare kommenterat. Anteckningen är i närheten av %{place}." subject_other: "[OpenStreetMap] %{commenter} har kommenterat en anteckning du är intresserad av" subject_own: "[OpenStreetMap] %{commenter} har kommenterat en av dina anteckningar" - your_note: "%{commenter} har kommenterat en av dina kartanteckningar i närheten av %{place}." + your_note: "%{commenter} har lämnat en kommentar till en av dina kartanteckningar i närheten av %{place}." details: Mer detaljer om anteckningen finns pÃ¥ %{url}. greeting: Hej, reopened: commented_note: "%{commenter} har Ã¥teraktiverat en kartnotering du har kommenterat pÃ¥. Noteringen är nära %{place}." - subject_other: "[OpenStreetMap] %{commenter} har Ã¥teraktiverat en notering som du är intresserad av" - subject_own: "[OpenStreetMap] %{commenter} har Ã¥teraktiverat en av dina noteringar" - your_note: "%{commenter} har Ã¥teraktiverat en av kartnoteringarna nära %{place}." + subject_other: "[OpenStreetMap] %{commenter} har Ã¥teraktiverat en anteckning som du är intresserad av" + subject_own: "[OpenStreetMap] %{commenter} har Ã¥teraktiverat en av dina anteckningar" + your_note: "%{commenter} har Ã¥teraktiverat en av dina kartanteckningar nära %{place}." signup_confirm: confirm: "Innan vi gör nÃ¥got annat, mÃ¥ste vi bekräfta att denna begäran kom frÃ¥n dig. Om den gjorde det, var vänligen klicka pÃ¥ länken nedan för att bekräfta ditt konto:" created: NÃ¥gon (förhoppningsvis du) skapade just ett konto pÃ¥ %{site_url}. @@ -1801,7 +1804,7 @@ sv: make_friend: already_a_friend: Du är redan vän med %{name}. button: Lägg till som vän - failed: Misslyckades med att lägga till %{name} som vän. + failed: Misslyckades med att lägga till %{name} som en vän. heading: Lägg till %{user} som en vän? success: "%{name} är nu din vän!" new: @@ -1964,7 +1967,7 @@ sv: until_login: Aktiv till dess användaren loggar in. index: empty: Inga blockeringar har gjorts ännu. - heading: Lista över blockerade användare + heading: Lista över användarblockeringar title: Användarblockeringar model: non_moderator_revoke: MÃ¥ste vara en moderator för att Ã¥terkalla en blockering. diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ec5f3acaa..d5e01dd30 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -622,19 +622,19 @@ tr: landuse: allotments: Bostan basin: Havuz - brownfield: Nadas + brownfield: Çıplak Arazi cemetery: Mezarlık - commercial: Ticari Bölge + commercial: Ticari ve Hizmet Alanı construction: Ä°nşaat farm: Çiftlik farmland: Tarım arazisi farmyard: Çiftlik avlusu forest: Orman grass: Çim - greenfield: Ä°mar alanı - industrial: Sanayi + greenfield: Nadas Alanı + industrial: Sanayi Alanı landfill: Çöplük - meadow: Çayır + meadow: Mera military: Askeri Bölge mine: Maden Ocağı nature_reserve: Doğa Koruma Alanı @@ -646,7 +646,7 @@ tr: reservoir: Baraj Gölü residential: Yerleşim Bölgesi retail: Esnaf - village_green: Kırsal Yeşillik + village_green: Yeşil Alan vineyard: Bağ wetland: Sulak Alan wood: Orman @@ -945,6 +945,7 @@ tr: title: Bu çeviri hakkında legal_babble: contributors_title_html: Katkıcılarımız + credit_3_html: "Bir gezinebilir elektronik haritanın sağ alt köşesinde kredisi görünmesi lazım.\nÖrnegin:" title_html: Telif Hakkı ve Lisans native: mapping_link: harita çizmeye başla @@ -1043,7 +1044,7 @@ tr: signup_confirm: created: Birisi (umarım sen) %{site_url} sitesinde yeni bir hesap açtı. greeting: Merhaba! - subject: "[OpenStreetMap] e-posta adresi onaylama mesajı" + subject: "[OpenStreetMap]'e hoşgeldin" oauth_clients: edit: submit: Değiştir @@ -1111,7 +1112,7 @@ tr: - terminal bridge: Siyah kenar = köprü bridleway: Binici yolu - brownfield: Nadas + brownfield: Çıplak arazi building: Önemli yapı byway: Yan yolu cable: @@ -1119,10 +1120,10 @@ tr: - gondol cemetery: Mezarlık centre: Spor merkezi - commercial: Ticari bölge + commercial: Ticari ve hizmet alanı common: - Çimen - - çayır + - mera construction: yapım aşamasında yolu cycleway: Bisiklet yolu farm: Çiftlik @@ -1130,10 +1131,10 @@ tr: forest: Orman golf: Golf sahası heathland: Fundalık - industrial: Sanayi bölgesi + industrial: Sanayi alanı lake: - Göl - - Baraj + - baraj military: Askeri bölge motorway: Otoyol park: Park @@ -1249,7 +1250,7 @@ tr: trace_optionals: tags: Etiketler trace_paging_nav: - showing_page: Sayfa %{page} görüntüleniyor + showing_page: Sayfa %{page} view: delete_track: Bu izi sil description: "Açıklama:" @@ -1319,7 +1320,7 @@ tr: update home location on click: Haritada tıkladığımda konumum güncelleştirilsin mi? confirm: button: Onayla - heading: Kullanıcı hesabı onayla + heading: E-postalarını kontrol et! confirm_email: button: Onayla success: E-posta adresinizi doğrulandı, kaydolduğu için teşekkür ederiz! Ä°yi çalışmaları dileriz! @@ -1387,7 +1388,7 @@ tr: new: confirm email address: E-posta Adresini Onayla confirm password: "Şifre Onayla:" - continue: Devam + continue: Kaydol display name: "Görünen Ad:" display name description: Herkes tarafından görünen ad. Bu adı istediği zaman 'tercihlerim' bölümünde değiştirebilirsin. email address: "E-posta Adresi:" @@ -1435,12 +1436,12 @@ tr: you need to accept or decline: Lütfen katılımcı şartlarını okuyunuz ve şartları kabul ya da ret ediniz. view: activate_user: Bu kullanıcıyı etkinleştir - add as friend: arkadaş olarak ekle + add as friend: Arkadaş olarak ekle ago: (%{time_in_words_ago} önce) - block_history: verilen engellemeleri görüntüle - blocks by me: engellediklerim - blocks on me: engellendiklerim - comments: yorumlar + block_history: alınan engellemeleri + blocks by me: Engellediklerim + blocks on me: Engellendiklerim + comments: Yorumlar confirm: Onayla confirm_user: bu kullanıcıyı onayla create_block: Bu kullanıcıyı engelle @@ -1452,30 +1453,30 @@ tr: deactivate_user: bu kullanıcıyı pasifleştir delete_user: bu kullanıcıyı sil description: Açıklama - diary: günlük - edits: düzenlemeleri + diary: Günlük + edits: Düzenlemeleri email address: "E-posta adresi:" - friends_changesets: Arkadaşların bütün değişiklik kayıtları görüntüle - friends_diaries: Arkadaşların bütün günlük girdileri görüntüle + friends_changesets: arkadaşların değişiklik kayıtları + friends_diaries: arkadaşların günlük girdileri hide_user: bu kullanıcı gizle km away: "%{count} km uzak" latest edit: "Son değişiklik %{ago}:" m away: "%{count} metre yakın" mapper since: "Haritacılığın başlangıç tarihi:" - moderator_history: verilen engellemeleri görüntüle - my comments: yorumladıklarım - my diary: günlüğüm - my edits: katkılarım - my settings: tercihlerim - my traces: GPS izlerim + moderator_history: verilen engellemeleri + my comments: Yorumlarım + my diary: Günlüğüm + my edits: Katkılarım + my settings: Tercihlerim + my traces: GPS Ä°zlerim nearby users: Yakın çevrede bulunan kullanıcılar - nearby_changesets: Yakındaki kullanıcıların bütün değişiklik kayıtları görüntüle - nearby_diaries: Yakındaki kullanıcıların bütün günlük girdileri görüntüle + nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları + nearby_diaries: yakınlarındaki kullanıcıların bütün günlük girdileri new diary entry: yeni kayıt no friends: Henüz herhangi bir arkadaş eklemediniz. no nearby users: Yakın çevredeki herhangi başka kullanıcı henüz yok. oauth settings: OAuth ayarları - remove as friend: Arkadaş listesinden çıkar + remove as friend: Arkadaş listesinden çıkart role: administrator: Bu kullanıcı bir yönetici dir. grant: @@ -1485,11 +1486,11 @@ tr: revoke: administrator: Yönetici erişimini iptal etme moderator: Moderatör erişimini iptal etme - send message: mesaj gönder + send message: Mesaj Gönder settings_link_text: ayarları spam score: "Spam puanı:" status: "Durum:" - traces: izleri + traces: Ä°zleri unhide_user: kullanıcının gizlenmesini kaldır user location: Kullanıcının konumu your friends: Arkadaş listesi @@ -1564,6 +1565,8 @@ tr: welcome_page: add_a_note: title: Düzenlemek için vaktın yok mu? O zaman bir not ekle...! + basic_terms: + way_html: Bir yol bir çizgi ya da alan, bir cadde, akarsu, göl veya bina olabilir. questions: title: Sorularınız var mı? start_mapping: Harita çizmeye başla diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 1e07b4c64..277cad201 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -497,8 +497,10 @@ uk: title: ca_postcode: Результати від Geocoder.CA geonames: Результати від GeoNames + geonames_reverse: Результати від GeoNames latlon: Результати від OpenStreetMap osm_nominatim: Результати від OpenStreetMap Nominatim + osm_nominatim_reverse: Результати від OpenStreetMap Nominatim uk_postcode: Результати від NPEMap / FreeThe Postcode us_postcode: Результати від Geocoder.us search_osm_nominatim: @@ -546,7 +548,7 @@ uk: car_wash: Автомийка casino: Казино charging_station: Станція для зарядки електромобілів - cinema: Кинотеатр + cinema: Кінотеатр clinic: Клініка club: Клуб college: Коледж @@ -859,7 +861,7 @@ uk: junction: Переїзд level_crossing: Залізничний переїзд light_rail: Швидкісний трамвай - miniature: Мінізалізнця + miniature: Мінізалізниця monorail: Монорейка narrow_gauge: Вузькоколійка platform: Залізнична платформа @@ -875,7 +877,7 @@ uk: tram_stop: Трамвайна зупинка yard: Депо shop: - alcohol: Спритні напої + alcohol: Спиртні напої antiques: Антикваріат art: Художній салон bakery: Хліб diff --git a/config/locales/vi.yml b/config/locales/vi.yml index fcc4a6990..547b56115 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -217,9 +217,9 @@ vi: details: Chi tiết edited_by_user_at_timestamp: Được %{user} sá»­a đổi vào %{timestamp} hide_areas: Ẩn các khu vá»±c - history_for_feature: Lịch sá»­ %{đối tượng} + history_for_feature: Lịch sá»­ %{feature} load_data: Tải Dữ liệu - loaded_an_area_with_num_features: Bạn đã tải vùng chứa %{num_features} đối tượng. Một số trình duyệt bị trục trặc khi hiển thị nhiều dữ liệu nhÆ° thế. Nói chung, các trình duyệt hoạt động tốt với tối đa 100 đối tượng cùng lúc; nếu hÆ¡n thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới. + loaded_an_area_with_num_features: Bạn đã tải vùng chứa %{num_features} đối tượng. Một số trình duyệt bị trục trặc khi hiển thị nhiều dữ liệu nhÆ° thế. Nói chung, các trình duyệt hoạt động tốt với tối đa %{max_features} đối tượng cùng lúc; nếu hÆ¡n thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới. loading: Đang tải… manually_select: Chọn vùng khác thủ công notes_layer_name: Xem các Ghi chú @@ -478,8 +478,10 @@ vi: title: ca_postcode: Kết quả Geocoder.CA geonames: Kết quả GeoNames + geonames_reverse: Kết quả GeoNames latlon: Kết quả nội bộ osm_nominatim: Kết quả OpenStreetMap Nominatim + osm_nominatim_reverse: Kết quả OpenStreetMap Nominatim uk_postcode: Kết quả NPEMap / FreeThe Postcode us_postcode: Kết quả Geocoder.us search_osm_nominatim: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f27327f9d..929b0044d 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -20,7 +20,7 @@ zh-CN: activerecord: attributes: diary_comment: - body: 内容 + body: 正文 diary_entry: language: 语言 latitude: 纬度 @@ -31,30 +31,30 @@ zh-CN: friend: 朋友 user: 用户 message: - body: 内容 + body: 正文 recipient: 收件人 - sender: 发送人 + sender: 发件人 title: 标题 trace: - description: 描述 + description: 说明 latitude: 纬度 longitude: 经度 name: 姓名 - public: 公共 + public: 公开 size: 大小 user: 用户 - visible: 可见性 + visible: 可见 user: active: 激活 - description: 描述 + description: 说明 display_name: 显示姓名 - email: 邮件 + email: 电子邮件 languages: 语言 pass_crypt: 密码 models: acl: 访问控制列表 - changeset: 修改集合 - changeset_tag: 修改集合标签 + changeset: 变更集 + changeset_tag: 变更集标签 country: 国家 diary_comment: 日记评论 diary_entry: 日记条目 @@ -63,7 +63,7 @@ zh-CN: message: 信息 node: 节点 node_tag: 节点标签 - notifier: 通知 + notifier: 通知人 old_node: 旧节点 old_node_tag: 旧节点标签 old_relation: 旧关系 @@ -80,14 +80,14 @@ zh-CN: tracepoint: 轨迹点 tracetag: 轨迹标签 user: 用户 - user_preference: 用户首选项 + user_preference: 用户设置 user_token: 用户令牌 way: 路径 way_node: 路径节点 way_tag: 路径标签 application: require_cookies: - cookies_needed: 您似乎已禁用了 cookies - 请在浏览器中启用 cookies，然后继续。 + cookies_needed: 你似乎停用了cookie - 请在继续操作前启用你的浏览器cookie。 require_moderator: not_a_moderator: 必须为管理员才能执行该操作。 setup_user_auth: @@ -95,35 +95,41 @@ zh-CN: need_to_see_terms: 您对 API 的访问已暂时中止。请登录到网站以查看贡献者条款。您不需要同意，但必须查看它们。 browse: changeset: - changeset: 修改集合：%{id} - changesetxml: 修改集合 XML + changeset: 变更集：%{id} + changesetxml: 变更集XML feed: - title: 修改集合 %{id} - title_comment: 修改集合 %{id} - %{comment} + title: 变更集%{id} + title_comment: 变更集%{id} - %{comment} osmchangexml: osmChange XML - title: 修改集合 + title: 变更集 changeset_details: belongs_to: 属于： - bounding_box: 限定边框： - box: 窗口 - closed_at: 关闭于： + bounding_box: 边界框： + box: 框 + closed_at: 结束于： created_at: 创建于： - has_nodes: 有如下 %{count} 个节点： - has_relations: 有如下 %{count} 种关系： - has_ways: 有如下 %{count} 条路径： - no_bounding_box: 没有为该修改集合所储存的限定边框。 - show_area_box: 显示区域窗口 + has_nodes: + one: 有以下%{count}个节点： + other: 有以下%{count}个节点： + has_relations: + one: 有以下%{count}个关系： + other: 有以下%{count}个关系： + has_ways: + one: 有以下%{count}个路径： + other: 有以下%{count}个路径： + no_bounding_box: 该变更集没有储存的边界框。 + show_area_box: 显示区域框 common_details: changeset_comment: 评论： deleted_at: 删除于： - deleted_by: 删除由： + deleted_by: 删除者： edited_at: 编辑于： - edited_by: 编辑由： - in_changeset: 在修改集合中： + edited_by: 编辑者： + in_changeset: 属于变更集： version: 版本： containing_relation: - entry: 关系 %{relation_name} - entry_role: 关系 %{relation_name}(作为 %{relation_role}) + entry: 关系%{relation_name} + entry_role: 关系%{relation_name}（作为%{relation_role}） map: deleted: 删除 edit: @@ -133,24 +139,24 @@ zh-CN: relation: 编辑关系 way: 编辑路径 larger: - area: 在较大的地图查看区域 - node: 在较大的地图查看节点 - note: 在较大的地图查看注释 - relation: 在较大的地图查看关系 - way: 在较大的地图查看路径 - loading: 载入中... + area: 在更大的地图上查看区域 + node: 在更大的地图上查看节点 + note: 在更大的地图上查看注释 + relation: 在更大的地图上查看关系 + way: 在更大的地图上查看路径 + loading: 正在载入... navigation: all: - next_changeset_tooltip: 下个修改集合 - next_node_tooltip: 下个节点 - next_note_tooltip: 下个注释 - next_relation_tooltip: 下个关系 - next_way_tooltip: 下个路径 - prev_changeset_tooltip: 上个修改集合 - prev_node_tooltip: 上个节点 - prev_note_tooltip: 上个注释 - prev_relation_tooltip: 上个关系 - prev_way_tooltip: 上个路径 + next_changeset_tooltip: 下一变更集 + next_node_tooltip: 下一节点 + next_note_tooltip: 下一注释 + next_relation_tooltip: 下一关系 + next_way_tooltip: 下一路径 + prev_changeset_tooltip: 上一变更集 + prev_node_tooltip: 上一节点 + prev_note_tooltip: 上一注释 + prev_relation_tooltip: 上一关系 + prev_way_tooltip: 上一路径 paging: all: next: "%{id} »" @@ -159,67 +165,67 @@ zh-CN: next: "%{id} »" prev: « %{id} user: - name_changeset_tooltip: 查看 %{user} 的编辑 - next_changeset_tooltip: 下一个 %{user} 的编辑 - prev_changeset_tooltip: 上一个 %{user} 的编辑 + name_changeset_tooltip: 查看%{user}的编辑 + next_changeset_tooltip: 下一个%{user}的编辑 + prev_changeset_tooltip: 上一个%{user}的编辑 node: - download_xml: 下载 XML + download_xml: 下载XML edit: 编辑节点 node: 节点 node_title: 节点：%{node_name} view_history: 查看历史 node_details: coordinates: 坐标： - part_of: 部分： + part_of: 属于： node_history: - download_xml: 下载 XML + download_xml: 下载XML node_history: 节点历史 node_history_title: 节点历史：%{node_name} view_details: 查看详细信息 not_found: - sorry: 对不起，无法找到 id 为 %{id} 的%{type}。 + sorry: 对不起，无法找到id为%{id}的%{type}。 type: - changeset: 修改集合 + changeset: 变更集 node: 节点 relation: 关系 way: 路径 note: - at_by_html: 由 %{user} 于%{when}前 + at_by_html: "%{when}前被%{user}" at_html: "%{when}前" - closed: 关闭： + closed: 结束： closed_title: 已解决的注释：%{note_name} comments: 评论： - description: 描述： + description: 说明： last_modified: 最后修改： open_title: 未解决的注释：%{note_name} - opened: 创建： + opened: 开始： title: 注释 paging_nav: of: / showing_page: 页面 redacted: - message_html: 该%{type}的版本%{version}无法显示，其已被删节。详情请见%{redaction_link}。 - redaction: 删节 %{id} + message_html: 该%{type}的版本%{version}无法显示，因为其已被编辑。详情请见%{redaction_link}。 + redaction: 编辑%{id} type: node: 节点 relation: 关系 way: 路径 relation: - download_xml: 下载 XML + download_xml: 下载XML relation: 关系 relation_title: 关系：%{relation_name} view_history: 查看历史 relation_details: members: 成员： - part_of: 部分： + part_of: 属于： relation_history: - download_xml: 下载 XML + download_xml: 下载XML relation_history: 关系历史 relation_history_title: 关系历史：%{relation_name} view_details: 查看详细信息 relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} 作为 %{role}" + entry: "%{type}%{name}" + entry_role: "%{type}%{name}作为%{role}" type: node: 节点 relation: 关系 @@ -228,74 +234,76 @@ zh-CN: data_frame_title: 数据 data_layer_name: 浏览地图数据 details: 详细信息 - edited_by_user_at_timestamp: 由 %{user} 于 %{timestamp} 编辑 + edited_by_user_at_timestamp: 被%{user}于%{timestamp}编辑 hide_areas: 隐藏区域 - history_for_feature: 历史 %{feature} - load_data: 加载数据 - loaded_an_area_with_num_features: 您已选择了包含 %{num_features} 项特征的区域。通常，有些浏览器无法正常显示这么多的数据。一般而言，浏览器一次显示少于 %{max_features} 项特征时效果最好：执行其他任务会使您的浏览器变慢/无响应。如果确定要显示这些数据，请按下面的按钮。 - loading: 载入中... - manually_select: 手动选择一个不同区域 + history_for_feature: "%{feature}的历史" + load_data: 载入数据 + loaded_an_area_with_num_features: 你已经载入一个包含%{num_features}个特征的区域。一般而言，一些浏览器无法正常显示这一数量的数据。通常，浏览器可以较好地显示少于%{max_features}个特征，超过这一数量则会使你的浏览器变慢/无响应。如果你确定你想要显示这些数据，请单击下面的按钮。 + loading: 正在载入... + manually_select: 手动选择不同的区域 notes_layer_name: 浏览注释 object_list: - api: 从 API 取回这一区域 - back: 回到对象列表 + api: 从API检索这一区域 + back: 返回对象列表 details: 详细信息 heading: 对象列表 history: type: - node: 节点 %{id} - way: 路径 %{id} + node: 节点%{id} + way: 路径%{id} selected: type: - node: 节点 %{id} - way: 路径 %{id} + node: 节点%{id} + way: 路径%{id} type: node: 节点 way: 路径 - private_user: 个人用户 + private_user: 私人用户 show_areas: 显示区域 show_history: 显示历史 - unable_to_load_size: 无法读取：限定边框的大小 %{bbox_size} 过大(需小于 %{max_bbox_size}) + unable_to_load_size: 无法载入：边界框的尺寸%{bbox_size}过大（需小于%{max_bbox_size}） view_data: 查看当前地图视图的数据 - wait: 请稍等... - zoom_or_select: 放大或选择查看一个地图区域 + wait: 请稍候... + zoom_or_select: 放大或选择要查看的地图区域 tag_details: tags: 标签： wiki_link: - key: "%{key} 标签的 wiki 描述页面" - tag: "%{key}=%{value} 标签的 wiki 描述页面" - wikipedia_link: 维基百科上的 %{page} 文章 + key: "%{key}标签的wiki说明页面" + tag: "%{key}=%{value}标签的wiki说明页面" + wikipedia_link: 维基百科的%{page}条目 timeout: - sorry: 对不起，取得 ID 为 %{id} 的%{type}资料花了太长的时间。 + sorry: 对不起，检索id为%{id}的%{type}的数据耗费时间过长。 type: - changeset: 修改集合 + changeset: 变更集 node: 节点 relation: 关系 way: 路径 way: - download_xml: 下载 XML + download_xml: 下载XML edit: 编辑路径 view_history: 查看历史 way: 路径 way_title: 路径：%{way_name} way_details: - also_part_of: 也是路径 %{related_ways} 的一部分 + also_part_of: + one: 属于路径%{related_ways} + other: 属于路径%{related_ways} nodes: 节点： - part_of: 部分： + part_of: 属于： way_history: - download_xml: 下载 XML + download_xml: 下载XML view_details: 查看详细信息 way_history: 路径历史 way_history_title: 路径历史：%{way_name} changeset: changeset: anonymous: 匿名 - big_area: (大) - no_comment: (空) - no_edits: (没有编辑) - show_area_box: 显示区域窗口 - still_editing: (仍在编辑中) - view_changeset_details: 查看详细变更 + big_area: （大） + no_comment: （无） + no_edits: （没有编辑） + show_area_box: 显示区域框 + still_editing: （仍在编辑） + view_changeset_details: 查看变更集详细信息 changeset_paging_nav: next: 下一页 » previous: « 上一页 @@ -304,60 +312,60 @@ zh-CN: area: 区域 comment: 评论 id: ID - saved_at: 保存时间 + saved_at: 保存于 user: 用户 list: - description: 浏览最近对地图的更改 - description_bbox: "%{bbox} 内的修改集合" - description_friend: 您的朋友的修改集合 - description_nearby: 附近用户的修改集合 - description_user: "%{user} 的修改集合" - description_user_bbox: "%{user} 在 %{bbox} 内的修改集合" - empty_anon_html: 尚未编辑。 - empty_user_html: 看起来您尚未编辑。若要开始，请参考初学者指南。 - heading: 修改集合 - heading_bbox: 修改集合 - heading_friend: 修改集合 - heading_nearby: 修改集合 - heading_user: 修改集合 - heading_user_bbox: 修改集合 - title: 修改集合 - title_bbox: "%{bbox} 内的修改集合" - title_friend: 您的朋友的修改集合 - title_nearby: 附近用户的修改集合 - title_user: "%{user} 的修改集合" - title_user_bbox: "%{user} 在 %{bbox} 内的修改集合" + description: 浏览最近对地图的贡献 + description_bbox: "%{bbox}内的变更集" + description_friend: 你的朋友的变更集 + description_nearby: 附近用户的变更集 + description_user: "%{user}的变更集" + description_user_bbox: "%{user}在%{bbox}内的变更集" + empty_anon_html: 还没有编辑。 + empty_user_html: 看起来你还没有进行过任何编辑。要开始编辑，请查看初学者指南。 + heading: 变更集 + heading_bbox: 变更集 + heading_friend: 变更集 + heading_nearby: 变更集 + heading_user: 变更集 + heading_user_bbox: 变更集 + title: 变更集 + title_bbox: "%{bbox}内的变更集" + title_friend: 你的朋友的变更集 + title_nearby: 附近用户的变更集 + title_user: "%{user}的变更集" + title_user_bbox: "%{user}在%{bbox}内的变更集" timeout: - sorry: 对不起，取得您要求的修改集合列表时花了太长的时间。 + sorry: 对不起，检索你请求的变更集的列表耗费时间过长。 diary_entry: comments: ago: "%{ago}前" comment: 评论 - has_commented_on: "%{display_name} 在以下的日记中发表了评论" - newer_comments: 新的评论 - older_comments: 旧的评论 - post: 发布 - when: 于 + has_commented_on: "%{display_name}已经评论以下日记条目" + newer_comments: 新评论 + older_comments: 旧评论 + post: 发表 + when: 时间 diary_comment: - comment_from: 由 %{link_user} 于 %{comment_created_at} 发表的评论 + comment_from: "%{link_user}于%{comment_created_at}发表的评论" confirm: 确认 - hide_link: 隐藏此评论 + hide_link: 隐藏该评论 diary_entry: comment_count: - one: 一个回复 - other: "%{count}个回复" - zero: 无回复 - comment_link: 关于此篇评论 + one: "%{count}个评论" + other: "%{count}个评论" + zero: 没有评论 + comment_link: 关于该条目的评论 confirm: 确认 - edit_link: 编辑此篇 - hide_link: 隐藏此项目 - posted_by: 由 %{link_user} 于 %{created} 以 %{language_link} 发表 - reply_link: 对此篇进行回复 + edit_link: 编辑该条目 + hide_link: 隐藏该条目 + posted_by: "%{link_user}于%{created}以%{language_link}发表" + reply_link: 回复该条目 edit: body: 正文： language: 语言： latitude: 纬度： - location: 位置： + location: 地点： longitude: 经度： marker_text: 日记条目位置 save_button: 保存 @@ -366,18 +374,18 @@ zh-CN: use_map_link: 使用地图 feed: all: - description: 用户最近的 OpenStreetMap 日记 - title: OpenStreetMap 日记 + description: 最近的OpenStreetMap用户日记条目 + title: OpenStreetMap日记条目 language: - description: 用户最近的 OpenStreetMap 日记(语言为 %{language_name}) - title: OpenStreetMap 日记(语言为 %{language_name}) + description: 最近的%{language_name}OpenStreetMap用户日记条目 + title: "%{language_name}OpenStreetMap日记条目" user: - description: "%{user} 最近的 OpenStreetMap 日记" - title: "%{user} 的 OpenStreetMap 日记" + description: "%{user}最近的OpenStreetMap日记条目" + title: "%{user}的OpenStreetMap日记条目" list: - in_language_title: 日记(语言为 %{language}) - new: 新日志条目 - new_title: 在您的用户日记中创建一个新条目 + in_language_title: "%{language}日记条目" + new: 新日记条目 + new_title: 在你的用户日记中撰写新条目 newer_entries: 更新的条目 no_entries: 没有日记条目 older_entries: 更早的条目 @@ -385,91 +393,91 @@ zh-CN: title: 用户的日记 title_friends: 朋友的日记 title_nearby: 附近用户的日记 - user_title: "%{user} 的日记" + user_title: "%{user}的日记" location: edit: 编辑 - location: 位置： + location: 地点： view: 查看 new: title: 新日记条目 no_such_entry: - body: 对不起，没有 id 为 %{id} 的日记条目或者评论。请检查拼写，或者您点击的链接有误。 - heading: 关于此 id：%{id} 没有条目 + body: 对不起，没有id为%{id}的日记条目或评论。请检查你的拼写，或是你可能点击了错误的链接。 + heading: 没有条目id为：%{id} title: 没有这个日记条目 view: leave_a_comment: 留下评论 login: 登录 - login_to_leave_a_comment: "%{login_link} 以留下评论" + login_to_leave_a_comment: "%{login_link}以留下评论" save_button: 保存 - title: "%{user} 的日记 | %{title}" - user_title: "%{user} 的日记" + title: "%{user}的日记 | %{title}" + user_title: "%{user}的日记" editor: - default: 默认(目前为 %{name}) + default: 默认（目前为%{name}） id: - description: iD(在浏览器中编辑) + description: iD（浏览器内编辑器） name: iD potlatch: - description: Potlatch 1(在浏览器中编辑) + description: Potlatch 1（浏览器内编辑器） name: Potlatch 1 potlatch2: - description: Potlatch 2(在浏览器中编辑) + description: Potlatch 2（浏览器内编辑器） name: Potlatch 2 remote: - description: 远程控制(JOSM 或 Merkaartor) + description: 远程控制（JOSM或Merkaartor） name: 远程控制 export: start: - add_marker: 对地图添加一个标记 - area_to_export: 输出区域 - embeddable_html: 嵌入 HTML - export_button: 输出 - export_details: OpenStreetMap数据以开放式数据共享开放式数据库许可（ODbL）授权。 + add_marker: 添加标记至地图 + area_to_export: 要导出的区域 + embeddable_html: 可嵌入HTML + export_button: 导出 + export_details: OpenStreetMap数据采用开放数据共享开放数据库许可协议（ODbL）授权。 format: 格式 - format_to_export: 输出格式 - image_size: 图像尺寸 + format_to_export: 要导出的格式 + image_size: 图像大小 latitude: 纬度： - licence: 协议 + licence: 许可协议 longitude: 经度： - manually_select: 手动选择一个不同的区域 - map_image: 地图图片(显示于标准图层) + manually_select: 手动选择不同的区域 + map_image: 地图图像（显示标准图层） max: 最大 options: 选项 - osm_xml_data: OpenStreetMap XML 数据 + osm_xml_data: OpenStreetMap XML数据 output: 输出 - paste_html: 在网页上粘贴 HTML - scale: 比率 + paste_html: 粘贴可嵌入网站的HTML + scale: 比例 too_large: - body: 这个区域太大，无法导出 OpenStreetMap XML 数据。请放大或选择一个较小的区域。 + body: 该区域过大，不能导出为OpenStreetMap XML数据。请放大或选择一个更小的区域，或使用以下大量数据下载来源之一： geofabrik: - description: 定期更新提取物大洲、 国家、 和选定的城市 - title: Geofabrik 下载 - heading: 区域太大 + description: 定期更新的洲、 国家和特定城市的摘录 + title: Geofabrik下载 + heading: 区域过大 metro: - description: 世界主要城市和周边地区的地图包 - title: 大城市地图包 + description: 世界主要城市和周边地区的摘录 + title: 大城市摘录 other: - description: OpenStreetMap Wiki上列出的其他资源 + description: OpenStreetMap wiki上列出的其他来源 title: 其他来源 planet: - description: 定期更新所有OpenStreetMap的数据 - title: OSM星球 - zoom: 变焦 + description: 定期更新的完整OpenStreetMap数据库副本 + title: 地球OSM + zoom: 缩放 start_rjs: - add_marker: 标记地图 + add_marker: 添加标记至地图 change_marker: 更改标记位置 - click_add_marker: 点击地图来添加一个标记 - drag_a_box: 通过拖曳窗口来选择区域 - export: 输出 - manually_select: 手动选择一个不同区域 + click_add_marker: 单击地图以添加标记 + drag_a_box: 在地图上拖曳出一个框以选择区域 + export: 导出 + manually_select: 手动选择不同的区域 geocoder: description: title: - geonames: 来自 GeoNames 的位置 - osm_nominatim: 来自 OpenStreetMap Nominatim 的位置 + geonames: GeoNames中的位置 + osm_nominatim: OpenStreetMap Nominatim中的位置 types: cities: 城市 places: 地区 - towns: 乡镇 + towns: 城镇 direction: east: 东 north: 北 @@ -480,61 +488,63 @@ zh-CN: south_west: 西南 west: 西 distance: - one: 大约 1 公里 - other: 大约 %{count} 公里 - zero: 1 公里以内 + one: 约1千米 + other: 约%{count}千米 + zero: 小于1千米 results: more_results: 更多结果 - no_results: 没有发现结果 + no_results: 无结果 search: title: - ca_postcode: 来自 Geocoder.CA 的结果 - geonames: 来自 GeoNames 的结果 + ca_postcode: 来自Geocoder.CA的结果 + geonames: 来自GeoNames的结果 + geonames_reverse: 来自GeoNames的结果 latlon: 来自 内部 的结果 - osm_nominatim: 来自 OpenStreetMap Nominatim 的结果 - uk_postcode: 来自 NPEMap / FreeThe Postcode 的结果 - us_postcode: 来自 Geocoder.us 的结果 + osm_nominatim: 来自OpenStreetMap Nominatim的结果 + osm_nominatim_reverse: 来自OpenStreetMap Nominatim的结果 + uk_postcode: 来自NPEMap / FreeThe Postcode的结果 + us_postcode: 来自Geocoder.us的结果 search_osm_nominatim: admin_levels: level10: 郊区界 level2: 国界 level4: 州界 - level5: 行政区界 + level5: 地区界 level6: 县界 level8: 市界 level9: 村界 prefix: aerialway: - chair_lift: 升降椅 - drag_lift: 拖动电梯 - station: 火车站 + chair_lift: 登山吊椅 + drag_lift: 上山牵引机 + station: 缆车站台 aeroway: - aerodrome: 机场 - apron: 机坪 - gate: 门 + aerodrome: 小型飞机场 + apron: 停机坪 + gate: 登机口 helipad: 直升机停机坪 runway: 跑道 taxiway: 滑行道 terminal: 航站楼 amenity: - WLAN: WiFi 接入 + WLAN: WiFi热点 airport: 机场 arts_centre: 艺术中心 artwork: 艺术品 - atm: 自动取款机(ATM) + atm: 自动提款机（ATM） auditorium: 礼堂 bank: 银行 bar: 酒吧 bbq: 烧烤 - bench: 长凳 - bicycle_parking: 自行车停车 - bicycle_rental: 自行车租赁 - biergarten: 啤酒花园 + bench: 长椅 + bicycle_parking: 自行车停车处 + bicycle_rental: 自行车出租点 + biergarten: 露天啤酒店 brothel: 妓院 - bureau_de_change: 货币兑换 - bus_station: 公交主站 - cafe: 咖啡馆 - car_rental: 租车服务 + bureau_de_change: 外汇兑换点 + bus_station: 公共汽车枢纽 + cafe: 咖啡厅 + car_rental: 汽车租赁 car_sharing: 汽车共享 car_wash: 洗车 casino: 赌场 @@ -544,10 +554,10 @@ zh-CN: club: 俱乐部 college: 学院 community_centre: 社区中心 - courthouse: 法庭 + courthouse: 法院 crematorium: 火葬场 - dentist: 牙医 - doctors: 医生 + dentist: 牙科 + doctors: 医生办公室 dormitory: 宿舍 drinking_water: 饮用水 driving_school: 驾驶学校 @@ -557,16 +567,16 @@ zh-CN: ferry_terminal: 轮渡码头 fire_hydrant: 消防栓 fire_station: 消防局 - food_court: 食阁 + food_court: 美食广场 fountain: 喷泉 - fuel: 燃料 + fuel: 加油站 grave_yard: 墓地 gym: 健身中心/健身房 - hall: 小山 - health_centre: 健康中心 + hall: 会堂 + health_centre: 医疗中心 hospital: 医院 hotel: 酒店 - hunting_stand: 狩猎台 + hunting_stand: 狩猎站 ice_cream: 冰淇淋 kindergarten: 幼儿园 library: 图书馆 @@ -574,28 +584,28 @@ zh-CN: marketplace: 市场 mountain_rescue: 山地救援 nightclub: 夜总会 - nursery: 幼儿园 - nursing_home: 护理院 + nursery: 托儿所 + nursing_home: 疗养院 office: 办公室 park: 公园 parking: 停车场 - pharmacy: 药房 + pharmacy: 药店 place_of_worship: 宗教场所 - police: 警察 - post_box: 邮箱 + police: 警察局 + post_box: ä¿¡ç®± post_office: 邮局 preschool: 学前教育 prison: 监狱 pub: 酒馆 public_building: 公共建筑 public_market: 集市 - reception_area: 接待区域 + reception_area: 接待区 recycling: 回收点 - restaurant: 餐厅 + restaurant: 餐馆 retirement_home: 养老院 sauna: 桑拿 school: 学校 - shelter: 庇护所 + shelter: 亭 shop: 商店 shopping: 购物 shower: 淋浴 @@ -614,8 +624,8 @@ zh-CN: vending_machine: 自动售货机 veterinary: 兽医 village_hall: 村政厅 - waste_basket: 废纸篓 - wifi: WiFi 接入 + waste_basket: 垃圾桶 + wifi: WiFi热点 youth_centre: 青少年中心 boundary: administrative: 行政区边界 @@ -623,9 +633,9 @@ zh-CN: national_park: 国家公园 protected_area: 保护区 bridge: - aqueduct: 输水管道 + aqueduct: 沟渠 suspension: 悬索桥 - swing: 索桥 + swing: 平旋桥 viaduct: 高架桥 "yes": æ¡¥ building: @@ -635,45 +645,45 @@ zh-CN: phone: 紧急电话 highway: bridleway: 马道 - bus_guideway: 导轨公交专用道 - bus_stop: 公交停靠站 - byway: 非机动车道(英国) - construction: 在建道路 - cycleway: 单车径 - emergency_access_point: 紧急接入点 - footway: 步行道 + bus_guideway: 导轨公交车道 + bus_stop: 公共汽车站 + byway: 小路 + construction: 在建公路 + cycleway: 自行车道 + emergency_access_point: 紧急求救点 + footway: 人行道 ford: 浅滩 - living_street: 生活街道 + living_street: 生活街 milestone: 里程碑 minor: 次要道路 motorway: 高速公路 motorway_junction: 高速公路连接线 motorway_link: 高速公路 path: 小径 - pedestrian: 行人道路 - platform: 站台 - primary: 一级道路 - primary_link: 一级道路 - proposed: 建议路线 - raceway: 滚道 - residential: 住宅 + pedestrian: 步行街 + platform: 车站 + primary: 主要道路 + primary_link: 主要道路 + proposed: 规划道路 + raceway: 赛道 + residential: 住宅道路 rest_area: 休息区 road: 道路 secondary: 二级公路 secondary_link: 二级公路 service: 服务道路 services: 高速公路服务区 - speed_camera: 超速照相机 + speed_camera: 测速摄像头 steps: 楼梯 stile: 跨越围栏的台阶 street_lamp: 路灯 tertiary: 三级道路 tertiary_link: 三级道路 - track: 辙迹 - trail: 轨迹 - trunk: 快速道路 - trunk_link: 快速道路 - unclassified: 未分类道路 + track: 小路 + trail: 小路 + trunk: 干道 + trunk_link: 干道 + unclassified: 无等级道路 unsurfaced: 无铺面道路 historic: archaeological_site: 遗址 @@ -683,40 +693,40 @@ zh-CN: castle: 城堡 church: 教堂 citywalls: 城墙 - fort: å ¡ + fort: 堡垒 house: 房屋 icon: 圣像画 manor: 庄园 - memorial: 纪念馆 + memorial: 纪念碑 mine: 矿井 monument: 纪念碑 museum: 博物馆 ruins: 遗迹 - tomb: 墓地 + tomb: 墓 tower: 塔 - wayside_cross: 十字路旁 - wayside_shrine: 路旁的神社 - wreck: 废墟 + wayside_cross: 路旁十字架 + wayside_shrine: 路旁神龛 + wreck: 残骸 landuse: - allotments: 拨款 + allotments: 小块园地 basin: 盆地 - brownfield: 棕色地带 + brownfield: 棕地 cemetery: 公墓 commercial: 商业区 - conservation: 保留地 - construction: 建设 + conservation: 保护 + construction: 在建 farm: 农场 farmland: 农田 farmyard: 农家庭院 forest: 森林 garages: 车库 - grass: 草地 - greenfield: 绿色地带 + grass: 草坪 + greenfield: 绿地 industrial: 工业区 landfill: 垃圾填埋场 - meadow: 草甸 + meadow: 草地 military: 军事区 - mine: 矿区 + mine: 矿井 nature_reserve: 自然保护区 orchard: 果园 park: 公园 @@ -725,76 +735,76 @@ zh-CN: railway: 铁路 recreation_ground: 游乐场 reservoir: 水库 - reservoir_watershed: 库区 + reservoir_watershed: 水库库区 residential: 住宅区 - retail: 零售 - road: 道路面积 - village_green: 绿色村庄 + retail: 商店区 + road: 道路区 + village_green: 乡村草坪 vineyard: 葡萄园 wetland: 湿地 - wood: 林 + wood: 树林 leisure: beach_resort: 海滩度假村 - bird_hide: 鸟隐藏 - common: 公共土地 + bird_hide: 野生动物观察站 + common: 公共用地 fishing: 垂钓区 - fitness_station: 健身站 + fitness_station: 健身设施 garden: 花园 golf_course: 高尔夫球场 - ice_rink: 冰场 - marina: 码头 - miniature_golf: 迷你高尔夫 + ice_rink: 滑冰场 + marina: 小船坞 + miniature_golf: 迷你高尔夫球场 nature_reserve: 自然保护区 park: 公园 pitch: 体育场 - playground: 游乐场 + playground: 儿童游乐场 recreation_ground: 游乐场 sauna: 桑拿 - slipway: 船入水滑道 - sports_centre: 体育馆 + slipway: 船台 + sports_centre: 体育中心 stadium: 体育场 swimming_pool: 游泳池 - track: 赛道 - water_park: 水上乐园 + track: 跑道 + water_park: 水上公园 military: airfield: 军用机场 - barracks: 军营 - bunker: 碉堡 + barracks: 营房 + bunker: 掩体 mountain_pass: - "yes": 隘口 + "yes": 山口 natural: - bay: æµ·æ¹¾ - beach: 海滩 + bay: æ¹¾ + beach: 滩 cape: 海岬 cave_entrance: 洞口 channel: 海峡 - cliff: 悬崖 + cliff: 峭壁 crater: 火山口 dune: 沙丘 feature: 特征 - fell: å±± + fell: 费尔地貌 fjord: 峡湾 forest: 森林 - geyser: 喷泉 + geyser: 间歇泉 glacier: 冰川 - heath: 荒地 - hill: 小山 + heath: 希思地貌 + hill: 希尔地貌 island: 岛 land: 陆地 marsh: 沼泽 - moor: 泊 + moor: 停泊区 mud: 泥地 peak: 山顶 point: 点 reef: 礁 - ridge: å²­ + ridge: 山脊 river: æ²³ rock: 岩 - scree: 堆积物 - scrub: 灌木 - shoal: 浅滩 + scree: 岩屑堆 + scrub: 灌木丛 + shoal: 暗沙 spring: 泉 - stone: 石头 + stone: 石 strait: 海峡 tree: 树 valley: 山谷 @@ -802,17 +812,17 @@ zh-CN: water: æ°´ wetland: 湿地 wetlands: 湿地 - wood: 林 + wood: 树林 office: - accountant: 会计事务所 + accountant: 会计师事务所 architect: 设计院 company: 公司 - employment_agency: 职业中介 - estate_agent: 房产中介 - government: 政府办事处 - insurance: 保险 + employment_agency: 职业介绍所 + estate_agent: 地产代理 + government: 政府办公室 + insurance: 保险办公室 lawyer: 律师事务所 - ngo: 非政府组织办事处 + ngo: 非政府组织办公室 telecommunication: 电信办公室 travel_agent: 旅行社 "yes": 办公室 @@ -829,44 +839,44 @@ zh-CN: islet: 屿 isolated_dwelling: 独立的住宅 locality: 地区 - moor: 系泊 - municipality: 都市 - neighbourhood: 邻居 - postcode: 邮编 - region: 区 + moor: 荒野 + municipality: 自治市 + neighbourhood: 居住区 + postcode: 邮政编码 + region: 地区 sea: æµ· - state: 国家 - subdivision: 次级 + state: æ´² + subdivision: 细分 suburb: 郊区 town: 镇 - unincorporated_area: 自由区 + unincorporated_area: 非建制地区 village: 村 railway: - abandoned: 废弃铁路 + abandoned: 已拆除铁路 construction: 在建铁路 - disused: 不使用的铁路 - disused_station: 不使用的火车站 + disused: 废弃铁路 + disused_station: 废弃火车站 funicular: 缆索铁路 - halt: 火车停靠站 + halt: 火车停车点 historic_station: 历史火车站 junction: 铁路枢纽 level_crossing: 平交道口 light_rail: 轻轨 miniature: 微型铁路 - monorail: 单轨 + monorail: 单轨铁路 narrow_gauge: 窄轨铁路 - platform: 站台 + platform: 铁路站台 preserved: 保留铁路 - proposed: 规划中的铁路 + proposed: 规划铁路 spur: 铁路支线 station: 火车站 - stop: 火车岔口 + stop: 火车停车点 subway: 地铁站 subway_entrance: 地铁入口 - switch: 铁路点 - tram: 缆车 - tram_stop: 有轨电车停靠站 - yard: 铁路货场 + switch: 道岔 + tram: 电车轨道 + tram_stop: 有轨电车站 + yard: 车辆段 shop: alcohol: 无许可证 antiques: 古玩店 @@ -876,11 +886,11 @@ zh-CN: beverages: 饮料店 bicycle: 自行车店 books: 书店 - boutique: 商店 - butcher: å± å®° - car: 车店 - car_parts: 汽车零件 - car_repair: 汽车维修 + boutique: 精品店 + butcher: 肉店 + car: 汽车店 + car_parts: 汽车零部件商店 + car_repair: 汽车修理店 carpet: 地毯店 charity: 慈善商店 chemist: 化学品店 @@ -891,46 +901,46 @@ zh-CN: copyshop: 复印店 cosmetics: 化妆品店 deli: 熟食店 - department_store: 百货商店 - discount: 折扣精品店 + department_store: 百货商场 + discount: 折扣商品店 doityourself: DIY - dry_cleaning: 干洗 - electronics: 电子产品商店 - estate_agent: 房产中介 + dry_cleaning: 干洗店 + electronics: 电子产品店 + estate_agent: 地产代理 farm: 农家店 fashion: 时装店 fish: 鱼店 - florist: 鲜花 + florist: 花店 food: 食品店 - funeral_directors: 丧葬 - furniture: 家具 + funeral_directors: 殡仪馆 + furniture: 家具店 gallery: 画廊 - garden_centre: 园艺中心 - general: 一般商店 + garden_centre: 园艺品店 + general: 杂货店 gift: 礼品店 greengrocer: 蔬菜水果店 grocery: 杂货店 hairdresser: 理发店 hardware: 五金店 hifi: Hi-Fi - insurance: 保险 + insurance: 保险公司 jewelry: 珠宝店 - kiosk: 礼品店 - laundry: 洗衣房 - mall: 商城 + kiosk: 售货亭 + laundry: 洗衣店 + mall: 购物中心 market: 市场 mobile_phone: 手机店 motorcycle: 摩托车店 - music: 音乐店 + music: 音乐商店 newsagent: 报摊 - optician: 配镜 + optician: 眼镜店 organic: 有机食品店 - outdoor: 户外店 + outdoor: 户外用品店 pet: 宠物店 - pharmacy: 药房 + pharmacy: 药店 photo: 照相馆 - salon: 沙龙 - second_hand: 二手商店 + salon: 美容院 + second_hand: 二手商品商店 shoes: 鞋店 shopping_centre: 购物中心 sports: 体育用品店 @@ -939,53 +949,53 @@ zh-CN: tailor: 裁缝店 toys: 玩具店 travel_agency: 旅行社 - video: 影视店 - wine: 无许可证 + video: 音像店 + wine: 无执照 "yes": 商店 tourism: alpine_hut: 高山小屋 artwork: 艺术品 attraction: 景点 - bed_and_breakfast: 床和早餐 + bed_and_breakfast: 家庭旅馆 cabin: 小木屋 - camp_site: 野营地 - caravan_site: 拖车营地 - chalet: 木屋 - guest_house: 宾馆 - hostel: 旅馆 + camp_site: 宿营地 + caravan_site: 房车宿营地 + chalet: 小屋 + guest_house: 旅馆 + hostel: 招待所 hotel: 酒店 information: 信息 - lean_to: 主要面向 + lean_to: 棚屋 motel: 汽车旅馆 museum: 博物馆 picnic_site: 野餐地 theme_park: 主题公园 valley: è°· - viewpoint: 景点 + viewpoint: 观景点 zoo: 动物园 tunnel: - culvert: 涵洞 + culvert: 排水管 "yes": 隧道 waterway: - artificial: 运河 + artificial: 人工航道 boatyard: 船坞 canal: 运河 connector: 航道连接器 dam: 水坝 - derelict_canal: 废弃的运河 + derelict_canal: 废弃运河 ditch: 沟 dock: 码头 drain: 渠 lock: 船闸 lock_gate: 船闸 mineral_spring: 矿泉 - mooring: 系泊 - rapids: 湍流 + mooring: 系泊设备 + rapids: 急流 river: æ²³ riverbank: 河岸 - stream: 溪流 + stream: 溪 wadi: 干河 - water_point: 水路点 + water_point: 取水点 waterfall: 瀑布 weir: å ° prefix_format: "%{name}" @@ -997,15 +1007,15 @@ zh-CN: key: title: 图例 tooltip: 图例 - tooltip_disabled: 地图键仅仅在标准层可用。 + tooltip_disabled: 仅适用于标准图层的图例 map: base: cycle_map: Cycle Map - hot: 人道主义 + hot: Humanitarian mapquest: MapQuest Open standard: 标准 transport_map: 交通图 - copyright: © OpenStreetMap 贡献者 + copyright: © OpenStreetMap贡献者 layers: data: 地图数据 header: 地图图层 @@ -1025,11 +1035,11 @@ zh-CN: show: anonymous_warning: 此注释包括来自匿名用户的意见，应独立核实。 closed_by: 由 %{user} 于 %{time} 解决 - closed_by_anonymous: 由匿名于 %{time} 解决 + closed_by_anonymous: 匿名用户解决于%{time} comment: 注释 comment_and_resolve: 注释并解决 commented_by: 由 %{user} 于 %{time} 注释 - commented_by_anonymous: 由匿名于 %{time} 注释 + commented_by_anonymous: 匿名用户评论于%{time} hide: 隐藏 opened_by: 由 %{user} 于 %{time} 创建 opened_by_anonymous: 由匿名于 %{time} 创建 @@ -1048,7 +1058,7 @@ zh-CN: image: 图片 image_size: 图片将显示在 include_marker: 包含标记 - link: 链接或 HTML + link: 链接或HTML long_link: 链接 paste_html: 在网页上粘贴 HTML scale: 比例尺： @@ -1058,121 +1068,121 @@ zh-CN: view_larger_map: 查看放大地图 site: createnote_disabled_tooltip: 放大以向地图添加一个注释 - createnote_tooltip: 向地图添加一个注释 + createnote_tooltip: 添加注释至地图 edit_disabled_tooltip: 放大以编辑地图 edit_tooltip: 编辑地图 history_disabled_tooltip: 放大以编辑此区域 - history_tooltip: 查看对此区域的编辑 + history_tooltip: 查看该区域的编辑 layouts: community: 社区 community_blogs: 社区博客 - community_blogs_title: OpenStreetMap 社区成员的博客 - copyright: 版权及许可 + community_blogs_title: OpenStreetMap社区成员的博客 + copyright: 著作权与许可 data: 数据 - documentation: 文档 - documentation_title: 该项目的文档 - donate: 给硬件升级基金会%{link}以支持 OpenStreetMap。 + documentation: 说明文件 + documentation_title: 本项目的说明文件 + donate: 通过给硬件升级基金%{link}支持OpenStreetMap。 donate_link_text: 捐款 edit: 编辑 - edit_with: 使用 %{editor} 编辑 + edit_with: 使用%{editor}编辑 export_data: 导出数据 foundation: 基金会 - foundation_title: OpenStreetMap 基金会 - gps_traces: GPS 轨迹 - gps_traces_tooltip: 管理 GPS 轨迹 + foundation_title: OpenStreetMap基金会 + gps_traces: GPS轨迹 + gps_traces_tooltip: 管理GPS轨迹 help: 帮助 help_centre: 帮助中心 - help_title: 项目的帮助网站 + help_title: 本项目的帮助网站 help_url: http://help.openstreetmap.org/ history: 历史 - home: 返回主页 - intro_1: OpenStreetMap 是一个可供自由编辑的世界地图，它是由像您这样的用户创造的。 - intro_2_create_account: 创建用户帐户 + home: 返回家位置 + intro_1: OpenStreetMap是一个自由的世界地图，它是由同你一样的用户创造的。 + intro_2_create_account: 创建用户账户 intro_2_download: 下载 - intro_2_html: 数据可以免费%{download}，并依据%{license}%{use}。%{create_account}以改善地图。 + intro_2_html: 数据可以依据%{license}免费%{download}及%{use}。%{create_account}以改进地图。 intro_2_license: 开放许可协议 intro_2_use: 使用 log_in: 登录 - log_in_tooltip: 使用现有帐户登录 + log_in_tooltip: 使用已有账户登录 logo: - alt_text: OpenStreetMap 标志 + alt_text: OpenStreetMap标志 logout: 退出 make_a_donation: text: 捐款 - title: 捐款支持 OpenStreetMap - osm_offline: OpenStreetMap 的数据库目前离线中，直到必要的数据库维护工作完成为止。 - osm_read_only: OpenStreetMap 数据库目前处于只读模式中，数据库的维护工作正在进行中。 - partners_bytemark: Bytemark 主机 + title: 通过捐款支持OpenStreetMap + osm_offline: 由于正在进行基本的数据库维护工作，OpenStreetMap数据库目前处于脱机状态。 + osm_read_only: 由于正在进行基本的数据库维护工作，OpenStreetMap数据库目前处于只读模式。 + partners_bytemark: Bytemark主机 partners_html: 主机由%{ucl}、%{ic}、%{bytemark}和其他%{partners}所支持。 - partners_ic: 英国伦敦帝国学院 + partners_ic: 伦敦帝国学院 partners_partners: 合作伙伴 - partners_ucl: 伦敦大学学院 VR 中心 + partners_ucl: 伦敦大学学院虚拟现实中心 project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: 注册 - sign_up_tooltip: 创建一个可编辑账户 - tag_line: 免费维基世界地图 + sign_up_tooltip: 创建可编辑账户 + tag_line: 自由的wiki世界地图 user_diaries: 用户日记 user_diaries_tooltip: 查看用户日记 view: 查看 view_tooltip: 查看地图 - wiki: 维基 - wiki_title: 项目的维基网站 + wiki: wiki + wiki_title: 本项目的wiki网站 wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: - english_link: 英文原文 - text: 这个翻译页面和%{english_original_link}在事件上有冲突时，以英文页面为准 - title: 关于这个翻译 + english_link: 英语原文 + text: 当该翻译页面与%{english_original_link}冲突时，英语页面会被优先采用 + title: 关于该翻译 legal_babble: attribution_example: - alt: 在网页上注明 OpenStreetMap 的样例 - title: 注明样例 + alt: 如何在网页上署名OpenStreetMap的示例 + title: 署名示例 contributors_at_html: 奥地利：包含来自 Stadt Wien(CC BY协议)、Land Vorarlberg及 Land Tirol(修订的CC-BY AT协议)的数据。 - contributors_ca_html: 加拿大：包含来自 GeoBase®ã€GeoGratis(©åŠ æ‹¿å¤§è‡ªç„¶èµ„源局)、CanVec(©åŠ æ‹¿å¤§è‡ªç„¶èµ„源局)及 StatCan(加拿大统计局地理处)的数据。 + contributors_ca_html: 加拿大：含有来自GeoBase®ï¼ŒGeoGratis（© 加拿大自然资源部），CanVec（© 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。 contributors_footer_1_html: "关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的贡献者页面。" contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。 - contributors_fr_html: 法国：包含来自 Direction Générale des Impôts 的数据。 + contributors_fr_html: 法国：含有来自Direction Générale des Impôts的数据。 contributors_gb_html: 英国：包含来自 Ordnance 的调查数据，© Crown 版权所有及数据库权利，2010-12。 contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据，其中包括： - contributors_nl_html: 荷兰：包含来自 © AND 2007 年的数据。(www.and.com) + contributors_nl_html: 荷兰：含有© AND data, 2007（www.and.com） contributors_nz_html: 新西兰：包含来自新西兰土地信息部的数据。Crown 版权所有。 contributors_title_html: 我们的贡献者 contributors_za_html: 南非：包含来自行政局：国家地球空间信息，国家版权所有。 - credit_1_html: "我们需要您注明 “© OpenStreetMap\ncontributors”。" + credit_1_html: 我们需要你署名“© OpenStreetMap贡献者”。 credit_2_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图瓦片，其协议须为 CC-BY-SA。您可以链接此版权页以注明。另外，若您要以数据形式发布 OSM，您可以属名并直接链接协议。若某些媒介无法进行链接（如印刷品），我们建议您引导您的读者至 openstreetmap.org（或OpenStreetMap的完整网址）、opendatacommons.org，及可能相关的creativecommons.org。 credit_3_html: "对于可浏览的电子地图，标记会出现在地图的右下角。\n例如：" - credit_title_html: 如何注明 OpenStreetMap - infringement_1_html: OSM 的贡献者会被提醒，在没有版权持有人的明确许可下，绝不添加任何受版权保护的数据(例如：谷歌地图，或印刷地图)。 + credit_title_html: 如何表明作者是OpenStreetMap + infringement_1_html: OSM的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。 infringement_2_html: 如果你认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的撤除程序，或直接在我们的在线申报页面上提出。 - infringement_title_html: 侵权问题 - intro_1_html: "OpenStreetMap 为开放式数据，在开放式数据共享开放式数据库许可（ODbL）下授权。" - intro_2_html: 您可以自由地复制、发行、传播和创作演绎我们的数据，只要您注明 OpenStreetMap 和它的贡献者。如果您想改变、转换或者以我们的数据为基础进行创作，您只能采用与本协议相同的许可协议发布您的作品。完整的法律文本阐明了您的权利和义务。 + infringement_title_html: 著作权侵犯 + intro_1_html: "OpenStreetMap是开放数据，采用开放数据共享开放数据库许可协议（ODbL）授权。" + intro_2_html: 只要你表明来源为OpenStreetMap及其贡献者，你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表你的作品。完整的法律文本阐明了你的权利和义务。 intro_3_html: 创作我们的地图瓦片及文档须在知识共享署名-相同方式共享 2.0（CC-BY-SA）协议下进行的。 - more_1_html: "阅读使用我们数据的常见法律问题。" + more_1_html: "请在法律常见问题阅读更多关于使用我们的数据，以及如何表明我们是作者的信息。" more_2_html: 虽然 OpenStreetMap 是一个开发的数据库，但我们无法为第三方开发人员提供免费的地图 API。详见我们的API使用政策、地图瓦片使用政策及名称服务使用政策。 more_title_html: 了解更多 - title_html: 版权和许可 + title_html: 著作权与许可 native: - mapping_link: 开始制图 - native_link: 简体中文版 - text: 您正在查看英文版的版权页。您可以返回这个网页的%{native_link}，或者您可以停止阅读版权并%{mapping_link}。 - title: 关于此页 + mapping_link: 开始绘制地图 + native_link: 简体中文版本 + text: 你正在查看英语版本的著作权页面。你可以返回该页面的%{native_link}，或停止阅读著作权信息并%{mapping_link}。 + title: 关于该页 message: delete: deleted: 消息已删除 inbox: date: 日期 - from: 来自 + from: 发件人 messages: 您有 %{new_messages}和 %{old_messages} my_inbox: 我的收件箱 new_messages: "%{count} 条新消息" no_messages_yet: 您还没有消息，何不联系一些%{people_mapping_nearby_link}？ old_messages: "%{count} 条旧消息" outbox: 发件箱 - people_mapping_nearby: 在您附近的人 - subject: 标题 + people_mapping_nearby: 在附近绘制地图的人 + subject: 主题 title: 收件箱 mark: as_read: 标记消息为已读 @@ -1184,13 +1194,13 @@ zh-CN: unread_button: 标记为未读 new: back_to_inbox: 返回收件箱 - body: 主体 + body: 正文 limit_exceeded: 您刚发送了很多消息。在尝试发送其他消息之前，请稍等一会儿。 - message_sent: 已发送消息 + message_sent: 信息已发出 send_button: 发送 - send_message_to: 发送新消息给 %{name} - subject: 标题 - title: 发送消息 + send_message_to: 发送新信息给%{name} + subject: 主题 + title: 发信息 no_such_message: body: 对不起，没有具有该 id 的消息。 heading: 没有此消息 @@ -1198,22 +1208,24 @@ zh-CN: outbox: date: 日期 inbox: 收件箱 - messages: 您有 %{count} 条已发送消息 + messages: + one: 你有%{count}条已发送信息 + other: 你有%{count}条已发送信息 my_inbox: 我的%{inbox_link} no_sent_messages: 您尚未发送信息。何不联系一些%{people_mapping_nearby_link}? outbox: 发件箱 - people_mapping_nearby: 在您附近的人 + people_mapping_nearby: 在附近绘制地图的人 subject: 主题 title: 发件箱 - to: 给 + to: 收件人 read: back: 返回 date: 日期 - from: 来自 + from: 发件人 reply_button: 回复 subject: 主题 - title: 阅读消息 - to: 给 + title: 阅读信息 + to: 收件人 unread_button: 标记为未读 wrong_user: 您已经以 '%{user}' 的身份登录，但是您想要阅读的消息并非寄给这个用户。请以正确的用户身份登录以阅读这个消息。 reply: @@ -1237,10 +1249,10 @@ zh-CN: ago_html: "%{when}前" created_at: 创建于 creator: 创建者 - description: 描述 + description: 说明 heading: "%{user} 的注释" - id: Id - last_changed: 最后修改 + id: ID + last_changed: 最后变更 subheading: 由 %{user} 提交或评论的注释 title: 由 %{user} 提交或评论的注释 rss: @@ -1255,23 +1267,23 @@ zh-CN: diary_comment_notification: footer: 您也可以通过%{readurl}来读取评论，并且在%{commenturl}来撰写评论或者通过%{replyurl}回复 header: "%{from_user} 在您最近 OpenStreetMap 标题为 %{subject} 的日记条目留下了评论：" - hi: "%{to_user} 您好，" + hi: 嗨，%{to_user}： subject: "[OpenStreetMap] %{user} 在您的日记项目留下了评论" email_confirm: subject: "[OpenStreetMap] 确认您的电子邮件地址" email_confirm_html: click_the_link: 如果这是您，请点击下面的链接以确认更改。 - greeting: 您好， + greeting: 嗨， hopefully_you: 某人(希望是您)想要更改他们的电子邮件地址 %{server_url} 为 %{new_address}。 email_confirm_plain: click_the_link: 如果这是您，请点击下面的链接以确认更改。 - greeting: 您好， - hopefully_you: 某人(希望是您)在%{server_url}将邮箱地址更改到了 %{new_address}。 + greeting: 嗨， + hopefully_you: 有人（希望是你）想要在%{server_url}将他的电子邮件地址变更为%{new_address}。 friend_notification: - befriend_them: 您可以在 %{befriendurl} 把他们加为朋友。 - had_added_you: "%{user} 已经在 Openstreetmap 上加您为好友。" - see_their_profile: 您可以在 %{userurl} 上查看他们的个人信息。 - subject: "[OpenStreetMap] %{user} 已加您为好友" + befriend_them: 你也可以在%{befriendurl}添加他们为朋友。 + had_added_you: "%{user}已经在OpenStreetMap添加你为朋友。" + see_their_profile: 你可以在%{userurl}查看他们的个人资料。 + subject: "[OpenStreetMap]%{user}添加你为朋友" gpx_notification: and_no_tags: 并且没有标签。 and_the_tags: 和以下标签： @@ -1280,11 +1292,11 @@ zh-CN: import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures more_info_1: 更多有关 GPX 导入失败的详细信息，以及如何避免 more_info_2: 它们的信息可以在这里找到： - subject: "[OpenStreetMap] GPX 导入失败" + subject: "[OpenStreetMap]GPX导入失败" greeting: 您好， success: loaded_successfully: 成功载入可能 %{possible_points} 点中的 %{trace_points} 点。 - subject: "[OpenStreetMap] GPX 导入成功" + subject: "[OpenStreetMap]GPX导入成功" with_description: 带有描述 your_gpx_file: 看起来像是您的 GPX 文件 lost_password: @@ -1295,18 +1307,18 @@ zh-CN: hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 账户密码 lost_password_plain: click_the_link: 如果这是您，请点击下面的链接重置您的密码。 - greeting: 您好， + greeting: 嗨， hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 帐户密码。 message_notification: - footer_html: 您还可以阅读%{readurl}的消息且您可以在%{replyurl}回复 - header: "%{from_user} 已经通过 OpenStreetMap 向您发送标题为 %{subject} 的消息：" - hi: "%{to_user} 您好，" - subject_header: "[OpenStreetMap] %{subject}" + footer_html: 你还可以在%{readurl}阅读这条信息并在%{replyurl}回复 + header: "%{from_user}已经通过OpenStreetMap给你发送了一条主题为%{subject}的信息：" + hi: 嗨，%{to_user}： + subject_header: "[OpenStreetMap]%{subject}" note_comment_notification: - anonymous: 一位匿名用户 + anonymous: 匿名用户 closed: commented_note: "%{commenter} 解决了您感兴趣的一个地图注释。该注释位于 %{place} 附近。" - subject_other: "[OpenStreetMap] %{commenter} 解决了您感兴趣的一个注释" + subject_other: "[OpenStreetMap]%{commenter}已经解决了一个你感兴趣的注释" subject_own: "[OpenStreetMap] %{commenter} 解决了您的一个注释" your_note: "%{commenter} 解决了您在 %{place} 附近的一个注释。" commented: @@ -1314,7 +1326,7 @@ zh-CN: subject_other: "[OpenStreetMap] %{commenter} 评论了您感兴趣的一个注释" subject_own: "[OpenStreetMap] %{commenter} 评论了您的一个注释" your_note: "%{commenter} 评论了您在 %{place} 附近的一个注释。" - details: 注释的更多细节可以在%{url}找到。 + details: 更多关于注释的详细信息可以在%{url}找到。 greeting: 您好， reopened: commented_note: "%{commenter} 重新激活了您感兴趣的一个地图注释。该注释位于 %{place} 附近。" @@ -1323,20 +1335,20 @@ zh-CN: your_note: "%{commenter} 重新激活了您在 %{place} 附近的一个注释。" signup_confirm: confirm: 在开始之前，我们需要确认这个请求来自于您。如果确实这样，那么请点击以下链接以确认您的帐户： - created: 某人(希望是您)刚在%{site_url}创建了一个帐户。 - greeting: 您好！ - subject: "[OpenStreetMap] 欢迎加入 OpenStreetMap" + created: 有人（希望是你）刚在%{site_url}创建了一个账户。 + greeting: 你好！ + subject: "[OpenStreetMap]欢迎加入OpenStreetMap" welcome: 等你确认帐号后，我们将提供一些额外的信息以帮助你开始使用。 oauth: oauthorize: allow_read_gpx: 读取您的私人 GPS 轨迹。 - allow_read_prefs: 读取您的首选项。 + allow_read_prefs: 读取你的用户设置。 allow_to: 允许客户端应用程序： allow_write_api: 修改地图。 - allow_write_diary: 创建日记、评论和交朋友。 - allow_write_gpx: 上传 GPS 轨迹。 + allow_write_diary: 创建日记条目，评论和交朋友。 + allow_write_gpx: 上传GPS轨迹。 allow_write_notes: 修改注释。 - allow_write_prefs: 修改您的用户首选项。 + allow_write_prefs: 修改你的用户设置。 request_access: "%{user}，应用程序 %{app_name} 要求访问您的帐户。请确定您要让此应用程序使用下列功能。您可以按照自己的意思选择几个。" revoke: flash: 您已经注销 %{application} 的令牌。 @@ -1347,13 +1359,13 @@ zh-CN: flash: 已破坏此客户端应用程序注册 edit: submit: 编辑 - title: 编辑您的应用程序 + title: 编辑你的应用程序 form: allow_read_gpx: 读取他们的私有 GPS 轨迹。 allow_read_prefs: 读取他们的用户首选项。 allow_write_api: 修改地图。 allow_write_diary: 创建日记、评论和交朋友。 - allow_write_gpx: 上传 GPS 轨迹。 + allow_write_gpx: 上传GPS轨迹。 allow_write_notes: 修改注释。 allow_write_prefs: 修改他们的用户参数设置。 callback_url: 回调 URL @@ -1366,7 +1378,7 @@ zh-CN: application: 应用程序名称 issued_at: 发出于 list_tokens: 下列令牌已发给您名下的应用程序： - my_apps: 我的客户端应用程序 + my_apps: 我的客户应用程序 my_tokens: 我的已授权应用程序 no_apps: 您是否有想要注册使用 %{oauth} 标准的应用程序？您必须先注册您的网页应用程序，才能对这个服务进行OAuth 要求。 register_new: 注册您的应用程序 @@ -1375,7 +1387,7 @@ zh-CN: title: 我的 OAuth 详细信息 new: submit: 注册 - title: 注册新的应用程序 + title: 注册新应用程序 not_found: sorry: 对不起，找不到 %{type}。 show: @@ -1395,12 +1407,12 @@ zh-CN: requests: 要向用户要求下列权限： secret: 用户密钥： support_notice: 我们支持HMAC-SHA1（推荐）和RSA-SHA1署名。 - title: "%{app_name} 的 OAuth 详细信息" + title: "%{app_name}的OAuth详细信息" url: 请求令牌 URL： update: flash: 更新客户端信息成功 printable_name: - with_version: "%{id}，版本 %{version}" + with_version: "%{id}，版本%{version}" redaction: create: flash: 节点被创建。 @@ -1418,7 +1430,7 @@ zh-CN: heading: 修改列表 title: 修改列表 new: - description: 描述 + description: 说明 heading: 输入新修改的信息 submit: 创建修改 title: 正在创建新的修改 @@ -1444,13 +1456,13 @@ zh-CN: potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 以获得更多信息 potlatch2_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 2 中保存，您应该点击保存。) potlatch_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 中保存，如果在在线模式下编辑，您需要取消选择当前的路径或节点；或者点击保存，如果有保存按钮。) - user_page_link: 用户页 + user_page_link: 用户页面 index: - createnote: 添加一个注释 + createnote: 添加注释 js_1: 您或许正在使用不支持 JavaScript 的浏览器，或许您禁用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。 license: - copyright: 版权 OpenStreetMap 及其贡献者，在开放许可协议下授权 + copyright: 版权所有 OpenStreetMap及其贡献者，采用开放授权协议 permalink: 固定链接 remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制 shortlink: 短链接 @@ -1458,11 +1470,11 @@ zh-CN: table: entry: admin: 行政区边界 - allotments: 拨款 + allotments: 小块园地 apron: - 机场停机坪 - 航站楼 - bridge: 黑色套管 = æ¡¥ + bridge: 双实线 = æ¡¥ bridleway: 马道 brownfield: 棕色地块 building: 特殊建筑物 @@ -1512,12 +1524,12 @@ zh-CN: - 山峰 - 高峰 tourist: 旅游景点 - track: 辙迹 + track: 小路 tram: - 轻轨 - 电车 trunk: 快速道路 - tunnel: 虚线套管 = 隧道 + tunnel: 双虚线 = 隧道 unclassified: 未分类道路 unsurfaced: 无铺面道路 wood: 林 @@ -1532,7 +1544,7 @@ zh-CN: second: 第二项 subheading: 副标题 text: 文本 - title_html: 按照 Markdown 来解析 + title_html: 使用Markdown解析 unordered: 无序列表 url: URL richtext_area: @@ -1542,7 +1554,7 @@ zh-CN: search: 搜索 search_help: 例如：'Alkmaar'，'Regent Street, Cambridge'，'CB2 5AQ'，或 'post offices near Lünen' 更多例子... submit_text: 开始 - where_am_i: 我在哪里? + where_am_i: 我在哪里？ where_am_i_title: 使用搜索引擎描述当前的位置 sidebar: close: 关闭 @@ -1553,36 +1565,41 @@ zh-CN: trace: create: trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。 - upload_trace: 上传 GPS 轨迹 + upload_trace: 上传GPS轨迹 delete: - scheduled_for_deletion: 计划被删除的路径 + scheduled_for_deletion: 计划删除的轨迹 description: - description_without_count: "%{user}的GPX文件" + description_with_count: + one: GPX file with %{count} point from %{user} + other: 来自%{user}的带%{count}点的GPX文件 + description_without_count: 来自%{user}的GPX文件 edit: - description: 描述： + description: 说明： download: 下载 edit: 编辑 filename: 文件名： heading: 编辑轨迹 %{name} map: 地图 - owner: 所有者： + owner: 所有人： points: 点： - save_button: 保存修改 + save_button: 保存变更 start_coord: 起始坐标： tags: 标签： tags_help: 用逗号分隔 title: 编辑轨迹 %{name} - uploaded_at: 上传时间： + uploaded_at: 上传于： visibility: 可见性： visibility_help: 这是什么意思？ visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces + georss: + title: OpenStreetMap GPS跟踪 list: description: 浏览最近上传的GPS轨迹 empty_html: 尚无轨迹。上传新轨迹或在维基页面上了解 GPS 轨迹。 - public_traces: 公开的 GPS 轨迹 - public_traces_from: "%{user} 的公开 GPS 轨迹" - tagged_with: " 标记为 %{tags}" - your_traces: 您的 GPS 轨迹 + public_traces: 公开的GPS轨迹 + public_traces_from: 来自%{user}的公开GPS轨迹 + tagged_with: 以%{tags}标记 + your_traces: 你的GPS轨迹 make_public: made_public: 公开化路径 offline: @@ -1591,35 +1608,35 @@ zh-CN: offline_warning: message: GPX 文件上传系统当前不可用 trace: - ago: "%{time_in_words_ago}之前" + ago: "%{time_in_words_ago}前" by: 由 - count_points: "%{count} 个点" + count_points: "%{count}个点" edit: 编辑 edit_map: 编辑地图 identifiable: 可识别 in: 于 map: 地图 more: 更多 - pending: 【挂起】 + pending: 挂起 private: 私有 public: 公开 - trace_details: 查看路径详情 + trace_details: 查看轨迹详细信息 trackable: 可追踪 view_map: 查看地图 trace_form: - description: 描述： + description: 说明： help: 帮助 help_url: http://wiki.openstreetmap.org/wiki/Upload tags: 标签： tags_help: 用逗号分隔 upload_button: 上传 - upload_gpx: 上传 GPX 文件： + upload_gpx: 上传GPX文件： visibility: 可见性： visibility_help: 这是什么意思？ visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_header: see_all_traces: 查看所有轨迹 - see_your_traces: 查看您的所有轨迹 + see_your_traces: 查看你的轨迹 traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。 upload_trace: 上传轨迹 trace_optionals: @@ -1630,20 +1647,20 @@ zh-CN: showing_page: 第%{page}页 view: delete_track: 删除这条轨迹 - description: 描述： + description: 说明： download: 下载 edit: 编辑 edit_track: 编辑这条轨迹 filename: 文件名： - heading: 查看路径 %{name} + heading: 查看轨迹%{name} map: 地图 none: 空 - owner: 所有者： + owner: 所有人： pending: 挂起 points: 点： start_coordinates: 起始坐标： - tags: 标签 - title: 查看路径 %{name} + tags: 标签： + title: 查看轨迹%{name} trace_not_found: 未找到轨迹！ uploaded: 上传于： visibility: 可见性： @@ -1664,11 +1681,11 @@ zh-CN: review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。 current email address: 当前电子邮件地址： delete image: 删除当前图片 - email never displayed publicly: (从不公开显示) + email never displayed publicly: （不公开显示） flash update success: 成功更新用户信息。 flash update success confirm needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。 gravatar: - gravatar: 使用 Gravatar + gravatar: 使用Gravatar link text: 这是什么？ home location: 所在位置： image: 图像： @@ -1740,20 +1757,20 @@ zh-CN: account is suspended: 对不起，您的帐户因可疑活动已被暂停。
如果你想讨论这个，请联系网站管理员。 account not active: 对不起，您的账户尚未激活。
请点击在账户确认邮件中的链接来激活您的账户，或请求新的确认电子邮件。 auth failure: 对不起，凭这些信息您无法登录。 - create account minute: 创建一个帐户。只需要一分钟。 + create account minute: 创建账户。只需要一分钟。 email or username: 电子邮件地址或用户名： heading: 登录 login_button: 登录 - lost password link: 找回密码? + lost password link: 忘记密码？ new to osm: 第一次来到 OpenStreetMap？ no account: 还没有帐户？ - openid: "%{logo} OpenID：" + openid: "%{logo}OpenID：" openid invalid: 对不起，您的 OpenID 格式似乎不正确 openid missing provider: 对不起，无法联系您的 OpenID 提供者 openid_logo_alt: 使用 OpenID 登录 openid_providers: aol: - alt: 使用一个 AOL OpenID 登录 + alt: 使用AOL OpenID登录 title: 使用 AOL 登录 google: alt: 使用一个 Google OpenID 登录 @@ -1771,8 +1788,8 @@ zh-CN: alt: 使用一个 Yahoo OpenID 登录 title: 使用 Yahoo 登录 password: 密码： - register now: 立即注册 - remember: 记住我： + register now: 现在就注册 + remember: 记住我 title: 登录 to make changes: 要修改 OpenStreetMap 的数据，您必须拥有一个帐户。 with openid: 或者请使用您的 OpenID 登录： @@ -1780,15 +1797,15 @@ zh-CN: logout: heading: 从 OpenStreetMap 注销 logout_button: 注销 - title: 注销 + title: 登出 lost_password: email address: 电子邮件地址： - heading: 忘记密码? + heading: 忘记密码？ help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。 new password button: 重置密码 notice email cannot find: 对不起，无法找到邮箱。 notice email on way: 对不起，您忘记了密码 :-( 但是邮件正在发送，一会您就可以重置它。 - title: 丢失密码 + title: 忘记密码 make_friend: already_a_friend: 您已经和 %{name} 是朋友了。 button: 添加为好友 @@ -1797,19 +1814,19 @@ zh-CN: success: "%{name}现在是您的好友！" new: about: - header: 免费而且可编辑 + header: 自由且可编辑 html: "

不同于其他地图，OpenStreetMap是完全由像你一样的人创建的，并且免费提供给任何人用以修正、更新、下载和使用。

\n

登录来贡献你的力量吧。我们将发送一份邮件来确认您的账号。

" - confirm email address: 确认邮箱： + confirm email address: 确认电子邮件地址： confirm password: 确认密码： contact_webmaster: 请联系网站管理员来安排创建一个账户 - 我们将尽快尝试处理您的请求。 continue: 登录 - display name: 显示姓名： - display name description: 您公开显示的用户名。您可以稍后在首选项中更改。 - email address: 邮箱： + display name: 显示名称： + display name description: 你公开显示的用户名。你可以稍后在设置中进行变更。 + email address: 电子邮件地址： license_agreement: 当您确认您的帐户时，您需要同意贡献者条款。 no_auto_account_create: 很遗憾，我们目前无法为您自动创建一个帐户。 not displayed publicly: 不公开显示(参阅隐私政策) - openid: "%{logo} OpenID：" + openid: "%{logo}OpenID：" openid association: "

您的 OpenID 尚未与一个 OpenStreetMap 帐户相关联。

\n
    \n
  • 如果您是新来到 OpenStreetMap，请使用下面的表单创建一个新的帐户。
    • \n
  • \n 如果您已经有一个帐户，您可以使用您的\n 用户名和密码登录到您的帐户，然后在您\n 的用户设置中关联您的 OpenID。\n
    • \n
" openid no password: 使用 OpenID 时密码不是必需的，但一些额外的工具或服务器可能需要一个。 password: 密码： @@ -1820,17 +1837,17 @@ zh-CN: use openid: 或者，使用 %{logo} OpenID 登录 no_such_user: body: 对不起，没有名为 %{user} 的用户。请检查您的拼写，或者可能是点击了错误的链接。 - heading: 用户 %{user} 不存在 + heading: 用户%{user}不存在 title: 没有此用户 popup: friend: 朋友 nearby mapper: 附近用户 your location: 您的位置 remove_friend: - button: 删除好友 - heading: 删除好友%{user}？ - not_a_friend: "%{name} 不是您的朋友。" - success: "%{name} 已从您的朋友中删除。" + button: 删除朋友 + heading: 删除朋友%{user}？ + not_a_friend: "%{name}不是你的朋友。" + success: "%{name}已从你的朋友中删除。" reset_password: confirm password: 确认密码： flash changed: 您的密码已更改。 @@ -1865,23 +1882,23 @@ zh-CN: you need to accept or decline: 请先阅读，然后接受或拒绝新的贡献者条款，再继续。 view: activate_user: 启用该用户 - add as friend: 添加好友 + add as friend: 添加朋友 ago: (%{time_in_words_ago}之前) block_history: 接受的封禁 - blocks by me: 被我屏蔽的 - blocks on me: 屏蔽我的 + blocks by me: 被我封禁 + blocks on me: 我的封禁 comments: 注释 confirm: 确认 confirm_user: 确认此用户 create_block: 阻止此用户 - created from: 建立于： - ct accepted: 于%{ago}之前接受 + created from: 创建自： + ct accepted: 接受于%{ago}前 ct declined: 已拒绝 ct status: 贡献者条款： ct undecided: 未决定 deactivate_user: 停用该用户 delete_user: 删除此用户 - description: 描述 + description: 说明 diary: 日记 edits: 编辑 email address: 电子邮件地址： @@ -1889,10 +1906,10 @@ zh-CN: friends_diaries: 好友的日记条目 hide_user: 隐藏此用户 if set location: 如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的%{settings_link}页面来设置您的位置。 - km away: "%{count} 公里之外" - latest edit: 上次编辑于%{ago}： - m away: "%{count} 米之外" - mapper since: 成为制图者： + km away: "%{count}千米远" + latest edit: "%{ago}的最后编辑：" + m away: "%{count}米远" + mapper since: 绘制地图始于： moderator_history: 执行封禁者 my comments: 我的评论 my diary: 我的日记 @@ -1901,15 +1918,15 @@ zh-CN: my profile: 我的资料 my settings: 我的设置 my traces: 我的轨迹 - nearby users: 附近的其他用户 + nearby users: 其他附近的用户 nearby_changesets: 最近用户的更改 nearby_diaries: 最近用户的日记条目 - new diary entry: 新日记入口 + new diary entry: 新日记条目 no friends: 您还没有添加任何好友。 no nearby users: 附近没有在进行制图的用户。 notes: 地图注释 - oauth settings: OAuth 设置 - remove as friend: 删除好友 + oauth settings: OAuth设置 + remove as friend: 删除朋友 role: administrator: 此用户是管理员 grant: @@ -1920,7 +1937,7 @@ zh-CN: administrator: 撤销管理员权限 moderator: 撤销管理员权限 send message: 发送信息 - settings_link_text: 设定 + settings_link_text: 设置 spam score: 垃圾邮件评分： status: 状态： traces: 轨迹 @@ -1942,13 +1959,13 @@ zh-CN: try_waiting: 在封禁用户之前，请尝试给用户一段合理的时间来回应。 edit: back: 查看所有封禁 - heading: 正在编辑对 %{name} 的封禁 + heading: 编辑对%{name}的封禁 needs_view: 在清除这个封禁之前，是否需要用户先登录？ period: 从现在开始，该用户要被封禁不能使用 API 多久。 reason: "%{name} 之所以被封禁的原因。请以冷静、合理的态度，尽量详细的说明有关情况。请记住，并非所有用户都了解社区的术语，所以请尝试使用较通俗的说法。" show: 查看此封禁 submit: 更新封禁 - title: 正在编辑对 %{name} 的封禁 + title: 编辑对%{name}的封禁 filter: block_expired: 这个封禁已经过期，并且不能再编辑。 block_period: 封禁时期必须是在下拉菜单中可选择的数值之一。 @@ -1991,14 +2008,14 @@ zh-CN: showing_page: 第%{page}页 status: 状态 period: - one: 1 小时 - other: "%{count} 小时" + one: 1小时 + other: "%{count}小时" revoke: confirm: 您确定要撤销此封禁？ - flash: 此封禁已被撤销。 + flash: 该封禁已经被撤销。 heading: 正在撤销 %{block_by} 对 %{block_on} 的封禁 past: 此封禁已在 %{time} 之前结束，现在不能被撤销。 - revoke: 撤销! + revoke: 撤销！ time_future: 此封禁将于 %{time} 结束。 title: 正在撤销对 %{block_on} 的封禁 show: @@ -2012,8 +2029,8 @@ zh-CN: revoker: 撤销者： show: 显示 status: 状态 - time_future: 结束于 %{time} - time_past: 结束于 %{time} 之前 + time_future: 结束于%{time} + time_past: 结束于%{time}前 title: "%{block_on} 被 %{block_by} 封禁" update: only_creator_can_edit: 只有执行封禁的管理员能编辑它。 @@ -2040,19 +2057,19 @@ zh-CN: add_a_note: paragraph_1_html: 如果你这是想做一些微小改动而没有时间登录来学习如何编辑，那做一些注释是非常容易的。 paragraph_2_html: 只要去地图并单击注释图标： 。这将在地图上添加一个标记，你可以拖动它，并添加您的注释，然后单击保存，其他人可以确认是否正确。 - title: 没有时间编辑吗？添加注释 ！ + title: 没有时间编辑？添加注释！ basic_terms: - editor_html: editor是一个程序或网页，你可以用它来使用和编辑地图。 - node_html: node就是地图上的一个点，譬如一个小饭店或者一棵树。 - paragraph_1_html: OpenStreetMap 有它自己的术语。这里列出几个有用的关键词。 - tag_html: tag是关于node或way的一些数据，就像一个饭店的名字或者一条路的限速。 - title: 画图的基本术语 - way_html: way是一条线或一个区域，就像一条路、一条小溪、一个湖泊或者一栋建筑。 - introduction_html: 欢迎来到OpenStreeMap：全世界免费而且可编辑的地图。现在你可以登录，开始画地图吧。这里是快速上手指南包含您需要知道的最重要的内容。 + editor_html: 编辑器是你可以用于编辑地图的程序或网站。 + node_html: 节点是地图上的点，例如一个餐馆或一棵树。 + paragraph_1_html: OpenStreetMap有一些自己的术语。这里是一些常用的关键词。 + tag_html: 标签是关于节点或路径的简短数据，例如餐馆的名字或者道路的速度限制。 + title: 绘制地图的基本术语 + way_html: 路径是线或区域，例如一条路、一条溪、一个湖或一个建筑物。 + introduction_html: 欢迎访问OpenStreeMap，自由且可编辑的世界地图。你已经登录，可以开始绘制地图。这里是含有你需要知道的最重要的信息的快速指南。 questions: paragraph_1_html: 需要协助画地图，或者对如何使用OpenStreetMap不是很清楚？在帮助网站得到你想要的答案。 - title: 还有问题吗？ - start_mapping: 开始画图 + title: 还有疑问吗？ + start_mapping: 开始绘制地图 title: 欢迎！ whats_on_the_map: off_html: 当然它不包含一些激进的数据，譬如评分、历史或者假设的特性，以及有版权的来源。除非你具有特殊权利，否则不要复制在线的或者纸质地图。 diff --git a/config/routes.rb b/config/routes.rb index 9eda73015..59c5b6803 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -182,7 +182,7 @@ OpenStreetMap::Application.routes.draw do match '/traces/mine' => 'trace#mine', :via => :get match '/trace/create' => 'trace#create', :via => [:get, :post] match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/ - match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/ + match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit" match '/trace/:id/delete' => 'trace#delete', :via => :post, :id => /\d+/ # diary pages @@ -217,6 +217,7 @@ OpenStreetMap::Application.routes.draw do # geocoder match '/search' => 'geocoder#search', :via => :get, :as => :search + match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get diff --git a/public/robots.txt b/public/robots.txt index f925d813c..d2801eab9 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -3,7 +3,6 @@ Sitemap: http://www.openstreetmap.org/sitemap.xml.gz User-agent: * Disallow: /user/*/traces/ Disallow: /user/*/edits -Disallow: /user/*/diary/ Allow: /user/ Disallow: /traces/tag/ Disallow: /traces/page/ diff --git a/test/fixtures/diary_comments.yml b/test/fixtures/diary_comments.yml index b8fb5c853..247fc3abd 100644 --- a/test/fixtures/diary_comments.yml +++ b/test/fixtures/diary_comments.yml @@ -5,6 +5,7 @@ comment_for_geo_post: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true comment_by_suspended_user: id: 2 @@ -13,6 +14,7 @@ comment_by_suspended_user: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true comment_by_deleted_user: id: 3 @@ -21,3 +23,13 @@ comment_by_deleted_user: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true + +hidden_comment: + id: 4 + diary_entry_id: 2 + user_id: 2 + body: Some comment text + created_at: "2008-11-08 09:45:34" + updated_at: "2008-11-08 10:34:34" + visible: false diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml index 864dc250d..27717302d 100644 --- a/test/fixtures/diary_entries.yml +++ b/test/fixtures/diary_entries.yml @@ -23,7 +23,6 @@ normal_user_geo_entry: visible: true deleted_entry: - id: 3 user_id: 1 title: Deleted Entry 1 @@ -34,3 +33,27 @@ deleted_entry: longitude: language_code: en visible: false + +entry_by_suspended_user: + id: 4 + user_id: 10 + title: Entry by suspended user + body: This is the body of a diary entry by a suspended user. + created_at: "2008-11-07 17:43:34" + updated_at: "2008-11-07 17:43:34" + latitude: + longitude: + language_code: en + visible: true + +entry_by_deleted_user: + id: 5 + user_id: 11 + title: Entry by deleted user + body: This is the body of a diary entry by a deleted user. + created_at: "2008-11-07 17:43:34" + updated_at: "2008-11-07 17:43:34" + latitude: + longitude: + language_code: en + visible: true diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index c1b7244cb..15e3cc394 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -46,6 +46,7 @@ inactive_user: terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en + email_valid: false second_public_user: id: 4 diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index 2b85f9f49..7e0f10790 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -310,7 +310,7 @@ class DiaryEntryControllerTest < ActionController::TestCase end assert_response :redirect assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name - entry = DiaryEntry.find(4) + entry = DiaryEntry.find(6) assert_equal users(:normal_user).id, entry.user_id assert_equal new_title, entry.title assert_equal new_body, entry.body @@ -354,7 +354,7 @@ class DiaryEntryControllerTest < ActionController::TestCase assert_match /New comment/, email.text_part.decoded assert_match /New comment/, email.html_part.decoded ActionMailer::Base.deliveries.clear - comment = DiaryComment.find(4) + comment = DiaryComment.find(5) assert_equal entry.id, comment.diary_entry_id assert_equal users(:public_user).id, comment.user_id assert_equal "New comment", comment.body @@ -363,7 +363,7 @@ class DiaryEntryControllerTest < ActionController::TestCase get :view, :display_name => entry.user.display_name, :id => entry.id assert_response :success assert_select ".diary-comment", :count => 1 do - assert_select "#comment4", :count => 1 do + assert_select "#comment5", :count => 1 do assert_select "a[href='/user/#{users(:public_user).display_name}']", :text => users(:public_user).display_name, :count => 1 end assert_select ".richtext", :text => /New comment/, :count => 1 @@ -421,13 +421,120 @@ class DiaryEntryControllerTest < ActionController::TestCase end def test_rss_nonexisting_user + # Try a user that has never existed get :rss, {:display_name => 'fakeUsername76543', :format => :rss} assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" + + # Try a suspended user + get :rss, {:display_name => users(:suspended_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a suspended users diary RSS" + + # Try a deleted user + get :rss, {:display_name => users(:deleted_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a deleted users diary RSS" end def test_viewing_diary_entry + # Try a normal entry that should work get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} assert_response :success - assert_template 'view' + assert_template :view + + # Try a deleted entry + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:deleted_entry).id} + assert_response :not_found + + # Try an entry by a suspended user + get :view, {:display_name => users(:suspended_user).display_name, :id => diary_entries(:entry_by_suspended_user).id} + assert_response :not_found + + # Try an entry by a deleted user + get :view, {:display_name => users(:deleted_user).display_name, :id => diary_entries(:entry_by_deleted_user).id} + assert_response :not_found + end + + def test_viewing_hidden_comments + # Get a diary entry that has hidden comments + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id} + assert_response :success + assert_template :view + assert_select "div.comments" do + assert_select "p#comment1", :count => 1 # visible comment + assert_select "p#comment2", :count => 0 # comment by suspended user + assert_select "p#comment3", :count => 0 # comment by deleted user + assert_select "p#comment4", :count => 0 # hidden comment + end + end + + def test_hide + # Try without logging in + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} + assert_response :forbidden + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + assert_equal false, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + end + + def test_hidecomment + # Try without logging in + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id} + assert_response :forbidden + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal false, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + end + + def test_comments + # Test a user with no comments + get :comments, :display_name => users(:normal_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 1 # header, no comments + end + + # Test a user with a comment + get :comments, :display_name => users(:public_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 2 # header and one comment + end + + # Test a suspended user + get :comments, :display_name => users(:suspended_user).display_name + assert_response :not_found + + # Test a deleted user + get :comments, :display_name => users(:deleted_user).display_name + assert_response :not_found end end diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb index 51fc2020a..d8eee97d8 100644 --- a/test/functional/geocoder_controller_test.rb +++ b/test/functional/geocoder_controller_test.rb @@ -11,6 +11,10 @@ class GeocoderControllerTest < ActionController::TestCase { :path => "/geocoder/search", :method => :post }, { :controller => "geocoder", :action => "search" } ) + assert_routing( + { :path => "/geocoder/search_latlon", :method => :get }, + { :controller => "geocoder", :action => "search_latlon" } + ) assert_routing( { :path => "/geocoder/search_us_postcode", :method => :get }, { :controller => "geocoder", :action => "search_us_postcode" } @@ -52,7 +56,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -70,7 +74,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -88,7 +92,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] @@ -106,7 +110,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -124,7 +128,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] @@ -145,7 +149,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -166,7 +170,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] @@ -187,7 +191,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -208,7 +212,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] @@ -228,7 +232,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -248,7 +252,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta 50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] @@ -268,7 +272,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta 14.37742, @controller.params[:lon] @@ -288,7 +292,7 @@ class GeocoderControllerTest < ActionController::TestCase ].each do |code| post :search, :query => code assert_response :success - assert_equal ['osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) + assert_equal ['latlon' ,'osm_nominatim_reverse', 'geonames_reverse'], assigns(:sources) assert_nil @controller.params[:query] assert_in_delta -50.06773, @controller.params[:lat] assert_in_delta -14.37742, @controller.params[:lon] diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb index 4c97a4849..57d6f4916 100644 --- a/test/functional/trace_controller_test.rb +++ b/test/functional/trace_controller_test.rb @@ -4,6 +4,16 @@ class TraceControllerTest < ActionController::TestCase fixtures :users, :gpx_files set_fixture_class :gpx_files => 'Trace' + def setup + @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces") + end + + def teardown + Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) + end + ## # test all routes which lead to this controller def test_routes @@ -218,6 +228,229 @@ class TraceControllerTest < ActionController::TestCase check_trace_feed users(:public_user).traces.tagged("Birmingham").public end + # Test viewing a trace + def test_view + # First with no auth, which should work since the trace is public + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + check_trace_view gpx_files(:public_trace_file) + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should work since the trace is public + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + check_trace_view gpx_files(:public_trace_file) + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + check_trace_view gpx_files(:public_trace_file) + end + + # Check an anonymous trace can't be viewed by another user + def test_view_anon + # First with no auth + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id} + assert_response :redirect + assert_redirected_to :action => :list + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now with some other user, which should work since the trace is anon + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :list + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id} + check_trace_view gpx_files(:anon_trace_file) + end + + # Test viewing a trace that doesn't exist + def test_view_not_found + # First with no auth, which should work since the trace is public + get :view, {:display_name => users(:public_user).display_name, :id => 0} + assert_response :redirect + assert_redirected_to :action => :list + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should work since the trace is public + get :view, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :redirect + assert_redirected_to :action => :list + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:public_user).display_name, :id => 5}, {:user => users(:public_user).id} + assert_response :redirect + assert_redirected_to :action => :list + end + + # Test downloading a trace + def test_data + # First with no auth, which should work since the trace is public + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + check_trace_data gpx_files(:public_trace_file) + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should work since the trace is public + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + check_trace_data gpx_files(:public_trace_file) + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + check_trace_data gpx_files(:public_trace_file) + end + + # Test downloading a compressed trace + def test_data_compressed + # First get the data as is + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id} + check_trace_data gpx_files(:identifiable_trace_file), "application/x-gzip", "gpx.gz" + + # Now ask explicitly for XML format + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id, :format => "xml"} + check_trace_data gpx_files(:identifiable_trace_file), "application/xml", "xml" + + # Now ask explicitly for GPX format + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id, :format => "gpx"} + check_trace_data gpx_files(:identifiable_trace_file) + end + + # Check an anonymous trace can't be downloaded by another user + def test_data_anon + # First with no auth + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now with some other user, which should work since the trace is anon + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id} + check_trace_data gpx_files(:anon_trace_file) + end + + # Test downloading a trace that doesn't exist + def test_data_not_found + # First with no auth, which should work since the trace is public + get :data, {:display_name => users(:public_user).display_name, :id => 0} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should work since the trace is public + get :data, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:public_user).display_name, :id => 5}, {:user => users(:public_user).id} + assert_response :not_found + end + + # Test fetching the edit page for a trace + def test_edit_get + # First with no auth + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id) + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should fail + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + get :edit, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # Now with a trace which has been deleted + get :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Finally with a trace that we are allowed to edit + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + assert_response :success + end + + # Test saving edits to a trace + def test_edit_post + # New details + new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" } + + # First with no auth + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details} + assert_response :forbidden + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should fail + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + post :edit, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id, :trace => new_details} + assert_response :not_found + + # Now with a trace which has been deleted + post :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id, :trace => new_details}, {:user => users(:public_user).id} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Finally with a trace that we are allowed to edit + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + trace = Trace.find(gpx_files(:public_trace_file).id) + assert_equal new_details[:description], trace.description + assert_equal new_details[:tagstring], trace.tagstring + assert_equal new_details[:visibility], trace.visibility + end + + # Test deleting a trace + def test_delete + # First with no auth + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id,} + assert_response :forbidden + + @request.cookies["_osm_username"] = users(:public_user).display_name + + # Now with some other user, which should fail + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + post :delete, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # Now with a trace has already been deleted + post :delete, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id} + assert_response :not_found + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Finally with a trace that we are allowed to delete + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + trace = Trace.find(gpx_files(:public_trace_file).id) + assert_equal false, trace.visible + end + # Check getting a specific trace through the api def test_api_read # First with no auth @@ -385,4 +618,21 @@ private assert_select "h4", /Nothing here yet/ end end + + def check_trace_view(trace) + assert_response :success + assert_template "view" + + assert_select "table", :count => 1 do + assert_select "td", /^#{Regexp.quote(trace.name)} / + assert_select "td", trace.user.display_name + assert_select "td", trace.description + end + end + + def check_trace_data(trace, content_type = "application/gpx+xml", extension = "gpx") + assert_response :success + assert_equal content_type, @response.content_type + assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"", @response.header["Content-Disposition"] + end end diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 6a64fd8d8..cba27f852 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -359,6 +359,15 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :action => :account, :display_name => user.display_name end + def test_user_go_public + @request.cookies["_osm_username"] = users(:normal_user).display_name + + post :go_public, {}, { :user => users(:normal_user) } + assert_response :redirect + assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name + assert_equal true, User.find(users(:normal_user).id).data_public + end + def test_user_lost_password # Test fetching the lost password page get :lost_password @@ -416,6 +425,34 @@ class UserControllerTest < ActionController::TestCase assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0] end + def test_reset_password + # Test a request with no token + get :reset_password + assert_response :bad_request + + # Test a request with a bogus token + get :reset_password, :token => "made_up_token" + assert_response :redirect + assert_redirected_to :action => :lost_password + + # Create a valid token for a user + token = User.find(users(:inactive_user).id).tokens.create + + # Test a request with a valid token + get :reset_password, :token => token.token + assert_response :success + assert_template :reset_password + + # Test setting a new password + post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } + assert_response :redirect + assert_redirected_to :action => :login + user = User.find(users(:inactive_user).id) + assert_equal "active", user.status + assert_equal true, user.email_valid + assert_equal user, User.authenticate(:username => "inactive@openstreetmap.org", :password => "new_password") + end + def test_user_update # Get a user to work with - note that this user deliberately # conflicts with uppercase_user in the email and display name @@ -794,4 +831,59 @@ class UserControllerTest < ActionController::TestCase assert_match /is not one of your friends/, flash[:error] assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first end + + def test_set_status + # Try without logging in + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"} + assert_response :redirect + assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended") + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + assert_equal "suspended", User.find(users(:normal_user).id).status + end + + def test_delete + # Try without logging in + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"} + assert_response :redirect + assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended") + + @request.cookies["_osm_username"] = users(:normal_user).display_name + + # Now try as a normal user + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + @request.cookies["_osm_username"] = users(:administrator_user).display_name + + # Finally try as an administrator + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + # Check that the user was deleted properly + user = User.find(users(:normal_user).id) + assert_equal "user_1", user.display_name + assert_equal "", user.description + assert_nil user.home_lat + assert_nil user.home_lon + assert_equal false, user.image.file? + assert_equal false, user.email_valid + assert_nil user.new_email + assert_nil user.openid_url + assert_equal "deleted", user.status + end end diff --git a/test/traces/1.gpx b/test/traces/1.gpx new file mode 100644 index 000000000..401d7a66d --- /dev/null +++ b/test/traces/1.gpx @@ -0,0 +1,25 @@ + + + + + + + + 134.0 + + 112.430000 + 0.072022 + 3d + 4 + 2.400000 + 2.600000 + 3.600000 + + + + diff --git a/test/traces/2.gpx b/test/traces/2.gpx new file mode 100644 index 000000000..44713988b --- /dev/null +++ b/test/traces/2.gpx @@ -0,0 +1,24 @@ + + + + + + + + + 112.430000 + 0.072022 + 3d + 4 + 2.400000 + 2.600000 + 3.600000 + + + + diff --git a/test/traces/4.gpx b/test/traces/4.gpx new file mode 100644 index 000000000..8cafa32c6 Binary files /dev/null and b/test/traces/4.gpx differ diff --git a/test/unit/diary_comment_test.rb b/test/unit/diary_comment_test.rb index e4ac3d422..e6d7a71b4 100644 --- a/test/unit/diary_comment_test.rb +++ b/test/unit/diary_comment_test.rb @@ -5,6 +5,6 @@ class DiaryCommentTest < ActiveSupport::TestCase fixtures :diary_comments def test_diary_comment_count - assert_equal 3, DiaryComment.count + assert_equal 4, DiaryComment.count end end diff --git a/test/unit/diary_entry_test.rb b/test/unit/diary_entry_test.rb index 0b64cbac3..0801aa299 100644 --- a/test/unit/diary_entry_test.rb +++ b/test/unit/diary_entry_test.rb @@ -5,7 +5,7 @@ class DiaryEntryTest < ActiveSupport::TestCase fixtures :diary_entries, :diary_comments, :languages def test_diary_entry_count - assert_equal 3, DiaryEntry.count + assert_equal 5, DiaryEntry.count end def test_diary_entry_validations @@ -25,7 +25,7 @@ class DiaryEntryTest < ActiveSupport::TestCase end def test_diary_entry_visible - assert_equal 2, DiaryEntry.visible.count + assert_equal 4, DiaryEntry.visible.count assert_raise ActiveRecord::RecordNotFound do DiaryEntry.visible.find(diary_entries(:deleted_entry).id) end @@ -33,7 +33,7 @@ class DiaryEntryTest < ActiveSupport::TestCase def test_diary_entry_comments assert_equal 0, diary_entries(:normal_user_entry_1).comments.count - assert_equal 3, diary_entries(:normal_user_geo_entry).comments.count + assert_equal 4, diary_entries(:normal_user_geo_entry).comments.count end def test_diary_entry_visible_comments diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 44176cdf5..0f7ec70f1 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -572,13 +572,13 @@ path.stroke.tag-highway { stroke-width:8; } -svg[data-zoom="16"] path.shadow.tag-highway { +.low-zoom path.shadow.tag-highway { stroke-width:12; } -svg[data-zoom="16"] path.casing.tag-highway { +.low-zoom path.casing.tag-highway { stroke-width:6; } -svg[data-zoom="16"] path.stroke.tag-highway { +.low-zoom path.stroke.tag-highway { stroke-width:4; } @@ -691,10 +691,10 @@ path.casing.tag-highway-service { stroke:#666; stroke-width:6; } -svg[data-zoom="16"] path.stroke.tag-highway-service { +.low-zoom path.stroke.tag-highway-service { stroke-width:2; } -svg[data-zoom="16"] path.casing.tag-highway-service { +.low-zoom path.casing.tag-highway-service { stroke-width:4; } @@ -708,10 +708,10 @@ path.casing.tag-highway-track { stroke-linecap: butt; stroke-dasharray: 6, 6; } -svg[data-zoom="16"] path.stroke.tag-highway-track { +.low-zoom path.stroke.tag-highway-track { stroke-width:2; } -svg[data-zoom="16"] path.casing.tag-highway-track { +.low-zoom path.casing.tag-highway-track { stroke-width:4; } @@ -740,14 +740,14 @@ path.casing.tag-highway-bridleway { stroke: #fff; } -svg[data-zoom="16"] path.stroke.tag-highway-footway, -svg[data-zoom="16"] path.stroke.tag-highway-cycleway, -svg[data-zoom="16"] path.stroke.tag-highway-bridleway { +.low-zoom path.stroke.tag-highway-footway, +.low-zoom path.stroke.tag-highway-cycleway, +.low-zoom path.stroke.tag-highway-bridleway { stroke-width: 2; } -svg[data-zoom="16"] path.casing.tag-highway-footway, -svg[data-zoom="16"] path.casing.tag-highway-cycleway, -svg[data-zoom="16"] path.casing.tag-highway-bridleway { +.low-zoom path.casing.tag-highway-footway, +.low-zoom path.casing.tag-highway-cycleway, +.low-zoom path.casing.tag-highway-bridleway { stroke-width: 4; } @@ -862,8 +862,8 @@ path.casing.tag-highway-construction { /* construction */ -svg[data-zoom="16"] path.stroke.tag-highway-construction, -svg[data-zoom="16"] path.casing.tag-highway-construction { +.low-zoom path.stroke.tag-highway-construction, +.low-zoom path.casing.tag-highway-construction { stroke-linecap: butt; stroke-dasharray: 5, 5; } @@ -926,13 +926,6 @@ path.casing.tag-waterway-river { stroke-width: 6; } -svg[data-zoom="16"] path.stroke.tag-waterway-river { - stroke-width: 4; -} -svg[data-zoom="16"] path.casing.tag-waterway-river { - stroke-width: 6; -} - path.stroke.tag-waterway-ditch { stroke: #6591ff; stroke-width: 1; @@ -1396,7 +1389,6 @@ input[type=email] { width: 100%; border-radius:4px; text-overflow: ellipsis; - overflow: hidden; -webkit-transition: all 200ms; -moz-transition: all 200ms; -o-transition: all 200ms; @@ -1464,17 +1456,11 @@ table.tags, table.tags td, table.tags th { ul li { list-style: none;} -.toggle-list { - border-radius: 4px; - border: 1px solid #CCC; -} - .toggle-list > label { position: relative; padding: 5px 10px; - display:block; + display: block; height: 30px; - border-bottom: 1px solid #ccc; background-color: white; color: #7092FF; cursor: pointer; @@ -1487,34 +1473,21 @@ ul li { list-style: none;} background-color: #ececec; } -.toggle-list > label:first-child { - border-radius: 3px 3px 0 0; +.toggle-list > label:not(:last-child) { + border-bottom: 1px solid #ccc; } .toggle-list > label:last-child { border-radius: 0 0 3px 3px; - border-bottom-width: 0; } -.toggle-list > label:only-child { - border-radius: 3px; -} - -.toggle-list label > span { +.toggle-list label > span { display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } -.toggle-list > label.remove span.icon { - display: block; - width: 14px; - float: left; - margin-right: 5px; - background-position: -204px 0; -} - .toggle-list > label.active { background: #E8EBFF; } @@ -1781,6 +1754,7 @@ button.save.has-count .count::before { .icon.relation { background-position: -520px 0;} .icon.relation.route { background-position: -540px 0;} .icon.relation.multipolygon { background-position: -560px 0;} +.icon.vertex { background-position: -580px 0;} .icon.inspect.light { background-position: -220px -20px;} .icon.plus.light { background-position: -240px -20px;} @@ -1815,6 +1789,18 @@ button[disabled] .icon.layers { background-position: -300px -40px;} button[disabled] .icon.avatar { background-position: -320px -40px;} button[disabled] .icon.nearby { background-position: -340px -40px;} +.icon.point.deleted { background-position: -302px -80px;} +.icon.line.deleted { background-position: -320px -80px;} +.icon.area.deleted { background-position: -340px -80px;} + +.icon.point.created { background-position: -302px -100px;} +.icon.line.created { background-position: -320px -100px;} +.icon.area.created { background-position: -340px -100px;} + +.icon.point.modified { background-position: -22px 0; } + +.icon.modified { opacity: .5; } + /* Out link is special */ .icon.out-link { height: 14px; width: 14px; background-position: -500px 0;} @@ -1959,6 +1945,10 @@ a:hover .icon.out-link { background-position: -500px -14px;} top: 60px; } +.selection-list-pane .inspector-body { + top: 60px; +} + .inspector-inner { padding: 20px; position: relative; @@ -2104,6 +2094,15 @@ a:hover .icon.out-link { background-position: -500px -14px;} height: 100%; border: 1px solid #CCC; border-radius: 0 3px 3px 0; + position: absolute; + top: 0; + right: 0; + width: 10%; + background: #fafafa; +} + +.preset-list-item button.tag-reference-button .icon { + opacity: .5; } .current .preset-list-button, @@ -2232,26 +2231,39 @@ a:hover .icon.out-link { background-position: -500px -14px;} background: #f6f6f6; display: block; border-radius: 4px 4px 0 0; + overflow: hidden; } -.form-label button { - border-left: 1px solid #CCC; +.form-label-button-wrap { + position: absolute; + top: 0; + right: 0; + height: 100%; + width: 100%; + background: transparent; + text-align: right; } -.form-label .modified-icon { - border-right: 0; - opacity: 0; - z-index: -10; - right: 10%; +.form-label-button-wrap .icon { + opacity: .5; } -.modified .form-label .modified-icon { - opacity: 1; - z-index: 1; +.form-label button { + border-left: 1px solid #CCC; + width: 10%; + height: 100%; + border-radius: 0; + background: #fafafa; } -.form-label button.tag-reference-button { - border-top-right-radius: 3px; +.form-label .modified-icon, +.form-field .remove-icon { + display: none; +} + +.modified .form-label .modified-icon, +.present .form-label .remove-icon { + display: inline-block; } .form-field > input, @@ -2261,17 +2273,12 @@ a:hover .icon.out-link { background-position: -500px -14px;} min-height: 30px; border-top: 0; border-radius: 0 0 4px 4px; - overflow: hidden; } .form-field textarea { height: 65px; } -.form-field button.remove { - border-radius: 0 0 4px 0; -} - .inspector-border { border-bottom: 1px solid #CCC } @@ -2294,7 +2301,7 @@ a:hover .icon.out-link { background-position: -500px -14px;} .inspector-hidden, .inspector-hover label input[type="checkbox"], .inspector-hover label input[type="radio"], -.inspector-hover .toggle-list label:not(.active), +.inspector-hover .toggle-list label, .inspector-hover .toggle-list label span, .inspector-hover .inspector-inner .add-tag, .inspector-hover .inspector-inner .add-relation, @@ -2309,13 +2316,14 @@ a:hover .icon.out-link { background-position: -500px -14px;} } /* hide but preserve in layout */ -.inspector-hover .modified .form-label .modified-icon, .inspector-hover .entity-editor-pane button.minor, -.inspector-hover .combobox-carat, +.inspector-hover .combobox-caret, .inspector-hover .entity-editor-pane .header button, .inspector-hover .spin-control, .inspector-hover .hide-toggle:before, .inspector-hover .more-buttons, +.inspector-hover .form-label-button-wrap, +.inspector-hover .tag-reference-button, .inspector-hover .view-on-osm { opacity: 0; } @@ -2403,9 +2411,8 @@ input, transition: opacity 200ms 200ms, width 200ms 200ms, margin-right 200ms 200ms; } -.modified .form-label .modified-icon, .entity-editor-pane button.minor, -.combobox-carat, +.combobox-caret, .entity-editor-pane .header button, .toggle-list label span, .spin-control, @@ -2634,7 +2641,7 @@ input[type=number] { padding-right: 10%; } -.form-field .wiki-title ~ .combobox-carat { +.form-field .wiki-title ~ .combobox-caret { margin-left: -18%; margin-right: 9%; } @@ -2708,11 +2715,14 @@ input[type=number] { } .form-field .localized-wrap .entry .localized-value { - padding-right: 10%; border-top-width: 0; border-radius: 0 0 4px 4px; } +.form-field .localized-wrap .form-label button { + border-top-right-radius: 3px; +} + /* Preset form address */ .form-field .addr-housename { @@ -2782,10 +2792,21 @@ div.combobox { border-top: 0; } -.combobox-carat { - margin-left: -20px; - margin-right: 10px; - display:inline-block; +.combobox-caret { + display: inline-block; + position: relative; + height: 30px; + width: 30px; + margin-left: -30px; + vertical-align: top; +} + +.combobox-caret::after { + content:""; + height: 0; width: 0; + position: absolute; + left: 0; right: 0; bottom: 0; top: 0; + margin: auto; border-top: 5px solid #ccc; border-left: 5px solid transparent; border-right: 5px solid transparent; @@ -2871,6 +2892,10 @@ div.combobox { .tag-row .tag-reference-button { right: 0; + border-radius: 0; + width: 10%; + top: 0; + background: #fafafa; } /* Adding form fields to tag editor */ @@ -2978,6 +3003,10 @@ img.wiki-image { padding-left: 10px; } +.member-incomplete .member-delete { + display: none; +} + .member-row-new .member-entity-input { border-radius: 4px 4px 0 0; border: 1px solid #cfcfcf; @@ -3015,21 +3044,11 @@ img.wiki-image { background: rgba(0, 0, 0, .8); } +.map-control > button.active, .map-control > button.active:hover { background: #7092ff; } -.map-overlay { - z-index: -1; - right: 75%; - max-width: 260px; - min-width: 210px; - position: fixed; - left: 30px; - display: block; - padding: 10px 10px 0 10px; -} - /* Zoomer */ .zoombuttons button.zoom-in { @@ -3038,32 +3057,16 @@ img.wiki-image { /* Background Settings */ - -.toggle-list.layer-list { - margin-bottom: 10px; -} - .background-control button { border-radius: 4px 0 0 0; } - -.background-control button.active { - border-radius: 0; -} - .background-control { position: relative; } -.background-control .map-overlay { - position: absolute; - top: 0; -} - .nudge-container { - border-top: 1px solid #CCC; - margin: 0 -10px; + border: 1px solid #CCC; } .background-control .adjustments button:last-child { @@ -3074,6 +3077,56 @@ img.wiki-image { padding-bottom: 10px; } +.layer-list { + margin-bottom: 10px; + border: 1px solid #CCC; + border-radius: 4px; +} + +.layer-list li { + position: relative; + height: 30px; + background-color: white; + color: #7092FF; +} + +.layer-list > li:first-child { + border-radius: 3px 3px 0 0; +} + +.layer-list > li:last-child { + border-radius: 0 0 3px 3px; +} + +.layer-list > li:only-child { + border-radius: 3px; +} + +.layer-list li:not(:last-child) { + border-bottom: 1px solid #ccc; +} + +.layer-list li:hover { + background-color: #ececec; +} + +.layer-list li.active { + background: #E8EBFF; +} + +.layer-list label { + display: block; + padding: 5px 10px; + cursor: pointer; +} + +.layer-list label > span { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + .hide-toggle { display: block; padding-left:12px; @@ -3104,7 +3157,6 @@ img.wiki-image { float: left; display: block; width:20%; - border-radius: 0; border-right: 1px solid #CCC; position: relative; } @@ -3146,10 +3198,10 @@ img.wiki-image { .opacity-options { background: url(<%= asset_path("iD/img/background-pattern-opacity.png") %>) 0 0 repeat; height:20px; - width:62px; + width:82px; position: absolute; - right: 10px; - top: 10px; + right: 50px; + top: 20px; border: 1px solid #ccc; } @@ -3185,13 +3237,20 @@ img.wiki-image { height:18px; } -.background-control .layer-toggle-gpx .layer-extent { +.background-control .layer-toggle-gpx button { + float: right; + height: 100%; + width: 10%; border-left: 1px solid #CCC; - border-radius: 0 4px 4px 0; + border-radius: 0; } -.background-control .layer-toggle-gpx.selected .layer-extent { - display:inline-block; +.background-control .layer-toggle-gpx button .icon { + opacity: 0.5; +} + +.background-control .layer-toggle-gpx button.layer-extent { + border-radius: 0 3px 3px 0; } /* Geolocator */ @@ -3204,19 +3263,22 @@ img.wiki-image { border-radius: 0 0 0 4px; } -/* Help */ - -.help-control button { - border-radius: 0 0 0 4px; -} - -.help-wrap { +.map-overlay.content { position: fixed; top:60px; bottom: 30px; padding: 20px 50px 20px 20px; right: 0; - overflow-y: scroll; + overflow: auto; +} + +.background-control .map-overlay { + z-index: -1; +} +/* Help */ + +.help-control button { + border-radius: 0 0 0 4px; } .help-wrap p { @@ -3361,12 +3423,24 @@ img.wiki-image { } /* Attribution overlay */ -.attribution { +.base-layer-attribution, +.overlay-layer-attribution { position: absolute; bottom: 35px; - left:10px; - color:#888; - font-size:10px; + color: #888; + font-size: 10px; +} + +.base-layer-attribution { + left: 10px; +} + +.overlay-layer-attribution { + right: 10px; +} + +.overlay-layer-attribution .attribution:not(:last-child):after { + content: '; '; } .source-image { @@ -3558,6 +3632,8 @@ img.wiki-image { float: none; margin: auto; display: block; + color: white; + font-size: 14px; } .mode-save .user-info img { @@ -3578,12 +3654,15 @@ img.wiki-image { color:#fff; } +.mode-save .commit-info { + margin-bottom: 10px; +} + .mode-save .changeset-list { overflow: auto; border:1px solid #ccc; border-radius: 4px; background:#fff; - max-height: 160px; } .mode-save .warning-section .changeset-list button { @@ -3594,6 +3673,15 @@ img.wiki-image { position: relative; border-top:1px solid #ccc; padding:5px 10px; + cursor: pointer; +} + +.mode-save .changeset-list li:hover { + background-color: #ececec; +} + +.mode-save .changeset-list .alert { + opacity: 0.5; } .changeset-list li span.count { @@ -3601,6 +3689,10 @@ img.wiki-image { color:#555; } +.mode-save .commit-section .changeset-list button { + border-left: 1px solid #CCC; +} + .changeset-list li span.count:before { content: '('; } .changeset-list li span.count:after { content: ')'; } @@ -3810,23 +3902,28 @@ img.wiki-image { /* Exceptions for tooltip layouts */ -/* make tooltips in editor pane dark */ +/* make tooltips in panels dark */ +.map-overlay .tooltip.top .tooltip-arrow, .entity-editor-pane .tooltip.top .tooltip-arrow { border-top-color: #000; } +.map-overlay .tooltip.bottom .tooltip-arrow, .entity-editor-pane .tooltip.bottom .tooltip-arrow { border-bottom-color: #000; } +.map-overlay .tooltip.left .tooltip-arrow, .entity-editor-pane .tooltip.left .tooltip-arrow { border-left-color: #000; } +.map-overlay .tooltip.right .tooltip-arrow, .entity-editor-pane .tooltip.right .tooltip-arrow { border-right-color: #000; } +.map-overlay .tooltip-inner, .entity-editor-pane .tooltip-inner { background: #000; color: #ccc; @@ -3838,7 +3935,7 @@ img.wiki-image { } /* Move over tooltips that are near the edge of screen */ .add-point .tooltip { - left: 33.3333% !important; + left: 33.3333% !important; } .curtain-tooltip.intro-points-add .tooltip-arrow, @@ -4028,99 +4125,116 @@ img.wiki-image { .preset-icon{background-image:url(<%= asset_path("iD/img/maki-sprite.png") %>);background-repeat:no-repeat;width:24px;height:24px;} .preset-icon-line{background-image:url(<%= asset_path("iD/img/line-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;} .preset-icon-relation{background-image:url(<%= asset_path("iD/img/relation-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;} -.feature-airfield{background-position:-0px -34px;} -.feature-airport{background-position:-0px -94px;} -.feature-alcohol-shop{background-position:-0px -154px;} -.feature-america-football{background-position:-0px -214px;} -.feature-art-gallery{background-position:-0px -274px;} -.feature-bank{background-position:-0px -334px;} -.feature-bar{background-position:-0px -394px;} -.feature-baseball{background-position:-0px -454px;} -.feature-basketball{background-position:-0px -514px;} -.feature-beer{background-position:-0px -574px;} -.feature-bicycle{background-position:-0px -634px;} -.feature-building{background-position:-0px -694px;} -.feature-bus{background-position:-0px -754px;} -.feature-cafe{background-position:-0px -814px;} -.feature-campsite{background-position:-0px -874px;} -.feature-cemetery{background-position:-0px -934px;} -.feature-cinema{background-position:-0px -994px;} -.feature-circle{background-position:-0px -1054px;} -.feature-circle-stroked{background-position:-0px -1114px;} -.feature-city{background-position:-0px -1174px;} -.feature-college{background-position:-0px -1234px;} -.feature-commercial{background-position:-0px -1294px;} -.feature-cricket{background-position:-0px -1354px;} -.feature-cross{background-position:-0px -1414px;} -.feature-dam{background-position:-0px -1474px;} -.feature-danger{background-position:-0px -1534px;} -.feature-disability{background-position:-0px -1594px;} -.feature-embassy{background-position:-0px -1654px;} -.feature-emergency-telephone{background-position:-0px -1714px;} -.feature-farm{background-position:-0px -1774px;} -.feature-fast-food{background-position:-0px -1834px;} -.feature-ferry{background-position:-0px -1894px;} -.feature-fire-station{background-position:-0px -1954px;} -.feature-fuel{background-position:-0px -2014px;} -.feature-garden{background-position:-0px -2074px;} -.feature-golf{background-position:-0px -2134px;} -.feature-grocery{background-position:-0px -2194px;} -.feature-harbor{background-position:-0px -2254px;} -.feature-heliport{background-position:-0px -2314px;} -.feature-hospital{background-position:-0px -2374px;} -.feature-industrial{background-position:-0px -2434px;} -.feature-land-use{background-position:-0px -2494px;} -.feature-library{background-position:-0px -2554px;} -.feature-lodging{background-position:-0px -2614px;} -.feature-logging{background-position:-0px -2674px;} -.feature-marker{background-position:-0px -2734px;} -.feature-marker-stroked{background-position:-0px -2794px;} -.feature-monument{background-position:-0px -2854px;} -.feature-museum{background-position:-0px -2914px;} -.feature-music{background-position:-0px -2974px;} -.feature-oil-well{background-position:-0px -3034px;} -.feature-park{background-position:-0px -3094px;} -.feature-park2{background-position:-0px -3154px;} -.feature-parking{background-position:-0px -3214px;} -.feature-parking-garage{background-position:-0px -3274px;} -.feature-pharmacy{background-position:-0px -3334px;} -.feature-pitch{background-position:-0px -3394px;} -.feature-place-of-worship{background-position:-0px -3454px;} -.feature-police{background-position:-0px -3514px;} -.feature-post{background-position:-0px -3574px;} -.feature-prison{background-position:-0px -3634px;} -.feature-rail{background-position:-0px -3694px;} -.feature-rail-above{background-position:-0px -3754px;} -.feature-rail-underground{background-position:-0px -3814px;} -.feature-religious-christian{background-position:-0px -3874px;} -.feature-religious-jewish{background-position:-0px -3934px;} -.feature-religious-muslim{background-position:-0px -3994px;} -.feature-restaurant{background-position:-0px -4054px;} -.feature-roadblock{background-position:-0px -4114px;} -.feature-school{background-position:-0px -4174px;} -.feature-shop{background-position:-0px -4234px;} -.feature-skiing{background-position:-0px -4294px;} -.feature-slaughterhouse{background-position:-0px -4354px;} -.feature-soccer{background-position:-0px -4414px;} -.feature-square{background-position:-0px -4474px;} -.feature-square-stroked{background-position:-0px -4534px;} -.feature-star{background-position:-0px -4594px;} -.feature-star-stroked{background-position:-0px -4654px;} -.feature-swimming{background-position:-0px -4714px;} -.feature-telephone{background-position:-0px -4774px;} -.feature-tennis{background-position:-0px -4834px;} -.feature-theatre{background-position:-0px -4894px;} -.feature-toilets{background-position:-0px -4954px;} -.feature-town{background-position:-0px -5014px;} -.feature-town-hall{background-position:-0px -5074px;} -.feature-triangle{background-position:-0px -5134px;} -.feature-triangle-stroked{background-position:-0px -5194px;} -.feature-village{background-position:-0px -5254px;} -.feature-warehouse{background-position:-0px -5314px;} -.feature-waste-basket{background-position:-0px -5374px;} -.feature-water{background-position:-0px -5434px;} -.feature-wetland{background-position:-0px -5494px;} -.feature-zoo{background-position:-0px -5554px;} +.feature-circle-stroked{background-position:-0px -0px;} +.feature-circle{background-position:-54px -0px;} +.feature-square-stroked{background-position:-108px -0px;} +.feature-square{background-position:-162px -0px;} +.feature-triangle-stroked{background-position:-216px -0px;} +.feature-triangle{background-position:-0px -24px;} +.feature-star-stroked{background-position:-54px -24px;} +.feature-star{background-position:-108px -24px;} +.feature-cross{background-position:-162px -24px;} +.feature-marker-stroked{background-position:-216px -24px;} +.feature-marker{background-position:-0px -48px;} +.feature-religious-jewish{background-position:-54px -48px;} +.feature-religious-christian{background-position:-108px -48px;} +.feature-religious-muslim{background-position:-162px -48px;} +.feature-cemetery{background-position:-216px -48px;} +.feature-rocket{background-position:-0px -72px;} +.feature-airport{background-position:-54px -72px;} +.feature-heliport{background-position:-108px -72px;} +.feature-rail{background-position:-162px -72px;} +.feature-rail-metro{background-position:-216px -72px;} +.feature-rail-light{background-position:-0px -96px;} +.feature-bus{background-position:-54px -96px;} +.feature-fuel{background-position:-108px -96px;} +.feature-parking{background-position:-162px -96px;} +.feature-parking-garage{background-position:-216px -96px;} +.feature-airfield{background-position:-0px -120px;} +.feature-roadblock{background-position:-54px -120px;} +.feature-ferry{background-position:-108px -120px;} +.feature-harbor{background-position:-162px -120px;} +.feature-bicycle{background-position:-216px -120px;} +.feature-park{background-position:-0px -144px;} +.feature-park2{background-position:-54px -144px;} +.feature-museum{background-position:-108px -144px;} +.feature-lodging{background-position:-162px -144px;} +.feature-monument{background-position:-216px -144px;} +.feature-zoo{background-position:-0px -168px;} +.feature-garden{background-position:-54px -168px;} +.feature-campsite{background-position:-108px -168px;} +.feature-theatre{background-position:-162px -168px;} +.feature-art-gallery{background-position:-216px -168px;} +.feature-pitch{background-position:-0px -192px;} +.feature-soccer{background-position:-54px -192px;} +.feature-america-football{background-position:-108px -192px;} +.feature-tennis{background-position:-162px -192px;} +.feature-basketball{background-position:-216px -192px;} +.feature-baseball{background-position:-0px -216px;} +.feature-golf{background-position:-54px -216px;} +.feature-swimming{background-position:-108px -216px;} +.feature-cricket{background-position:-162px -216px;} +.feature-skiing{background-position:-216px -216px;} +.feature-school{background-position:-0px -240px;} +.feature-college{background-position:-54px -240px;} +.feature-library{background-position:-108px -240px;} +.feature-post{background-position:-162px -240px;} +.feature-fire-station{background-position:-216px -240px;} +.feature-town-hall{background-position:-0px -264px;} +.feature-police{background-position:-54px -264px;} +.feature-prison{background-position:-108px -264px;} +.feature-embassy{background-position:-162px -264px;} +.feature-beer{background-position:-216px -264px;} +.feature-restaurant{background-position:-0px -288px;} +.feature-cafe{background-position:-54px -288px;} +.feature-shop{background-position:-108px -288px;} +.feature-fast-food{background-position:-162px -288px;} +.feature-bar{background-position:-216px -288px;} +.feature-bank{background-position:-0px -312px;} +.feature-grocery{background-position:-54px -312px;} +.feature-cinema{background-position:-108px -312px;} +.feature-pharmacy{background-position:-162px -312px;} +.feature-hospital{background-position:-216px -312px;} +.feature-danger{background-position:-0px -336px;} +.feature-industrial{background-position:-54px -336px;} +.feature-warehouse{background-position:-108px -336px;} +.feature-commercial{background-position:-162px -336px;} +.feature-building{background-position:-216px -336px;} +.feature-place-of-worship{background-position:-0px -360px;} +.feature-alcohol-shop{background-position:-54px -360px;} +.feature-logging{background-position:-108px -360px;} +.feature-oil-well{background-position:-162px -360px;} +.feature-slaughterhouse{background-position:-216px -360px;} +.feature-dam{background-position:-0px -384px;} +.feature-water{background-position:-54px -384px;} +.feature-wetland{background-position:-108px -384px;} +.feature-disability{background-position:-162px -384px;} +.feature-telephone{background-position:-216px -384px;} +.feature-emergency-telephone{background-position:-0px -408px;} +.feature-toilets{background-position:-54px -408px;} +.feature-waste-basket{background-position:-108px -408px;} +.feature-music{background-position:-162px -408px;} +.feature-land-use{background-position:-216px -408px;} +.feature-city{background-position:-0px -432px;} +.feature-town{background-position:-54px -432px;} +.feature-village{background-position:-108px -432px;} +.feature-farm{background-position:-162px -432px;} +.feature-bakery{background-position:-216px -432px;} +.feature-dog-park{background-position:-0px -456px;} +.feature-lighthouse{background-position:-54px -456px;} +.feature-clothing-store{background-position:-108px -456px;} +.feature-polling-place{background-position:-162px -456px;} +.feature-playground{background-position:-216px -456px;} +.feature-entrance{background-position:-0px -480px;} +.feature-heart{background-position:-54px -480px;} +.feature-london-underground{background-position:-108px -480px;} +.feature-minefield{background-position:-162px -480px;} +.feature-rail-underground{background-position:-216px -480px;} +.feature-rail-above{background-position:-0px -504px;} +.feature-camera{background-position:-54px -504px;} +.feature-laundry{background-position:-108px -504px;} +.feature-car{background-position:-162px -504px;} +.feature-suitcase{background-position:-216px -504px;} .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;} .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;} .preset-icon-line.feature-highway-primary{background-position:-140px -25px;} diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js index 6c0845b7c..a19dc713e 100644 --- a/vendor/assets/iD/iD.js +++ b/vendor/assets/iD/iD.js @@ -175,7 +175,7 @@ })(this); d3 = (function(){ - var d3 = {version: "3.2.7"}; // semver + var d3 = {version: "3.3.8"}; // semver d3.ascending = function(a, b) { return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN; }; @@ -313,12 +313,15 @@ d3.shuffle = function(array) { return array; }; d3.permute = function(array, indexes) { - var permutes = [], - i = -1, - n = indexes.length; - while (++i < n) permutes[i] = array[indexes[i]]; + var i = indexes.length, permutes = new Array(i); + while (i--) permutes[i] = array[indexes[i]]; return permutes; }; +d3.pairs = function(array) { + var i = 0, n = array.length - 1, p0, p1 = array[0], pairs = new Array(n < 0 ? 0 : n); + while (i < n) pairs[i] = [p0 = p1, p1 = array[++i]]; + return pairs; +}; d3.zip = function() { if (!(n = arguments.length)) return []; @@ -353,8 +356,28 @@ d3.entries = function(map) { return entries; }; d3.merge = function(arrays) { - return Array.prototype.concat.apply([], arrays); + var n = arrays.length, + m, + i = -1, + j = 0, + merged, + array; + + while (++i < n) j += arrays[i].length; + merged = new Array(j); + + while (--n >= 0) { + array = arrays[n]; + m = array.length; + while (--m >= 0) { + merged[--j] = array[m]; + } + } + + return merged; }; +var abs = Math.abs; + d3.range = function(start, stop, step) { if (arguments.length < 3) { step = 1; @@ -365,7 +388,7 @@ d3.range = function(start, stop, step) { } if ((stop - start) / step === Infinity) throw new Error("infinite range"); var range = [], - k = d3_range_integerScale(Math.abs(step)), + k = d3_range_integerScale(abs(step)), i = -1, j; start *= k, stop *= k, step *= k; @@ -394,7 +417,8 @@ function d3_class(ctor, properties) { d3.map = function(object) { var map = new d3_Map; - for (var key in object) map.set(key, object[key]); + if (object instanceof d3_Map) object.forEach(function(key, value) { map.set(key, value); }); + else for (var key in object) map.set(key, object[key]); return map; }; @@ -538,8 +562,8 @@ d3.nest = function() { }; d3.set = function(array) { - var set = new d3_Set(); - if (array) for (var i = 0; i < array.length; i++) set.add(array[i]); + var set = new d3_Set; + if (array) for (var i = 0, n = array.length; i < n; ++i) set.add(array[i]); return set; }; @@ -573,9 +597,23 @@ d3_class(d3_Set, { } }); d3.behavior = {}; +var d3_arraySlice = [].slice, + d3_array = function(list) { return d3_arraySlice.call(list); }; // conversion for NodeLists + var d3_document = document, d3_documentElement = d3_document.documentElement, d3_window = window; + +// Redefine d3_array if the browser doesn’t support slice-based conversion. +try { + d3_array(d3_documentElement.childNodes)[0].nodeType; +} catch(e) { + d3_array = function(list) { + var i = list.length, array = new Array(i); + while (i--) array[i] = list[i]; + return array; + }; +} // Copies a variable number of methods from source to target. d3.rebind = function(target, source) { var i = 1, n = arguments.length, method; @@ -603,24 +641,6 @@ function d3_vendorSymbol(object, name) { } var d3_vendorPrefixes = ["webkit", "ms", "moz", "Moz", "o", "O"]; - -var d3_array = d3_arraySlice; // conversion for NodeLists - -function d3_arrayCopy(pseudoarray) { - var i = -1, n = pseudoarray.length, array = []; - while (++i < n) array.push(pseudoarray[i]); - return array; -} - -function d3_arraySlice(pseudoarray) { - return Array.prototype.slice.call(pseudoarray); -} - -try { - d3_array(d3_documentElement.childNodes)[0].nodeType; -} catch(e) { - d3_array = d3_arrayCopy; -} function d3_noop() {} d3.dispatch = function() { @@ -1118,15 +1138,15 @@ d3_selectionPrototype.append = function(name) { function d3_selection_creator(name) { return typeof name === "function" ? name - : (name = d3.ns.qualify(name)).local ? function() { return d3_document.createElementNS(name.space, name.local); } - : function() { return d3_document.createElementNS(this.namespaceURI, name); }; + : (name = d3.ns.qualify(name)).local ? function() { return this.ownerDocument.createElementNS(name.space, name.local); } + : function() { return this.ownerDocument.createElementNS(this.namespaceURI, name); }; } d3_selectionPrototype.insert = function(name, before) { name = d3_selection_creator(name); before = d3_selection_selector(before); return this.select(function() { - return this.insertBefore(name.apply(this, arguments), before.apply(this, arguments)); + return this.insertBefore(name.apply(this, arguments), before.apply(this, arguments) || null); }); }; @@ -1310,7 +1330,7 @@ d3_selectionPrototype.sort = function(comparator) { function d3_selection_sortComparator(comparator) { if (!arguments.length) comparator = d3.ascending; return function(a, b) { - return (!a - !b) || comparator(a.__data__, b.__data__); + return a && b ? comparator(a.__data__, b.__data__) : !a - !b; }; } @@ -1415,6 +1435,8 @@ function d3_selection_enterInsertBefore(enter) { }; } +// import "../transition/transition"; + d3_selectionPrototype.transition = function() { var id = d3_transitionInheritId || ++d3_transitionId, subgroups = [], @@ -1432,6 +1454,16 @@ d3_selectionPrototype.transition = function() { return d3_transition(subgroups, id); }; +// import "../transition/transition"; + +d3_selectionPrototype.interrupt = function() { + return this.each(d3_selection_interrupt); +}; + +function d3_selection_interrupt() { + var lock = this.__transition__; + if (lock) ++lock.active; +} // TODO fast singleton implementation? d3.select = function(node) { @@ -1578,6 +1610,7 @@ d3.mouse = function(container) { var d3_mouse_bug44083 = /WebKit/.test(d3_window.navigator.userAgent) ? -1 : 0; function d3_mousePoint(container, e) { + if (e.changedTouches) e = e.changedTouches[0]; var svg = container.ownerSVGElement || container; if (svg.createSVGPoint) { var point = svg.createSVGPoint(); @@ -1594,13 +1627,8 @@ function d3_mousePoint(container, e) { d3_mouse_bug44083 = !(ctm.f || ctm.e); svg.remove(); } - if (d3_mouse_bug44083) { - point.x = e.pageX; - point.y = e.pageY; - } else { - point.x = e.clientX; - point.y = e.clientY; - } + if (d3_mouse_bug44083) point.x = e.pageX, point.y = e.pageY; + else point.x = e.clientX, point.y = e.clientY; point = point.matrixTransform(container.getScreenCTM().inverse()); return [point.x, point.y]; } @@ -1616,47 +1644,180 @@ d3.touches = function(container, touches) { return point; }) : []; }; +var π = Math.PI, + τ = 2 * π, + halfπ = π / 2, + ε = 1e-6, + ε2 = ε * ε, + d3_radians = π / 180, + d3_degrees = 180 / π; + +function d3_sgn(x) { + return x > 0 ? 1 : x < 0 ? -1 : 0; +} + +function d3_acos(x) { + return x > 1 ? 0 : x < -1 ? π : Math.acos(x); +} + +function d3_asin(x) { + return x > 1 ? halfπ : x < -1 ? -halfπ : Math.asin(x); +} + +function d3_sinh(x) { + return ((x = Math.exp(x)) - 1 / x) / 2; +} + +function d3_cosh(x) { + return ((x = Math.exp(x)) + 1 / x) / 2; +} + +function d3_tanh(x) { + return ((x = Math.exp(2 * x)) - 1) / (x + 1); +} + +function d3_haversin(x) { + return (x = Math.sin(x / 2)) * x; +} + +var ρ = Math.SQRT2, + ρ2 = 2, + ρ4 = 4; + +// p0 = [ux0, uy0, w0] +// p1 = [ux1, uy1, w1] +d3.interpolateZoom = function(p0, p1) { + var ux0 = p0[0], uy0 = p0[1], w0 = p0[2], + ux1 = p1[0], uy1 = p1[1], w1 = p1[2]; + + var dx = ux1 - ux0, + dy = uy1 - uy0, + d2 = dx * dx + dy * dy, + d1 = Math.sqrt(d2), + b0 = (w1 * w1 - w0 * w0 + ρ4 * d2) / (2 * w0 * ρ2 * d1), + b1 = (w1 * w1 - w0 * w0 - ρ4 * d2) / (2 * w1 * ρ2 * d1), + r0 = Math.log(Math.sqrt(b0 * b0 + 1) - b0), + r1 = Math.log(Math.sqrt(b1 * b1 + 1) - b1), + dr = r1 - r0, + S = (dr || Math.log(w1 / w0)) / ρ; + + function interpolate(t) { + var s = t * S; + if (dr) { + // General case. + var coshr0 = d3_cosh(r0), + u = w0 / (ρ2 * d1) * (coshr0 * d3_tanh(ρ * s + r0) - d3_sinh(r0)); + return [ + ux0 + u * dx, + uy0 + u * dy, + w0 * coshr0 / d3_cosh(ρ * s + r0) + ]; + } + // Special case for u0 ~= u1. + return [ + ux0 + t * dx, + uy0 + t * dy, + w0 * Math.exp(ρ * s) + ]; + } + + interpolate.duration = S * 1000; + + return interpolate; +}; d3.behavior.zoom = function() { - var translate = [0, 0], + var view = {x: 0, y: 0, k: 1}, translate0, // translate when we started zooming (to avoid drift) - scale = 1, + center, // desired position of translate0 after zooming + size = [960, 500], // viewport size; required for zoom interpolation scaleExtent = d3_behavior_zoomInfinity, mousedown = "mousedown.zoom", mousemove = "mousemove.zoom", mouseup = "mouseup.zoom", - event = d3_eventDispatch(zoom, "zoom"), + mousewheelTimer, + touchstart = "touchstart.zoom", + touchtime, // time of last touchstart (to detect double-tap) + event = d3_eventDispatch(zoom, "zoomstart", "zoom", "zoomend"), x0, x1, y0, - y1, - touchtime; // time of last touchstart (to detect double-tap) + y1; - function zoom() { - this.on(mousedown, mousedowned) + function zoom(g) { + g .on(mousedown, mousedowned) .on(d3_behavior_zoomWheel + ".zoom", mousewheeled) .on(mousemove, mousewheelreset) .on("dblclick.zoom", dblclicked) - .on("touchstart.zoom", touchstarted); + .on(touchstart, touchstarted); } - zoom.translate = function(x) { - if (!arguments.length) return translate; - translate = x.map(Number); + zoom.event = function(g) { + g.each(function() { + var event_ = event.of(this, arguments), + view1 = view; + if (d3_transitionInheritId) { + d3.select(this).transition() + .each("start.zoom", function() { + view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state + zoomstarted(event_); + }) + .tween("zoom:zoom", function() { + var dx = size[0], + dy = size[1], + cx = dx / 2, + cy = dy / 2, + i = d3.interpolateZoom( + [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k], + [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k] + ); + return function(t) { + var l = i(t), k = dx / l[2]; + this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k}; + zoomed(event_); + }; + }) + .each("end.zoom", function() { + zoomended(event_); + }); + } else { + this.__chart__ = view; + zoomstarted(event_); + zoomed(event_); + zoomended(event_); + } + }); + } + + zoom.translate = function(_) { + if (!arguments.length) return [view.x, view.y]; + view = {x: +_[0], y: +_[1], k: view.k}; // copy-on-write rescale(); return zoom; }; - zoom.scale = function(x) { - if (!arguments.length) return scale; - scale = +x; + zoom.scale = function(_) { + if (!arguments.length) return view.k; + view = {x: view.x, y: view.y, k: +_}; // copy-on-write rescale(); return zoom; }; - zoom.scaleExtent = function(x) { + zoom.scaleExtent = function(_) { if (!arguments.length) return scaleExtent; - scaleExtent = x == null ? d3_behavior_zoomInfinity : x.map(Number); + scaleExtent = _ == null ? d3_behavior_zoomInfinity : [+_[0], +_[1]]; + return zoom; + }; + + zoom.center = function(_) { + if (!arguments.length) return center; + center = _ && [+_[0], +_[1]]; + return zoom; + }; + + zoom.size = function(_) { + if (!arguments.length) return size; + size = _ && [+_[0], +_[1]]; return zoom; }; @@ -1664,8 +1825,7 @@ d3.behavior.zoom = function() { if (!arguments.length) return x1; x1 = z; x0 = z.copy(); - translate = [0, 0]; - scale = 1; + view = {x: 0, y: 0, k: 1}; // copy-on-write return zoom; }; @@ -1673,37 +1833,44 @@ d3.behavior.zoom = function() { if (!arguments.length) return y1; y1 = z; y0 = z.copy(); - translate = [0, 0]; - scale = 1; + view = {x: 0, y: 0, k: 1}; // copy-on-write return zoom; }; function location(p) { - return [(p[0] - translate[0]) / scale, (p[1] - translate[1]) / scale]; + return [(p[0] - view.x) / view.k, (p[1] - view.y) / view.k]; } function point(l) { - return [l[0] * scale + translate[0], l[1] * scale + translate[1]]; + return [l[0] * view.k + view.x, l[1] * view.k + view.y]; } function scaleTo(s) { - scale = Math.max(scaleExtent[0], Math.min(scaleExtent[1], s)); + view.k = Math.max(scaleExtent[0], Math.min(scaleExtent[1], s)); } function translateTo(p, l) { l = point(l); - translate[0] += p[0] - l[0]; - translate[1] += p[1] - l[1]; + view.x += p[0] - l[0]; + view.y += p[1] - l[1]; } function rescale() { - if (x1) x1.domain(x0.range().map(function(x) { return (x - translate[0]) / scale; }).map(x0.invert)); - if (y1) y1.domain(y0.range().map(function(y) { return (y - translate[1]) / scale; }).map(y0.invert)); + if (x1) x1.domain(x0.range().map(function(x) { return (x - view.x) / view.k; }).map(x0.invert)); + if (y1) y1.domain(y0.range().map(function(y) { return (y - view.y) / view.k; }).map(y0.invert)); + } + + function zoomstarted(event) { + event({type: "zoomstart"}); } - function dispatch(event) { + function zoomed(event) { rescale(); - event({type: "zoom", scale: scale, translate: translate}); + event({type: "zoom", scale: view.k, translate: [view.x, view.y]}); + } + + function zoomended(event) { + event({type: "zoomend"}); } function mousedowned() { @@ -1715,62 +1882,92 @@ d3.behavior.zoom = function() { l = location(d3.mouse(target)), dragRestore = d3_event_dragSuppress(); + d3_selection_interrupt.call(target); + zoomstarted(event_); + function moved() { dragged = 1; translateTo(d3.mouse(target), l); - dispatch(event_); + zoomed(event_); } function ended() { w.on(mousemove, d3_window === target ? mousewheelreset : null).on(mouseup, null); dragRestore(dragged && d3.event.target === eventTarget); + zoomended(event_); } } + // These closures persist for as long as at least one touch is active. function touchstarted() { var target = this, event_ = event.of(target, arguments), - touches = d3.touches(target), - locations = {}, + locations0 = {}, // touchstart locations distance0 = 0, // distance² between initial touches - scale0 = scale, // scale when we started touching - now = Date.now(), - name = "zoom-" + d3.event.changedTouches[0].identifier, - touchmove = "touchmove." + name, - touchend = "touchend." + name, + scale0, // scale when we started touching + eventId = d3.event.changedTouches[0].identifier, + touchmove = "touchmove.zoom-" + eventId, + touchend = "touchend.zoom-" + eventId, w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended), - t = d3.select(target).on(mousedown, null), // prevent duplicate events + t = d3.select(target).on(mousedown, null).on(touchstart, started), // prevent duplicate events dragRestore = d3_event_dragSuppress(); - touches.forEach(function(t) { locations[t.identifier] = location(t); }); + d3_selection_interrupt.call(target); + started(); + zoomstarted(event_); + + // Updates locations of any touches in locations0. + function relocate() { + var touches = d3.touches(target); + scale0 = view.k; + touches.forEach(function(t) { + if (t.identifier in locations0) locations0[t.identifier] = location(t); + }); + return touches; + } - if (touches.length === 1) { - if (now - touchtime < 500) { // dbltap - var p = touches[0], l = location(touches[0]); - scaleTo(scale * 2); - translateTo(p, l); - d3_eventPreventDefault(); - dispatch(event_); + // Temporarily override touchstart while gesture is active. + function started() { + // Only track touches started on the target element. + var changed = d3.event.changedTouches; + for (var i = 0, n = changed.length; i < n; ++i) { + locations0[changed[i].identifier] = null; + } + + var touches = relocate(), + now = Date.now(); + + if (touches.length === 1) { + if (now - touchtime < 500) { // dbltap + var p = touches[0], l = locations0[p.identifier]; + scaleTo(view.k * 2); + translateTo(p, l); + d3_eventPreventDefault(); + zoomed(event_); + } + touchtime = now; + } else if (touches.length > 1) { + var p = touches[0], q = touches[1], + dx = p[0] - q[0], dy = p[1] - q[1]; + distance0 = dx * dx + dy * dy; } - touchtime = now; - } else if (touches.length > 1) { - var p = touches[0], q = touches[1], - dx = p[0] - q[0], dy = p[1] - q[1]; - distance0 = dx * dx + dy * dy; } function moved() { var touches = d3.touches(target), - p0 = touches[0], - l0 = locations[p0.identifier]; - - if (p1 = touches[1]) { - var p1, l1 = locations[p1.identifier], - scale1 = d3.event.scale; - if (scale1 == null) { - var distance1 = (distance1 = p1[0] - p0[0]) * distance1 + (distance1 = p1[1] - p0[1]) * distance1; - scale1 = distance0 && Math.sqrt(distance1 / distance0); + p0, l0, + p1, l1; + for (var i = 0, n = touches.length; i < n; ++i, l1 = null) { + p1 = touches[i]; + if (l1 = locations0[p1.identifier]) { + if (l0) break; + p0 = p1, l0 = l1; } + } + + if (l1) { + var distance1 = (distance1 = p1[0] - p0[0]) * distance1 + (distance1 = p1[1] - p0[1]) * distance1, + scale1 = distance0 && Math.sqrt(distance1 / distance0); p0 = [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2]; l0 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2]; scaleTo(scale1 * scale0); @@ -1778,22 +1975,42 @@ d3.behavior.zoom = function() { touchtime = null; translateTo(p0, l0); - dispatch(event_); + zoomed(event_); } function ended() { + // If there are any globally-active touches remaining, remove the ended + // touches from locations0. + if (d3.event.touches.length) { + var changed = d3.event.changedTouches; + for (var i = 0, n = changed.length; i < n; ++i) { + delete locations0[changed[i].identifier]; + } + // If locations0 is not empty, then relocate and continue listening for + // touchmove and touchend. + for (var identifier in locations0) { + return void relocate(); // locations may have detached due to rotation + } + } + // Otherwise, remove touchmove and touchend listeners. w.on(touchmove, null).on(touchend, null); - t.on(mousedown, mousedowned); + t.on(mousedown, mousedowned).on(touchstart, touchstarted); dragRestore(); + zoomended(event_); } } function mousewheeled() { + var event_ = event.of(this, arguments); + if (mousewheelTimer) clearTimeout(mousewheelTimer); + else d3_selection_interrupt.call(this), zoomstarted(event_); + mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50); d3_eventPreventDefault(); - if (!translate0) translate0 = location(d3.mouse(this)); - scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * scale); - translateTo(d3.mouse(this), translate0); - dispatch(event.of(this, arguments)); + var point = center || d3.mouse(this); + if (!translate0) translate0 = location(point); + scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * view.k); + translateTo(point, translate0); + zoomed(event_); } function mousewheelreset() { @@ -1801,10 +2018,15 @@ d3.behavior.zoom = function() { } function dblclicked() { - var p = d3.mouse(this), l = location(p), k = Math.log(scale) / Math.LN2; + var event_ = event.of(this, arguments), + p = d3.mouse(this), + l = location(p), + k = Math.log(view.k) / Math.LN2; + zoomstarted(event_); scaleTo(Math.pow(2, d3.event.shiftKey ? Math.ceil(k) - 1 : Math.floor(k) + 1)); translateTo(p, l); - dispatch(event.of(this, arguments)); + zoomed(event_); + zoomended(event_); } return d3.rebind(zoom, event, "on"); @@ -1837,8 +2059,8 @@ d3.timer = function(callback, delay, then) { if (n < 3) then = Date.now(); // Add the callback to the tail of the queue. - var time = then + delay, timer = {callback: callback, time: time, next: null}; - if (d3_timer_queueTail) d3_timer_queueTail.next = timer; + var time = then + delay, timer = {c: callback, t: time, f: false, n: null}; + if (d3_timer_queueTail) d3_timer_queueTail.n = timer; else d3_timer_queueHead = timer; d3_timer_queueTail = timer; @@ -1870,20 +2092,12 @@ d3.timer.flush = function() { d3_timer_sweep(); }; -function d3_timer_replace(callback, delay, then) { - var n = arguments.length; - if (n < 2) delay = 0; - if (n < 3) then = Date.now(); - d3_timer_active.callback = callback; - d3_timer_active.time = then + delay; -} - function d3_timer_mark() { var now = Date.now(); d3_timer_active = d3_timer_queueHead; while (d3_timer_active) { - if (now >= d3_timer_active.time) d3_timer_active.flush = d3_timer_active.callback(now - d3_timer_active.time); - d3_timer_active = d3_timer_active.next; + if (now >= d3_timer_active.t) d3_timer_active.f = d3_timer_active.c(now - d3_timer_active.t); + d3_timer_active = d3_timer_active.n; } return now; } @@ -1895,45 +2109,16 @@ function d3_timer_sweep() { t1 = d3_timer_queueHead, time = Infinity; while (t1) { - if (t1.flush) { - t1 = t0 ? t0.next = t1.next : d3_timer_queueHead = t1.next; + if (t1.f) { + t1 = t0 ? t0.n = t1.n : d3_timer_queueHead = t1.n; } else { - if (t1.time < time) time = t1.time; - t1 = (t0 = t1).next; + if (t1.t < time) time = t1.t; + t1 = (t0 = t1).n; } } d3_timer_queueTail = t0; return time; } -var π = Math.PI, - ε = 1e-6, - ε2 = ε * ε, - d3_radians = π / 180, - d3_degrees = 180 / π; - -function d3_sgn(x) { - return x > 0 ? 1 : x < 0 ? -1 : 0; -} - -function d3_acos(x) { - return x > 1 ? 0 : x < -1 ? π : Math.acos(x); -} - -function d3_asin(x) { - return x > 1 ? π / 2 : x < -1 ? -π / 2 : Math.asin(x); -} - -function d3_sinh(x) { - return (Math.exp(x) - Math.exp(-x)) / 2; -} - -function d3_cosh(x) { - return (Math.exp(x) + Math.exp(-x)) / 2; -} - -function d3_haversin(x) { - return (x = Math.sin(x / 2)) * x; -} d3.geo = {}; function d3_identity(d) { return d; @@ -1950,13 +2135,13 @@ function d3_geo_spherical(cartesian) { } function d3_geo_sphericalEqual(a, b) { - return Math.abs(a[0] - b[0]) < ε && Math.abs(a[1] - b[1]) < ε; + return abs(a[0] - b[0]) < ε && abs(a[1] - b[1]) < ε; } // General spherical polygon clipping algorithm: takes a polygon, cuts it into // visible line segments and rejoins the segments by interpolating along the // clip edge. -function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) { +function d3_geo_clipPolygon(segments, compare, clipStartInside, interpolate, listener) { var subject = [], clip = []; @@ -1975,14 +2160,14 @@ function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) { return; } - var a = {point: p0, points: segment, other: null, visited: false, entry: true, subject: true}, - b = {point: p0, points: [p0], other: a, visited: false, entry: false, subject: false}; - a.other = b; + var a = new d3_geo_clipPolygonIntersection(p0, segment, null, true), + b = new d3_geo_clipPolygonIntersection(p0, null, a, false); + a.o = b; subject.push(a); clip.push(b); - a = {point: p1, points: [p1], other: null, visited: false, entry: false, subject: true}; - b = {point: p1, points: [p1], other: a, visited: false, entry: true, subject: false}; - a.other = b; + a = new d3_geo_clipPolygonIntersection(p1, segment, null, false); + b = new d3_geo_clipPolygonIntersection(p1, null, a, true); + a.o = b; subject.push(a); clip.push(b); }); @@ -1991,41 +2176,42 @@ function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) { d3_geo_clipPolygonLinkCircular(clip); if (!subject.length) return; - if (inside) for (var i = 1, e = !inside(clip[0].point), n = clip.length; i < n; ++i) { - clip[i].entry = (e = !e); + for (var i = 0, entry = clipStartInside, n = clip.length; i < n; ++i) { + clip[i].e = entry = !entry; } var start = subject[0], - current, points, point; while (1) { // Find first unvisited intersection. - current = start; - while (current.visited) if ((current = current.next) === start) return; - points = current.points; + var current = start, + isSubject = true; + while (current.v) if ((current = current.n) === start) return; + points = current.z; listener.lineStart(); do { - current.visited = current.other.visited = true; - if (current.entry) { - if (current.subject) { - for (var i = 0; i < points.length; i++) listener.point((point = points[i])[0], point[1]); + current.v = current.o.v = true; + if (current.e) { + if (isSubject) { + for (var i = 0, n = points.length; i < n; ++i) listener.point((point = points[i])[0], point[1]); } else { - interpolate(current.point, current.next.point, 1, listener); + interpolate(current.x, current.n.x, 1, listener); } - current = current.next; + current = current.n; } else { - if (current.subject) { - points = current.prev.points; - for (var i = points.length; --i >= 0;) listener.point((point = points[i])[0], point[1]); + if (isSubject) { + points = current.p.z; + for (var i = points.length - 1; i >= 0; --i) listener.point((point = points[i])[0], point[1]); } else { - interpolate(current.point, current.prev.point, -1, listener); + interpolate(current.x, current.p.x, -1, listener); } - current = current.prev; + current = current.p; } - current = current.other; - points = current.points; - } while (!current.visited); + current = current.o; + points = current.z; + isSubject = !isSubject; + } while (!current.v); listener.lineEnd(); } } @@ -2037,17 +2223,27 @@ function d3_geo_clipPolygonLinkCircular(array) { a = array[0], b; while (++i < n) { - a.next = b = array[i]; - b.prev = a; + a.n = b = array[i]; + b.p = a; a = b; } - a.next = b = array[0]; - b.prev = a; + a.n = b = array[0]; + b.p = a; } -function d3_geo_clip(pointVisible, clipLine, interpolate, polygonContains) { - return function(listener) { - var line = clipLine(listener); +function d3_geo_clipPolygonIntersection(point, points, other, entry) { + this.x = point; + this.z = points; + this.o = other; // another intersection + this.e = entry; // is an entry? + this.v = false; // visited + this.n = this.p = null; // next & previous +} + +function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) { + return function(rotate, listener) { + var line = clipLine(listener), + rotatedClipStart = rotate.invert(clipStart[0], clipStart[1]); var clip = { point: point, @@ -2067,9 +2263,10 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, polygonContains) { clip.lineEnd = lineEnd; segments = d3.merge(segments); + var clipStartInside = d3_geo_pointInPolygon(rotatedClipStart, polygon); if (segments.length) { - d3_geo_clipPolygon(segments, d3_geo_clipSort, null, interpolate, listener); - } else if (polygonContains(polygon)) { + d3_geo_clipPolygon(segments, d3_geo_clipSort, clipStartInside, interpolate, listener); + } else if (clipStartInside) { listener.lineStart(); interpolate(null, null, 1, listener); listener.lineEnd(); @@ -2086,8 +2283,14 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, polygonContains) { } }; - function point(λ, φ) { if (pointVisible(λ, φ)) listener.point(λ, φ); } - function pointLine(λ, φ) { line.point(λ, φ); } + function point(λ, φ) { + var point = rotate(λ, φ); + if (pointVisible(λ = point[0], φ = point[1])) listener.point(λ, φ); + } + function pointLine(λ, φ) { + var point = rotate(λ, φ); + line.point(point[0], point[1]); + } function lineStart() { clip.point = pointLine; line.lineStart(); } function lineEnd() { clip.point = point; line.lineEnd(); } @@ -2099,8 +2302,9 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, polygonContains) { ring; function pointRing(λ, φ) { - ringListener.point(λ, φ); ring.push([λ, φ]); + var point = rotate(λ, φ); + ringListener.point(point[0], point[1]); } function ringStart() { @@ -2172,8 +2376,8 @@ function d3_geo_clipBufferListener() { // Intersection points are sorted along the clip edge. For both antimeridian // cutting and circle clipping, the same comparison is used. function d3_geo_clipSort(a, b) { - return ((a = a.point)[0] < 0 ? a[1] - π / 2 - ε : π / 2 - a[1]) - - ((b = b.point)[0] < 0 ? b[1] - π / 2 - ε : π / 2 - b[1]); + return ((a = a.x)[0] < 0 ? a[1] - halfπ - ε : halfπ - a[1]) + - ((b = b.x)[0] < 0 ? b[1] - halfπ - ε : halfπ - b[1]); } // Adds floating point numbers with twice the normal precision. // Reference: J. R. Shewchuk, Adaptive Precision Floating-Point Arithmetic and @@ -2239,12 +2443,12 @@ var d3_geo_streamGeometryType = { listener.sphere(); }, Point: function(object, listener) { - var coordinate = object.coordinates; - listener.point(coordinate[0], coordinate[1]); + object = object.coordinates; + listener.point(object[0], object[1], object[2]); }, MultiPoint: function(object, listener) { - var coordinates = object.coordinates, i = -1, n = coordinates.length, coordinate; - while (++i < n) coordinate = coordinates[i], listener.point(coordinate[0], coordinate[1]); + var coordinates = object.coordinates, i = -1, n = coordinates.length; + while (++i < n) object = coordinates[i], listener.point(object[0], object[1], object[2]); }, LineString: function(object, listener) { d3_geo_streamLine(object.coordinates, listener, 0); @@ -2269,7 +2473,7 @@ var d3_geo_streamGeometryType = { function d3_geo_streamLine(coordinates, listener, closed) { var i = -1, n = coordinates.length - closed, coordinate; listener.lineStart(); - while (++i < n) coordinate = coordinates[i], listener.point(coordinate[0], coordinate[1]); + while (++i < n) coordinate = coordinates[i], listener.point(coordinate[0], coordinate[1], coordinate[2]); listener.lineEnd(); } @@ -2394,8 +2598,6 @@ function d3_geo_pointInPolygon(point, polygon) { parallel = point[1], meridianNormal = [Math.sin(meridian), -Math.cos(meridian), 0], polarAngle = 0, - polar = false, - southPole = false, winding = 0; d3_geo_areaRingSum.reset(); @@ -2418,12 +2620,11 @@ function d3_geo_pointInPolygon(point, polygon) { sinφ = Math.sin(φ), cosφ = Math.cos(φ), dλ = λ - λ0, - antimeridian = Math.abs(dλ) > π, + antimeridian = abs(dλ) > π, k = sinφ0 * sinφ; d3_geo_areaRingSum.add(Math.atan2(k * Math.sin(dλ), cosφ0 * cosφ + k * Math.cos(dλ))); - if (Math.abs(φ) < ε) southPole = true; - polarAngle += antimeridian ? dλ + (dλ >= 0 ? 2 : -2) * π : dλ; + polarAngle += antimeridian ? dλ + (dλ >= 0 ? τ : -τ): dλ; // Are the longitudes either side of the point's meridian, and are the // latitudes smaller than the parallel? @@ -2433,34 +2634,34 @@ function d3_geo_pointInPolygon(point, polygon) { var intersection = d3_geo_cartesianCross(meridianNormal, arc); d3_geo_cartesianNormalize(intersection); var φarc = (antimeridian ^ dλ >= 0 ? -1 : 1) * d3_asin(intersection[2]); - if (parallel > φarc) { + if (parallel > φarc || parallel === φarc && (arc[0] || arc[1])) { winding += antimeridian ^ dλ >= 0 ? 1 : -1; } } if (!j++) break; λ0 = λ, sinφ0 = sinφ, cosφ0 = cosφ, point0 = point; } - if (Math.abs(polarAngle) > ε) polar = true; } // First, determine whether the South pole is inside or outside: // // It is inside if: - // * the polygon doesn't wind around it, and its area is negative (counter-clockwise). - // * otherwise, if the polygon winds around it in a clockwise direction. + // * the polygon winds around it in a clockwise direction. + // * the polygon does not (cumulatively) wind around it, but has a negative + // (counter-clockwise) area. // // Second, count the (signed) number of times a segment crosses a meridian // from the point to the South pole. If it is zero, then the point is the // same side as the South pole. - return (!southPole && !polar && d3_geo_areaRingSum < 0 || polarAngle < -ε) ^ (winding & 1); + return (polarAngle < -ε || polarAngle < ε && d3_geo_areaRingSum < 0) ^ (winding & 1); } var d3_geo_clipAntimeridian = d3_geo_clip( d3_true, d3_geo_clipAntimeridianLine, d3_geo_clipAntimeridianInterpolate, - d3_geo_clipAntimeridianPolygonContains); + [-π, -π / 2]); // Takes a line and cuts into visible segments. Return values: // 0: there were intersections or the line was empty. @@ -2480,9 +2681,9 @@ function d3_geo_clipAntimeridianLine(listener) { }, point: function(λ1, φ1) { var sλ1 = λ1 > 0 ? π : -π, - dλ = Math.abs(λ1 - λ0); - if (Math.abs(dλ - π) < ε) { // line crosses a pole - listener.point(λ0, φ0 = (φ0 + φ1) / 2 > 0 ? π / 2 : -π / 2); + dλ = abs(λ1 - λ0); + if (abs(dλ - π) < ε) { // line crosses a pole + listener.point(λ0, φ0 = (φ0 + φ1) / 2 > 0 ? halfπ : -halfπ); listener.point(sλ0, φ0); listener.lineEnd(); listener.lineStart(); @@ -2491,8 +2692,8 @@ function d3_geo_clipAntimeridianLine(listener) { clean = 0; } else if (sλ0 !== sλ1 && dλ >= π) { // line crosses antimeridian // handle degeneracies - if (Math.abs(λ0 - sλ0) < ε) λ0 -= sλ0 * ε; - if (Math.abs(λ1 - sλ1) < ε) λ1 -= sλ1 * ε; + if (abs(λ0 - sλ0) < ε) λ0 -= sλ0 * ε; + if (abs(λ1 - sλ1) < ε) λ1 -= sλ1 * ε; φ0 = d3_geo_clipAntimeridianIntersect(λ0, φ0, λ1, φ1); listener.point(sλ0, φ0); listener.lineEnd(); @@ -2516,7 +2717,7 @@ function d3_geo_clipAntimeridianIntersect(λ0, φ0, λ1, φ1) { var cosφ0, cosφ1, sinλ0_λ1 = Math.sin(λ0 - λ1); - return Math.abs(sinλ0_λ1) > ε + return abs(sinλ0_λ1) > ε ? Math.atan((Math.sin(φ0) * (cosφ1 = Math.cos(φ1)) * Math.sin(λ1) - Math.sin(φ1) * (cosφ0 = Math.cos(φ0)) * Math.sin(λ0)) / (cosφ0 * cosφ1 * sinλ0_λ1)) @@ -2526,7 +2727,7 @@ function d3_geo_clipAntimeridianIntersect(λ0, φ0, λ1, φ1) { function d3_geo_clipAntimeridianInterpolate(from, to, direction, listener) { var φ; if (from == null) { - φ = direction * π / 2; + φ = direction * halfπ; listener.point(-π, φ); listener.point( 0, φ); listener.point( π, φ); @@ -2536,8 +2737,8 @@ function d3_geo_clipAntimeridianInterpolate(from, to, direction, listener) { listener.point(-π, -φ); listener.point(-π, 0); listener.point(-π, φ); - } else if (Math.abs(from[0] - to[0]) > ε) { - var s = (from[0] < to[0] ? 1 : -1) * π; + } else if (abs(from[0] - to[0]) > ε) { + var s = from[0] < to[0] ? π : -π; φ = direction * s / 2; listener.point(-s, φ); listener.point( 0, φ); @@ -2547,12 +2748,6 @@ function d3_geo_clipAntimeridianInterpolate(from, to, direction, listener) { } } -var d3_geo_clipAntimeridianPoint = [-π, 0]; - -function d3_geo_clipAntimeridianPolygonContains(polygon) { - return d3_geo_pointInPolygon(d3_geo_clipAntimeridianPoint, polygon); -} - function d3_geo_equirectangular(λ, φ) { return [λ, φ]; } @@ -2577,17 +2772,23 @@ d3.geo.rotation = function(rotate) { return forward; }; +function d3_geo_identityRotation(λ, φ) { + return [λ > π ? λ - τ : λ < -π ? λ + τ : λ, φ]; +} + +d3_geo_identityRotation.invert = d3_geo_equirectangular; + // Note: |δλ| must be < 2π function d3_geo_rotation(δλ, δφ, δγ) { return δλ ? (δφ || δγ ? d3_geo_compose(d3_geo_rotationλ(δλ), d3_geo_rotationφγ(δφ, δγ)) : d3_geo_rotationλ(δλ)) : (δφ || δγ ? d3_geo_rotationφγ(δφ, δγ) - : d3_geo_equirectangular); + : d3_geo_identityRotation); } function d3_geo_forwardRotationλ(δλ) { return function(λ, φ) { - return λ += δλ, [λ > π ? λ - 2 * π : λ < -π ? λ + 2 * π : λ, φ]; + return λ += δλ, [λ > π ? λ - τ : λ < -π ? λ + τ : λ, φ]; }; } @@ -2678,16 +2879,16 @@ function d3_geo_circleInterpolate(radius, precision) { var cr = Math.cos(radius), sr = Math.sin(radius); return function(from, to, direction, listener) { + var step = direction * precision; if (from != null) { from = d3_geo_circleAngle(cr, from); to = d3_geo_circleAngle(cr, to); - if (direction > 0 ? from < to: from > to) from += direction * 2 * π; + if (direction > 0 ? from < to: from > to) from += direction * τ; } else { - from = radius + direction * 2 * π; - to = radius; + from = radius + direction * τ; + to = radius - .5 * step; } - var point; - for (var step = direction * precision, t = from; direction > 0 ? t > to : t < to; t -= step) { + for (var point, t = from; direction > 0 ? t > to : t < to; t -= step) { listener.point((point = d3_geo_spherical([ cr, -sr * Math.cos(t), @@ -2710,11 +2911,10 @@ function d3_geo_circleAngle(cr, point) { function d3_geo_clipCircle(radius) { var cr = Math.cos(radius), smallRadius = cr > 0, - point = [radius, 0], - notHemisphere = Math.abs(cr) > ε, // TODO optimise for this common case + notHemisphere = abs(cr) > ε, // TODO optimise for this common case interpolate = d3_geo_circleInterpolate(radius, 6 * d3_radians); - return d3_geo_clip(visible, clipLine, interpolate, polygonContains); + return d3_geo_clip(visible, clipLine, interpolate, smallRadius ? [0, -radius] : [-π, radius - π]); function visible(λ, φ) { return Math.cos(λ) * Math.cos(φ) > cr; @@ -2848,7 +3048,7 @@ function d3_geo_clipCircle(radius) { z; if (λ1 < λ0) z = λ0, λ0 = λ1, λ1 = z; var δλ = λ1 - λ0, - polar = Math.abs(δλ - π) < ε, + polar = abs(δλ - π) < ε, meridian = polar || δλ < ε; if (!polar && φ1 < φ0) z = φ0, φ0 = φ1, φ1 = z; @@ -2856,7 +3056,7 @@ function d3_geo_clipCircle(radius) { // Check that the first point is between a and b. if (meridian ? polar - ? φ0 + φ1 > 0 ^ q[1] < (Math.abs(q[0] - λ0) < ε ? φ0 : φ1) + ? φ0 + φ1 > 0 ^ q[1] < (abs(q[0] - λ0) < ε ? φ0 : φ1) : φ0 <= q[1] && q[1] <= φ1 : δλ > π ^ (λ0 <= q[0] && q[0] <= λ1)) { var q1 = d3_geo_cartesianScale(u, (-w + t) / uu); @@ -2876,18 +3076,101 @@ function d3_geo_clipCircle(radius) { else if (φ > r) code |= 8; // above return code; } +} - function polygonContains(polygon) { - return d3_geo_pointInPolygon(point, polygon); - } +// Liang–Barsky line clipping. +function d3_geom_clipLine(x0, y0, x1, y1) { + return function(line) { + var a = line.a, + b = line.b, + ax = a.x, + ay = a.y, + bx = b.x, + by = b.y, + t0 = 0, + t1 = 1, + dx = bx - ax, + dy = by - ay, + r; + + r = x0 - ax; + if (!dx && r > 0) return; + r /= dx; + if (dx < 0) { + if (r < t0) return; + if (r < t1) t1 = r; + } else if (dx > 0) { + if (r > t1) return; + if (r > t0) t0 = r; + } + + r = x1 - ax; + if (!dx && r < 0) return; + r /= dx; + if (dx < 0) { + if (r > t1) return; + if (r > t0) t0 = r; + } else if (dx > 0) { + if (r < t0) return; + if (r < t1) t1 = r; + } + + r = y0 - ay; + if (!dy && r > 0) return; + r /= dy; + if (dy < 0) { + if (r < t0) return; + if (r < t1) t1 = r; + } else if (dy > 0) { + if (r > t1) return; + if (r > t0) t0 = r; + } + + r = y1 - ay; + if (!dy && r < 0) return; + r /= dy; + if (dy < 0) { + if (r > t1) return; + if (r > t0) t0 = r; + } else if (dy > 0) { + if (r < t0) return; + if (r < t1) t1 = r; + } + + if (t0 > 0) line.a = {x: ax + t0 * dx, y: ay + t0 * dy}; + if (t1 < 1) line.b = {x: ax + t1 * dx, y: ay + t1 * dy}; + return line; + }; } -var d3_geo_clipViewMAX = 1e9; +var d3_geo_clipExtentMAX = 1e9; + +d3.geo.clipExtent = function() { + var x0, y0, x1, y1, + stream, + clip, + clipExtent = { + stream: function(output) { + if (stream) stream.valid = false; + stream = clip(output); + stream.valid = true; // allow caching by d3.geo.path + return stream; + }, + extent: function(_) { + if (!arguments.length) return [[x0, y0], [x1, y1]]; + clip = d3_geo_clipExtent(x0 = +_[0][0], y0 = +_[0][1], x1 = +_[1][0], y1 = +_[1][1]); + if (stream) stream.valid = false, stream = null; + return clipExtent; + } + }; + return clipExtent.extent([[0, 0], [960, 500]]); +}; -function d3_geo_clipView(x0, y0, x1, y1) { +function d3_geo_clipExtent(x0, y0, x1, y1) { return function(listener) { var listener_ = listener, bufferListener = d3_geo_clipBufferListener(), + clipLine = d3_geom_clipLine(x0, y0, x1, y1), segments, polygon, ring; @@ -2900,28 +3183,30 @@ function d3_geo_clipView(x0, y0, x1, y1) { listener = bufferListener; segments = []; polygon = []; + clean = true; }, polygonEnd: function() { listener = listener_; - if ((segments = d3.merge(segments)).length) { + segments = d3.merge(segments); + var clipStartInside = insidePolygon([x0, y1]), + inside = clean && clipStartInside, + visible = segments.length; + if (inside || visible) { listener.polygonStart(); - d3_geo_clipPolygon(segments, compare, inside, interpolate, listener); + if (inside) { + listener.lineStart(); + interpolate(null, null, 1, listener); + listener.lineEnd(); + } + if (visible) { + d3_geo_clipPolygon(segments, compare, clipStartInside, interpolate, listener); + } listener.polygonEnd(); - } else if (insidePolygon([x0, y0])) { - listener.polygonStart(), listener.lineStart(); - interpolate(null, null, 1, listener); - listener.lineEnd(), listener.polygonEnd(); } segments = polygon = ring = null; } }; - function inside(point) { - var a = corner(point, -1), - i = insidePolygon([a === 0 || a === 3 ? x0 : x1, a > 1 ? y1 : y0]); - return i; - } - function insidePolygon(p) { var wn = 0, // the winding number counter n = polygon.length, @@ -2958,17 +3243,18 @@ function d3_geo_clipView(x0, y0, x1, y1) { } } - function visible(x, y) { + function pointVisible(x, y) { return x0 <= x && x <= x1 && y0 <= y && y <= y1; } function point(x, y) { - if (visible(x, y)) listener.point(x, y); + if (pointVisible(x, y)) listener.point(x, y); } var x__, y__, v__, // first point x_, y_, v_, // previous point - first; + first, + clean; function lineStart() { clip.point = linePoint; @@ -2992,9 +3278,9 @@ function d3_geo_clipView(x0, y0, x1, y1) { } function linePoint(x, y) { - x = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, x)); - y = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, y)); - var v = visible(x, y); + x = Math.max(-d3_geo_clipExtentMAX, Math.min(d3_geo_clipExtentMAX, x)); + y = Math.max(-d3_geo_clipExtentMAX, Math.min(d3_geo_clipExtentMAX, y)); + var v = pointVisible(x, y); if (polygon) ring.push([x, y]); if (first) { x__ = x, y__ = y, v__ = v; @@ -3006,18 +3292,19 @@ function d3_geo_clipView(x0, y0, x1, y1) { } else { if (v && v_) listener.point(x, y); else { - var a = [x_, y_], - b = [x, y]; - if (clipLine(a, b)) { + var l = {a: {x: x_, y: y_}, b: {x: x, y: y}}; + if (clipLine(l)) { if (!v_) { listener.lineStart(); - listener.point(a[0], a[1]); + listener.point(l.a.x, l.a.y); } - listener.point(b[0], b[1]); + listener.point(l.b.x, l.b.y); if (!v) listener.lineEnd(); + clean = false; } else if (v) { listener.lineStart(); listener.point(x, y); + clean = false; } } } @@ -3028,14 +3315,14 @@ function d3_geo_clipView(x0, y0, x1, y1) { }; function corner(p, direction) { - return Math.abs(p[0] - x0) < ε ? direction > 0 ? 0 : 3 - : Math.abs(p[0] - x1) < ε ? direction > 0 ? 2 : 1 - : Math.abs(p[1] - y0) < ε ? direction > 0 ? 1 : 0 - : direction > 0 ? 3 : 2; // Math.abs(p[1] - y1) < ε + return abs(p[0] - x0) < ε ? direction > 0 ? 0 : 3 + : abs(p[0] - x1) < ε ? direction > 0 ? 2 : 1 + : abs(p[1] - y0) < ε ? direction > 0 ? 1 : 0 + : direction > 0 ? 3 : 2; // abs(p[1] - y1) < ε } function compare(a, b) { - return comparePoints(a.point, b.point); + return comparePoints(a.x, b.x); } function comparePoints(a, b) { @@ -3047,47 +3334,6 @@ function d3_geo_clipView(x0, y0, x1, y1) { : ca === 2 ? a[1] - b[1] : b[0] - a[0]; } - - // Liang–Barsky line clipping. - function clipLine(a, b) { - var dx = b[0] - a[0], - dy = b[1] - a[1], - t = [0, 1]; - - if (Math.abs(dx) < ε && Math.abs(dy) < ε) return x0 <= a[0] && a[0] <= x1 && y0 <= a[1] && a[1] <= y1; - - if (d3_geo_clipViewT(x0 - a[0], dx, t) && - d3_geo_clipViewT(a[0] - x1, -dx, t) && - d3_geo_clipViewT(y0 - a[1], dy, t) && - d3_geo_clipViewT(a[1] - y1, -dy, t)) { - if (t[1] < 1) { - b[0] = a[0] + t[1] * dx; - b[1] = a[1] + t[1] * dy; - } - if (t[0] > 0) { - a[0] += t[0] * dx; - a[1] += t[0] * dy; - } - return true; - } - - return false; - } -} - -function d3_geo_clipViewT(num, denominator, t) { - if (Math.abs(denominator) < ε) return num <= 0; - - var u = num / denominator; - - if (denominator > 0) { - if (u > t[1]) return false; - if (u > t[0]) t[0] = u; - } else { - if (u < t[0]) return false; - if (u < t[1]) t[1] = u; - } - return true; } function d3_geo_compose(a, b) { @@ -3330,7 +3576,7 @@ d3.geo.bounds = (function() { var dλ = λ - λ_, s = dλ > 0 ? 1 : -1, λi = inflection[0] * d3_degrees * s, - antimeridian = Math.abs(dλ) > 180; + antimeridian = abs(dλ) > 180; if (antimeridian ^ (s * λ_ < λi && λi < s * λ)) { var φi = inflection[1] * d3_degrees; if (φi > φ1) φ1 = φi; @@ -3375,7 +3621,7 @@ d3.geo.bounds = (function() { function ringPoint(λ, φ) { if (p0) { var dλ = λ - λ_; - dλSum += Math.abs(dλ) > 180 ? dλ + (dλ > 0 ? 360 : -360) : dλ; + dλSum += abs(dλ) > 180 ? dλ + (dλ > 0 ? 360 : -360) : dλ; } else λ__ = λ, φ__ = φ; d3_geo_area.point(λ, φ); linePoint(λ, φ); @@ -3388,7 +3634,7 @@ d3.geo.bounds = (function() { function ringEnd() { ringPoint(λ__, φ__); d3_geo_area.lineEnd(); - if (Math.abs(dλSum) > ε) λ0 = -(λ1 = 180); + if (abs(dλSum) > ε) λ0 = -(λ1 = 180); range[0] = λ0, range[1] = λ1; p0 = null; } @@ -3601,7 +3847,7 @@ var d3_geo_pathAreaSum, d3_geo_pathAreaPolygon, d3_geo_pathArea = { }, polygonEnd: function() { d3_geo_pathArea.lineStart = d3_geo_pathArea.lineEnd = d3_geo_pathArea.point = d3_noop; - d3_geo_pathAreaSum += Math.abs(d3_geo_pathAreaPolygon / 2); + d3_geo_pathAreaSum += abs(d3_geo_pathAreaPolygon / 2); } }; @@ -3806,7 +4052,7 @@ function d3_geo_pathContext(context) { function point(x, y) { context.moveTo(x, y); - context.arc(x, y, pointRadius, 0, 2 * π); + context.arc(x, y, pointRadius, 0, τ); } function pointLineStart(x, y) { @@ -3898,7 +4144,7 @@ function d3_geo_resample(project) { c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), - λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), + λ2 = abs(abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], @@ -3906,7 +4152,7 @@ function d3_geo_resample(project) { dy2 = y2 - y0, dz = dy * dx2 - dx * dy2; if (dz * dz / d2 > δ2 // perpendicular projected distance - || Math.abs((dx * dx2 + dy * dy2) / d2 - .5) > .3 // midpoint close to an end + || abs((dx * dx2 + dy * dy2) / d2 - .5) > .3 // midpoint close to an end || a0 * a1 + b0 * b1 + c0 * c1 < cosMinDistance) { // angular distance resampleLineTo(x0, y0, λ0, a0, b0, c0, x2, y2, λ2, a /= m, b /= m, c, depth, stream); stream.point(x2, y2); @@ -3924,6 +4170,29 @@ function d3_geo_resample(project) { return resample; } +d3.geo.transform = function(methods) { + return { + stream: function(stream) { + var transform = new d3_geo_transform(stream); + for (var k in methods) transform[k] = methods[k]; + return transform; + } + }; +}; + +function d3_geo_transform(stream) { + this.stream = stream; +} + +d3_geo_transform.prototype = { + point: function(x, y) { this.stream.point(x, y); }, + sphere: function() { this.stream.sphere(); }, + lineStart: function() { this.stream.lineStart(); }, + lineEnd: function() { this.stream.lineEnd(); }, + polygonStart: function() { this.stream.polygonStart(); }, + polygonEnd: function() { this.stream.polygonEnd(); } +}; + d3.geo.path = function() { var pointRadius = 4.5, projection, @@ -3992,17 +4261,11 @@ d3.geo.path = function() { }; function d3_geo_pathProjectStream(project) { - var resample = d3_geo_resample(function(λ, φ) { return project([λ * d3_degrees, φ * d3_degrees]); }); + var resample = d3_geo_resample(function(x, y) { return project([x * d3_degrees, y * d3_degrees]); }); return function(stream) { - stream = resample(stream); - return { - point: function(λ, φ) { stream.point(λ * d3_radians, φ * d3_radians); }, - sphere: function() { stream.sphere(); }, - lineStart: function() { stream.lineStart(); }, - lineEnd: function() { stream.lineEnd(); }, - polygonStart: function() { stream.polygonStart(); }, - polygonEnd: function() { stream.polygonEnd(); } - }; + var transform = new d3_geo_transform(stream = resample(stream)); + transform.point = function(x, y) { stream.point(x * d3_radians, y * d3_radians); }; + return transform; }; } @@ -4041,7 +4304,7 @@ function d3_geo_projectionMutator(projectAt) { projection.stream = function(output) { if (stream) stream.valid = false; - stream = d3_geo_projectionRadiansRotate(rotate, preclip(projectResample(postclip(output)))); + stream = d3_geo_projectionRadians(preclip(rotate, projectResample(postclip(output)))); stream.valid = true; // allow caching by d3.geo.path return stream; }; @@ -4055,7 +4318,7 @@ function d3_geo_projectionMutator(projectAt) { projection.clipExtent = function(_) { if (!arguments.length) return clipExtent; clipExtent = _; - postclip = _ == null ? d3_identity : d3_geo_clipView(_[0][0], _[0][1], _[1][0], _[1][1]); + postclip = _ ? d3_geo_clipExtent(_[0][0], _[0][1], _[1][0], _[1][1]) : d3_identity; return invalidate(); }; @@ -4098,10 +4361,7 @@ function d3_geo_projectionMutator(projectAt) { } function invalidate() { - if (stream) { - stream.valid = false; - stream = null; - } + if (stream) stream.valid = false, stream = null; return projection; } @@ -4112,18 +4372,12 @@ function d3_geo_projectionMutator(projectAt) { }; } -function d3_geo_projectionRadiansRotate(rotate, stream) { - return { - point: function(x, y) { - y = rotate(x * d3_radians, y * d3_radians), x = y[0]; - stream.point(x > π ? x - 2 * π : x < -π ? x + 2 * π : x, y[1]); - }, - sphere: function() { stream.sphere(); }, - lineStart: function() { stream.lineStart(); }, - lineEnd: function() { stream.lineEnd(); }, - polygonStart: function() { stream.polygonStart(); }, - polygonEnd: function() { stream.polygonEnd(); } +function d3_geo_projectionRadians(stream) { + var transform = new d3_geo_transform(stream); + transform.point = function(λ, φ) { + stream.point(λ * d3_radians, φ * d3_radians); }; + return transform; } function d3_geo_mercator(λ, φ) { @@ -4131,7 +4385,7 @@ function d3_geo_mercator(λ, φ) { } d3_geo_mercator.invert = function(x, y) { - return [x, 2 * Math.atan(Math.exp(y)) - π / 2]; + return [x, 2 * Math.atan(Math.exp(y)) - halfπ]; }; function d3_geo_mercatorProjection(project) { @@ -4303,7 +4557,7 @@ d3.ease = function(name) { m = i >= 0 ? name.substring(i + 1) : "in"; t = d3_ease.get(t) || d3_ease_default; m = d3_ease_mode.get(m) || d3_identity; - return d3_ease_clamp(m(t.apply(null, Array.prototype.slice.call(arguments, 1)))); + return d3_ease_clamp(m(t.apply(null, d3_arraySlice.call(arguments, 1)))); }; function d3_ease_clamp(f) { @@ -4347,7 +4601,7 @@ function d3_ease_poly(e) { } function d3_ease_sin(t) { - return 1 - Math.cos(t * π / 2); + return 1 - Math.cos(t * halfπ); } function d3_ease_exp(t) { @@ -4361,10 +4615,10 @@ function d3_ease_circle(t) { function d3_ease_elastic(a, p) { var s; if (arguments.length < 2) p = 0.45; - if (arguments.length) s = p / (2 * π) * Math.asin(1 / a); + if (arguments.length) s = p / τ * Math.asin(1 / a); else a = 1, s = p / 4; return function(t) { - return 1 + a * Math.pow(2, 10 * -t) * Math.sin((t - s) * 2 * π / p); + return 1 + a * Math.pow(2, -10 * t) * Math.sin((t - s) * τ / p); }; } @@ -5379,7 +5633,7 @@ function d3_transition_text(b) { d3_transitionPrototype.remove = function() { return this.each("end.transition", function() { var p; - if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this); + if (this.__transition__.count < 2 && (p = this.parentNode)) p.removeChild(this); }); }; @@ -5393,15 +5647,15 @@ d3_transitionPrototype.ease = function(value) { d3_transitionPrototype.delay = function(value) { var id = this.id; return d3_selection_each(this, typeof value === "function" - ? function(node, i, j) { node.__transition__[id].delay = value.call(node, node.__data__, i, j) | 0; } - : (value |= 0, function(node) { node.__transition__[id].delay = value; })); + ? function(node, i, j) { node.__transition__[id].delay = +value.call(node, node.__data__, i, j); } + : (value = +value, function(node) { node.__transition__[id].delay = value; })); }; d3_transitionPrototype.duration = function(value) { var id = this.id; return d3_selection_each(this, typeof value === "function" - ? function(node, i, j) { node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j) | 0); } - : (value = Math.max(1, value | 0), function(node) { node.__transition__[id].duration = value; })); + ? function(node, i, j) { node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j)); } + : (value = Math.max(1, value), function(node) { node.__transition__[id].duration = value; })); }; d3_transitionPrototype.each = function(type, listener) { @@ -5471,10 +5725,12 @@ function d3_transitionNode(node, i, id, inherit) { ease = transition.ease, delay = transition.delay, duration = transition.duration, + timer = d3_timer_active, tweened = []; - if (delay <= elapsed) return start(elapsed); - d3_timer_replace(start, delay, time); + timer.t = delay + time; + if (delay <= elapsed) return start(elapsed - delay); + timer.c = start; function start(elapsed) { if (lock.active > id) return stop(); @@ -5487,14 +5743,16 @@ function d3_transitionNode(node, i, id, inherit) { } }); - if (tick(elapsed)) return 1; - d3_timer_replace(tick, 0, time); + d3.timer(function() { // defer to end of current frame + timer.c = tick(elapsed || 1) ? d3_true : tick; + return 1; + }, 0, time); } function tick(elapsed) { if (lock.active !== id) return stop(); - var t = (elapsed - delay) / duration, + var t = elapsed / duration, e = ease(t), n = tweened.length; @@ -5503,9 +5761,8 @@ function d3_transitionNode(node, i, id, inherit) { } if (t >= 1) { - stop(); transition.event && transition.event.end.call(node, d, i); - return 1; + return stop(); } } @@ -5529,7 +5786,7 @@ function d3_xhrType(response) { function d3_xhr(url, mimeType, response, callback) { var xhr = {}, - dispatch = d3.dispatch("progress", "load", "error"), + dispatch = d3.dispatch("beforesend", "progress", "load", "error"), headers = {}, request = new XMLHttpRequest, responseType = null; @@ -5611,6 +5868,7 @@ function d3_xhr(url, mimeType, response, callback) { if (mimeType != null && request.overrideMimeType) request.overrideMimeType(mimeType); if (responseType != null) request.responseType = responseType; if (callback != null) xhr.on("error", callback).on("load", function(request) { callback(null, request); }); + dispatch.beforesend.call(xhr, request); request.send(data == null ? null : data); return xhr; }; @@ -5690,25 +5948,26 @@ d3.combobox = function() { var parent = this.parentNode, sibling = this.nextSibling; - var carat = d3.select(parent).selectAll('.combobox-carat') + var caret = d3.select(parent).selectAll('.combobox-caret') .filter(function(d) { return d === input.node(); }) .data([input.node()]); - carat.enter().insert('div', function() { return sibling; }) - .attr('class', 'combobox-carat'); + caret.enter().insert('div', function() { return sibling; }) + .attr('class', 'combobox-caret'); - carat + caret .on('mousedown', function () { // prevent the form element from blurring. it blurs // on mousedown d3.event.stopPropagation(); d3.event.preventDefault(); input.node().focus(); + fetch('', render); }); }); function focus() { - fetch(render); + fetch(value(), render); } function blur() { @@ -5798,7 +6057,7 @@ d3.combobox = function() { } function change() { - fetch(function() { + fetch(value(), function() { autocomplete(); render(); }); @@ -5823,8 +6082,8 @@ d3.combobox = function() { return value; } - function fetch(cb) { - fetcher.call(input, value(), function(_) { + function fetch(v, cb) { + fetcher.call(input, v, function(_) { suggestions = _; cb(); }); @@ -5849,7 +6108,7 @@ d3.combobox = function() { } function render() { - if (suggestions.length && document.activeElement === input.node()) { + if (suggestions.length > 1 && document.activeElement === input.node()) { show(); } else { hide(); @@ -15119,6 +15378,7 @@ if (typeof exports === 'object') { }).call(function() { return this || (typeof window !== 'undefined' ? window : global); }()); +/* jshint ignore:start */ (function () { 'use strict'; window.iD = function () { @@ -15147,7 +15407,9 @@ window.iD = function () { else storage.setItem(k, v); } catch(e) { // localstorage quota exceeded + /* jshint devel:true */ if (typeof console !== 'undefined') console.error('localStorage quota exceeded'); + /* jshint devel:false */ } }; @@ -15230,7 +15492,7 @@ window.iD = function () { var result = fn.apply(history, arguments); debouncedSave(); return result; - } + }; } context.perform = withDebouncedSave(history.perform); @@ -15318,9 +15580,52 @@ window.iD = function () { }; /* Projection */ - context.projection = d3.geo.mercator() - .scale(512 / Math.PI) - .precision(0); + function rawMercator() { + var project = d3.geo.mercator.raw, + k = 512 / Math.PI, // scale + x = 0, y = 0, // translate + clipExtent = [[0, 0], [0, 0]]; + + function projection(point) { + point = project(point[0] * Math.PI / 180, point[1] * Math.PI / 180); + return [point[0] * k + x, y - point[1] * k]; + } + + projection.invert = function(point) { + point = project.invert((point[0] - x) / k, (y - point[1]) / k); + return point && [point[0] * 180 / Math.PI, point[1] * 180 / Math.PI]; + }; + + projection.scale = function(_) { + if (!arguments.length) return k; + k = +_; + return projection; + }; + + projection.translate = function(_) { + if (!arguments.length) return [x, y]; + x = +_[0]; + y = +_[1]; + return projection; + }; + + projection.clipExtent = function(_) { + if (!arguments.length) return clipExtent; + clipExtent = _; + return projection; + }; + + projection.stream = d3.geo.transform({ + point: function(x, y) { + x = projection([x, y]); + this.stream.point(x[0], x[1]); + } + }).stream; + + return projection; + } + + context.projection = rawMercator(); /* Background */ var background = iD.Background(context); @@ -15388,13 +15693,13 @@ window.iD = function () { return d3.rebind(context, dispatch, 'on'); }; -iD.version = '1.2.1'; +iD.version = '1.3.2'; (function() { var detected = {}; var ua = navigator.userAgent, - msie = new RegExp("MSIE ([0-9]{1,}[\\.0-9]{0,})"); + msie = new RegExp('MSIE ([0-9]{1,}[\\.0-9]{0,})'); if (msie.exec(ua) !== null) { var rv = parseFloat(RegExp.$1); @@ -15638,7 +15943,7 @@ iD.util.entityOrMemberSelector = function(ids, graph) { var entity = graph.hasEntity(id); if (entity && entity.type === 'relation') { entity.members.forEach(function(member) { - s += ',.' + member.id + s += ',.' + member.id; }); } }); @@ -15723,7 +16028,7 @@ iD.util.editDistance = function(a, b) { for (var j = 0; j <= a.length; j++) { matrix[0][j] = j; } for (i = 1; i <= b.length; i++) { for (j = 1; j <= a.length; j++) { - if (b.charAt(i-1) == a.charAt(j-1)) { + if (b.charAt(i-1) === a.charAt(j-1)) { matrix[i][j] = matrix[i-1][j-1]; } else { matrix[i][j] = Math.min(matrix[i-1][j-1] + 1, // substitution @@ -15751,6 +16056,7 @@ iD.util.fastMouse = function(container) { }; }; +/* jshint -W103 */ iD.util.getPrototypeOf = Object.getPrototypeOf || function(obj) { return obj.__proto__; }; iD.util.asyncMap = function(inputs, func, callback) { @@ -15774,6 +16080,70 @@ iD.util.wrap = function(index, length) { index += Math.ceil(-index/length)*length; return index % length; }; +// A per-domain session mutex backed by a cookie and dead man's +// switch. If the session crashes, the mutex will auto-release +// after 5 seconds. + +iD.util.SessionMutex = function(name) { + var mutex = {}, + intervalID; + + function renew() { + var expires = new Date(); + expires.setSeconds(expires.getSeconds() + 5); + document.cookie = name + '=1; expires=' + expires.toUTCString(); + } + + mutex.lock = function() { + if (intervalID) return true; + var cookie = document.cookie.replace(new RegExp('(?:(?:^|.*;)\\s*' + name + '\\s*\\=\\s*([^;]*).*$)|^.*$'), '$1'); + if (cookie) return false; + renew(); + intervalID = window.setInterval(renew, 4000); + return true; + }; + + mutex.unlock = function() { + if (!intervalID) return; + document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT'; + clearInterval(intervalID); + intervalID = null; + }; + + mutex.locked = function() { + return !!intervalID; + }; + + return mutex; +}; +iD.util.SuggestNames = function(preset, suggestions) { + preset = preset.id.split('/', 2); + var k = preset[0], + v = preset[1]; + + return function(value, callback) { + var result = []; + if (value && value.length > 2) { + if (suggestions[k] && suggestions[k][v]) { + for (var sugg in suggestions[k][v]) { + var dist = iD.util.editDistance(value, sugg.substring(0, value.length)); + if (dist < 3) { + result.push({ + title: sugg, + value: sugg, + dist: dist + }); + } + } + } + result.sort(function(a, b) { + return a.dist - b.dist; + }); + } + result = result.slice(0,3); + callback(result); + }; +}; iD.geo = {}; iD.geo.roundCoords = function(c) { @@ -15797,6 +16167,11 @@ iD.geo.sphericalDistance = function(a, b) { return 6.3710E6 * Math.sqrt((x * x) + (y * y)) * Math.PI/180; }; +iD.geo.edgeEqual = function(a, b) { + return (a[0] === b[0] && a[1] === b[1]) || + (a[0] === b[1] && a[1] === b[0]); +}; + // Choose the edge with the minimal distance from `point` to its orthogonal // projection onto that edge, if such a projection exists, or the distance to // the closest vertex on that edge. Returns an object with the `index` of the @@ -15861,7 +16236,7 @@ iD.geo.pointInPolygon = function(point, polygon) { var xi = polygon[i][0], yi = polygon[i][1]; var xj = polygon[j][0], yj = polygon[j][1]; - var intersect = ((yi > y) != (yj > y)) && + var intersect = ((yi > y) !== (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi) + xi); if (intersect) inside = !inside; } @@ -15927,7 +16302,7 @@ _.extend(iD.geo.Extent.prototype, { [this[1][0], this[1][1]], [this[1][0], this[0][1]], [this[0][0], this[0][1]] - ] + ]; }, intersects: function(obj) { @@ -16188,7 +16563,7 @@ iD.actions.AddMember = function(relationId, member, memberIndex) { } return graph.replace(relation.addMember(member, memberIndex)); - } + }; }; iD.actions.AddMidpoint = function(midpoint, node) { return function(graph) { @@ -16200,10 +16575,7 @@ iD.actions.AddMidpoint = function(midpoint, node) { parents.forEach(function(way) { for (var i = 0; i < way.nodes.length - 1; i++) { - if ((way.nodes[i] === midpoint.edge[0] && - way.nodes[i + 1] === midpoint.edge[1]) || - (way.nodes[i] === midpoint.edge[1] && - way.nodes[i + 1] === midpoint.edge[0])) { + if (iD.geo.edgeEqual([way.nodes[i], way.nodes[i + 1]], midpoint.edge)) { graph = graph.replace(graph.entity(way.id).addNode(node.id, i + 1)); // Add only one midpoint on doubled-back segments, @@ -16225,7 +16597,7 @@ iD.actions.AddVertex = function(wayId, nodeId, index) { iD.actions.ChangeMember = function(relationId, member, memberIndex) { return function(graph) { return graph.replace(graph.entity(relationId).updateMember(member, memberIndex)); - } + }; }; iD.actions.ChangePreset = function(entityId, oldPreset, newPreset) { return function(graph) { @@ -16251,7 +16623,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) { var action = function(graph) { var way = graph.entity(wayId), nodes = _.uniq(graph.childNodes(way)), - keyNodes = nodes.filter(function(n) { return graph.parentWays(n).length != 1; }), + keyNodes = nodes.filter(function(n) { return graph.parentWays(n).length !== 1; }), points = nodes.map(function(n) { return projection(n.loc); }), keyPoints = keyNodes.map(function(n) { return projection(n.loc); }), centroid = d3.geom.polygon(points).centroid(), @@ -16265,7 +16637,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) { keyPoints = [points[0]]; } - if (keyNodes.length == 1) { + if (keyNodes.length === 1) { var index = nodes.indexOf(keyNodes[0]), oppositeIndex = Math.floor((index + nodes.length / 2) % nodes.length); @@ -16375,6 +16747,7 @@ iD.actions.Connect = function(nodeIds) { for (var i = 0; i < nodeIds.length - 1; i++) { var node = graph.entity(nodeIds[i]); + /*jshint -W083 */ graph.parentWays(node).forEach(function(parent) { if (!parent.areAdjacent(node.id, survivor.id)) { graph = graph.replace(parent.replaceNode(node.id, survivor.id)); @@ -16384,6 +16757,7 @@ iD.actions.Connect = function(nodeIds) { graph.parentRelations(node).forEach(function(parent) { graph = graph.replace(parent.replaceMember(node, survivor)); }); + /*jshint +W083 */ survivor = survivor.mergeTags(node.tags); graph = iD.actions.DeleteNode(node.id)(graph); @@ -16589,7 +16963,7 @@ iD.actions.DiscardTags = function(difference) { difference.created().forEach(discardTags); return graph; - } + }; }; // Disconect the ways at the given node. // @@ -16615,7 +16989,7 @@ iD.actions.Disconnect = function(nodeId, newNodeId) { replacements.forEach(function(replacement) { var newNode = iD.Node({id: newNodeId, loc: node.loc, tags: node.tags}); graph = graph.replace(newNode); - graph = graph.replace(replacement.way.updateNode(newNode.id, replacement.index)); + graph = graph.replace(graph.entity(replacement.wayID).updateNode(newNode.id, replacement.index)); }); return graph; @@ -16634,7 +17008,7 @@ iD.actions.Disconnect = function(nodeId, newNodeId) { parent.nodes.forEach(function(waynode, index) { if (waynode === nodeId) { - candidates.push({way: parent, index: index}); + candidates.push({wayID: parent.id, index: index}); } }); }); @@ -16828,7 +17202,7 @@ iD.actions.MergePolygon = function(ids, newRelationId) { return _.any(contained[i]); } - function filterContained(d, i) { + function filterContained(d) { return d.filter(isContained); } @@ -16985,7 +17359,7 @@ iD.actions.Orthogonalize = function(wayId, projection) { for (i = 0; i < points.length; i++) { // only move the points that actually moved - if (originalPoints[i][0] != points[i][0] || originalPoints[i][1] != points[i][1]) { + if (originalPoints[i][0] !== points[i][0] || originalPoints[i][1] !== points[i][1]) { graph = graph.replace(graph.entity(nodes[i].id) .move(projection.invert(points[i]))); } @@ -16995,8 +17369,8 @@ iD.actions.Orthogonalize = function(wayId, projection) { for (i = 0; i < points.length; i++) { var node = nodes[i]; - if (graph.parentWays(node).length > 1 || - graph.parentRelations(node).length || + if (graph.parentWays(node).length > 1 || + graph.parentRelations(node).length || node.hasInterestingTags()) { continue; @@ -17150,9 +17524,9 @@ iD.actions.Reverse = function(wayId) { } function reverseValue(key, value) { - if (key === "incline" && numeric.test(value)) { + if (key === 'incline' && numeric.test(value)) { return value.replace(numeric, function(_, sign) { return sign === '-' ? '' : '-'; }); - } else if (key === "incline" || key === "direction") { + } else if (key === 'incline' || key === 'direction') { return {up: 'down', down: 'up'}[value] || value; } else { return {left: 'right', right: 'left'}[value] || value; @@ -17250,13 +17624,13 @@ iD.actions.Split = function(nodeId, newWayIds) { // calculate lengths length = 0; - for (i = wrap(idxA+1); i != idxA; i = wrap(i+1)) { + for (i = wrap(idxA+1); i !== idxA; i = wrap(i+1)) { length += dist(nodes[i], nodes[wrap(i-1)]); lengths[i] = length; } length = 0; - for (i = wrap(idxA-1); i != idxA; i = wrap(i-1)) { + for (i = wrap(idxA-1); i !== idxA; i = wrap(i-1)) { length += dist(nodes[i], nodes[wrap(i+1)]); if (length < lengths[i]) lengths[i] = length; @@ -17413,22 +17787,22 @@ iD.actions.Straighten = function(wayId, projection) { i; for (i = 1; i < points.length-1; i++) { - var node = nodes[i], + var node = nodes[i], point = points[i]; - if (graph.parentWays(node).length > 1 || - graph.parentRelations(node).length || + if (graph.parentWays(node).length > 1 || + graph.parentRelations(node).length || node.hasInterestingTags()) { var u = positionAlongWay(point, startPoint, endPoint), p0 = startPoint[0] + u * (endPoint[0] - startPoint[0]), - p1 = startPoint[1] + u * (endPoint[1] - startPoint[1]), + p1 = startPoint[1] + u * (endPoint[1] - startPoint[1]); graph = graph.replace(graph.entity(node.id) .move(projection.invert([p0, p1]))); } else { // safe to delete - if (toDelete.indexOf(node) == -1) { + if (toDelete.indexOf(node) === -1) { toDelete.push(node); } } @@ -17452,7 +17826,7 @@ iD.actions.Straighten = function(wayId, projection) { i; for (i = 1; i < points.length-1; i++) { - var point = points[i], + var point = points[i], u = positionAlongWay(point, startPoint, endPoint), p0 = startPoint[0] + u * (endPoint[0] - startPoint[0]), p1 = startPoint[1] + u * (endPoint[1] - startPoint[1]), @@ -17526,7 +17900,7 @@ iD.behavior.drag = function() { d3.event.preventDefault(); } - var event = d3.dispatch("start", "move", "end"), + var event = d3.dispatch('start', 'move', 'end'), origin = null, selector = '', filter = null, @@ -17534,10 +17908,10 @@ iD.behavior.drag = function() { event.of = function(thiz, argumentz) { return function(e1) { + var e0 = e1.sourceEvent = d3.event; + e1.target = drag; + d3.event = e1; try { - var e0 = e1.sourceEvent = d3.event; - e1.target = drag; - d3.event = e1; event[e1.type].apply(thiz, argumentz); } finally { d3.event = e0; @@ -17545,7 +17919,7 @@ iD.behavior.drag = function() { }; }; - var d3_event_userSelectProperty = iD.util.prefixCSSProperty("UserSelect"), + var d3_event_userSelectProperty = iD.util.prefixCSSProperty('UserSelect'), d3_event_userSelectSuppress = d3_event_userSelectProperty ? function () { var selection = d3.selection(), @@ -17556,9 +17930,9 @@ iD.behavior.drag = function() { }; } : function (type) { - var w = d3.select(window).on("selectstart." + type, d3_eventCancel); + var w = d3.select(window).on('selectstart.' + type, d3_eventCancel); return function () { - w.on("selectstart." + type, null); + w.on('selectstart.' + type, null); }; }; @@ -17569,12 +17943,12 @@ iD.behavior.drag = function() { touchId = d3.event.touches ? d3.event.changedTouches[0].identifier : null, offset, origin_ = point(), - moved = 0, - selectEnable = d3_event_userSelectSuppress(touchId != null ? "drag-" + touchId : "drag"); + started = false, + selectEnable = d3_event_userSelectSuppress(touchId !== null ? 'drag-' + touchId : 'drag'); var w = d3.select(window) - .on(touchId !== null ? "touchmove.drag-" + touchId : "mousemove.drag", dragmove) - .on(touchId !== null ? "touchend.drag-" + touchId : "mouseup.drag", dragend, true); + .on(touchId !== null ? 'touchmove.drag-' + touchId : 'mousemove.drag', dragmove) + .on(touchId !== null ? 'touchend.drag-' + touchId : 'mouseup.drag', dragend, true); if (origin) { offset = origin.apply(target, arguments); @@ -17598,41 +17972,41 @@ iD.behavior.drag = function() { dx = p[0] - origin_[0], dy = p[1] - origin_[1]; - if (!moved) { + if (!started) { + started = true; event_({ - type: "start" + type: 'start' }); } - moved |= dx | dy; origin_ = p; d3_eventCancel(); event_({ - type: "move", + type: 'move', point: [p[0] + offset[0], p[1] + offset[1]], delta: [dx, dy] }); } function dragend() { - if (moved) { + if (started) { event_({ - type: "end" + type: 'end' }); d3_eventCancel(); - if (d3.event.target === eventTarget) w.on("click.drag", click, true); + if (d3.event.target === eventTarget) w.on('click.drag', click, true); } - w.on(touchId !== null ? "touchmove.drag-" + touchId : "mousemove.drag", null) - .on(touchId !== null ? "touchend.drag-" + touchId : "mouseup.drag", null); + w.on(touchId !== null ? 'touchmove.drag-' + touchId : 'mousemove.drag', null) + .on(touchId !== null ? 'touchend.drag-' + touchId : 'mouseup.drag', null); selectEnable(); } function click() { d3_eventCancel(); - w.on("click.drag", null); + w.on('click.drag', null); } } @@ -17653,13 +18027,13 @@ iD.behavior.drag = function() { }; } - selection.on("mousedown.drag" + selector, delegate) - .on("touchstart.drag" + selector, delegate); + selection.on('mousedown.drag' + selector, delegate) + .on('touchstart.drag' + selector, delegate); } drag.off = function(selection) { - selection.on("mousedown.drag" + selector, null) - .on("touchstart.drag" + selector, null); + selection.on('mousedown.drag' + selector, null) + .on('touchstart.drag' + selector, null); }; drag.delegate = function(_) { @@ -17682,8 +18056,8 @@ iD.behavior.drag = function() { drag.cancel = function() { d3.select(window) - .on("mousemove.drag", null) - .on("mouseup.drag", null); + .on('mousemove.drag', null) + .on('mouseup.drag', null); return drag; }; @@ -17700,7 +18074,7 @@ iD.behavior.drag = function() { return drag; }; - return d3.rebind(drag, event, "on"); + return d3.rebind(drag, event, 'on'); }; iD.behavior.Draw = function(context) { var event = d3.dispatch('move', 'click', 'clickWay', @@ -17728,8 +18102,7 @@ iD.behavior.Draw = function(context) { })[0] : d3.mouse(p); } - var eventTarget = d3.event.target, - element = d3.select(this), + var element = d3.select(this), touchId = d3.event.touches ? d3.event.changedTouches[0].identifier : null, time = +new Date(), pos = point(); @@ -17971,12 +18344,13 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) { // Connect the way to an existing way. drawWay.addWay = function(loc, edge) { + var previousEdge = startIndex ? + [way.nodes[startIndex], way.nodes[startIndex - 1]] : + [way.nodes[0], way.nodes[1]]; // Avoid creating duplicate segments - if (!isArea) { - if (edge[0] === way.nodes[way.nodes.length - 1] || - edge[1] === way.nodes[way.nodes.length - 1]) return; - } + if (!isArea && iD.geo.edgeEqual(edge, previousEdge)) + return; var newNode = iD.Node({ loc: loc }); @@ -18063,7 +18437,7 @@ iD.behavior.Hash = function(context) { var parser = function(map, s) { var q = iD.util.stringQs(s); - var args = (q.map || '').split("/").map(Number); + var args = (q.map || '').split('/').map(Number); if (args.length < 3 || args.some(isNaN)) { return true; // replace bogus hash } else if (s !== formatter(map).slice(1)) { @@ -18118,7 +18492,7 @@ iD.behavior.Hash = function(context) { d3.select(window) .on('hashchange.hash', null); - location.hash = ""; + location.hash = ''; }; return hash; @@ -18132,7 +18506,7 @@ iD.behavior.Hash = function(context) { Only one of these elements can have the :hover pseudo-class, but all of them will have the .hover class. */ -iD.behavior.Hover = function(context) { +iD.behavior.Hover = function() { var dispatch = d3.dispatch('hover'), selection, altDisables, @@ -18206,7 +18580,7 @@ iD.behavior.Hover = function(context) { function mousedown() { down = true; d3.select(window) - .on('mouseup.hover', mouseup) + .on('mouseup.hover', mouseup); } function mouseup() { @@ -18239,7 +18613,7 @@ iD.behavior.Hover = function(context) { d3.select(window) .on('keydown.hover', null) .on('keyup.hover', null) - .on('mouseup.hover', null) + .on('mouseup.hover', null); }; hover.altDisables = function(_) { @@ -18387,25 +18761,25 @@ iD.behavior.Tail = function() { var text, container, xmargin = 25, - tooltip_size = [0, 0], - selection_size = [0, 0], + tooltipSize = [0, 0], + selectionSize = [0, 0], transformProp = iD.util.prefixCSSProperty('Transform'); function tail(selection) { if (!text) return; d3.select(window) - .on('resize.tail', function() { selection_size = selection.dimensions(); }); + .on('resize.tail', function() { selectionSize = selection.dimensions(); }); function show() { container.style('display', 'block'); - tooltip_size = container.dimensions(); + tooltipSize = container.dimensions(); } function mousemove() { if (container.style('display') === 'none') show(); - var xoffset = ((d3.event.clientX + tooltip_size[0] + xmargin) > selection_size[0]) ? - -tooltip_size[0] - xmargin : xmargin; + var xoffset = ((d3.event.clientX + tooltipSize[0] + xmargin) > selectionSize[0]) ? + -tooltipSize[0] - xmargin : xmargin; container.classed('left', xoffset > 0); container.style(transformProp, 'translate(' + (~~d3.event.clientX + xoffset) + 'px,' + @@ -18440,8 +18814,8 @@ iD.behavior.Tail = function() { container .on('mousemove.tail', mousemove); - tooltip_size = container.dimensions(); - selection_size = selection.dimensions(); + tooltipSize = container.dimensions(); + selectionSize = selection.dimensions(); } tail.off = function(selection) { @@ -18628,7 +19002,7 @@ iD.modes.AddPoint = function(context) { .newFeature(true)); } - function addWay(loc, edge) { + function addWay(loc) { add(loc); } @@ -18672,7 +19046,7 @@ iD.modes.Browse = function(context) { }); // Get focus on the body. - if (document.activeElement) { + if (document.activeElement && document.activeElement.blur) { document.activeElement.blur(); } @@ -18806,7 +19180,7 @@ iD.modes.DragNode = function(context) { var d = datum(); if (d.type === 'node' && d.id !== entity.id) { loc = d.loc; - } else if (d.type === 'way') { + } else if (d.type === 'way' && !d3.select(d3.event.sourceEvent.target).classed('fill')) { loc = iD.geo.chooseEdge(context.childNodes(d), context.mouse(), context.projection).loc; } @@ -18866,7 +19240,7 @@ iD.modes.DragNode = function(context) { } var behavior = iD.behavior.drag() - .delegate("g.node, g.point, g.midpoint") + .delegate('g.node, g.point, g.midpoint') .surface(context.surface().node()) .origin(origin) .on('start', start) @@ -19193,18 +19567,12 @@ iD.modes.RotateWay = function(context, wayId) { iD.modes.Save = function(context) { var ui = iD.ui.Commit(context) .on('cancel', cancel) - .on('fix', fix) .on('save', save); function cancel() { context.enter(iD.modes.Browse(context)); } - function fix(d) { - context.map().zoomTo(d.entity); - context.enter(iD.modes.Select(context, [d.entity.id])); - } - function save(e) { var loading = iD.ui.Loading(context) .message(t('save.uploading')) @@ -19263,7 +19631,7 @@ iD.modes.Save = function(context) { context.install(behavior); }); - context.connection().authenticate(function(err) { + context.connection().authenticate(function() { context.ui().sidebar.show(ui); }); }; @@ -19451,6 +19819,11 @@ iD.modes.Select = function(context, selectedIDs) { context.surface() .on('dblclick.select', dblclick); }, 200); + + if (selectedIDs.length > 1) { + var entities = iD.ui.SelectionList(context, selectedIDs); + context.ui().sidebar.show(entities); + } }; mode.exit = function() { @@ -19474,10 +19847,11 @@ iD.modes.Select = function(context, selectedIDs) { context.surface() .call(radialMenu.close) .on('dblclick.select', null) - .selectAll(".selected") + .selectAll('.selected') .classed('selected', false); context.map().on('drawn.select', null); + context.ui().sidebar.hide(); }; return mode; @@ -19509,7 +19883,7 @@ iD.operations.Circularize = function(selectedIDs, context) { t('operations.circularize.description.' + geometry); }; - operation.id = "circularize"; + operation.id = 'circularize'; operation.keys = [t('operations.circularize.key')]; operation.title = t('operations.circularize.title'); @@ -19558,7 +19932,7 @@ iD.operations.Continue = function(selectedIDs, context) { t('operations.continue.description'); }; - operation.id = "continue"; + operation.id = 'continue'; operation.keys = [t('operations.continue.key')]; operation.title = t('operations.continue.title'); @@ -19628,7 +20002,7 @@ iD.operations.Delete = function(selectedIDs, context) { t('operations.delete.description'); }; - operation.id = "delete"; + operation.id = 'delete'; operation.keys = [iD.ui.cmd('⌘⌫'), iD.ui.cmd('⌘⌦')]; operation.title = t('operations.delete.title'); @@ -19665,7 +20039,7 @@ iD.operations.Disconnect = function(selectedIDs, context) { t('operations.disconnect.description'); }; - operation.id = "disconnect"; + operation.id = 'disconnect'; operation.keys = [t('operations.disconnect.key')]; operation.title = t('operations.disconnect.title'); @@ -19717,7 +20091,7 @@ iD.operations.Merge = function(selectedIDs, context) { return t('operations.merge.description'); }; - operation.id = "merge"; + operation.id = 'merge'; operation.keys = [t('operations.merge.key')]; operation.title = t('operations.merge.title'); @@ -19745,7 +20119,7 @@ iD.operations.Move = function(selectedIDs, context) { t('operations.move.description'); }; - operation.id = "move"; + operation.id = 'move'; operation.keys = [t('operations.move.key')]; operation.title = t('operations.move.title'); @@ -19780,7 +20154,7 @@ iD.operations.Orthogonalize = function(selectedIDs, context) { t('operations.orthogonalize.description.' + geometry); }; - operation.id = "orthogonalize"; + operation.id = 'orthogonalize'; operation.keys = [t('operations.orthogonalize.key')]; operation.title = t('operations.orthogonalize.title'); @@ -19808,7 +20182,7 @@ iD.operations.Reverse = function(selectedIDs, context) { return t('operations.reverse.description'); }; - operation.id = "reverse"; + operation.id = 'reverse'; operation.keys = [t('operations.reverse.key')]; operation.title = t('operations.reverse.title'); @@ -19835,7 +20209,7 @@ iD.operations.Rotate = function(selectedIDs, context) { return t('operations.rotate.description'); }; - operation.id = "rotate"; + operation.id = 'rotate'; operation.keys = [t('operations.rotate.key')]; operation.title = t('operations.rotate.title'); @@ -19889,7 +20263,7 @@ iD.operations.Split = function(selectedIDs, context) { } }; - operation.id = "split"; + operation.id = 'split'; operation.keys = [t('operations.split.key')]; operation.title = t('operations.split.title'); @@ -19923,7 +20297,7 @@ iD.operations.Straighten = function(selectedIDs, context) { t('operations.straighten.description'); }; - operation.id = "straighten"; + operation.id = 'straighten'; operation.keys = [t('operations.straighten.key')]; operation.title = t('operations.straighten.title'); @@ -19965,7 +20339,7 @@ iD.Connection = function() { }; connection.userURL = function(username) { - return url + "/user/" + username; + return url + '/user/' + username; }; connection.loadFromURL = function(url, callback) { @@ -19983,7 +20357,7 @@ iD.Connection = function() { url + '/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : ''), function(err, entities) { event.load(err, {data: entities}); - if (callback) callback(err, entities && entities[id]); + if (callback) callback(err, entities && _.find(entities, function(e) { return e.id === id; })); }); }; @@ -20068,15 +20442,13 @@ iD.Connection = function() { var root = dom.childNodes[0], children = root.childNodes, - entities = {}; + entities = []; - var i, o, l; - for (i = 0, l = children.length; i < l; i++) { + for (var i = 0, l = children.length; i < l; i++) { var child = children[i], parser = parsers[child.nodeName]; if (parser) { - o = parser(child); - entities[o.id] = o; + entities.push(parser(child)); } } @@ -20246,7 +20618,7 @@ iD.Connection = function() { extent: iD.geo.Extent( projection.invert([x, y + ts]), projection.invert([x + ts, y])) - } + }; }); function bboxUrl(tile) { @@ -20413,13 +20785,53 @@ iD.Difference = function(base, head) { return result; }; - difference.addParents = function(entities) { + difference.summary = function() { + var relevant = {}; - for (var i in entities) { - addParents(head.parentWays(entities[i]), entities); - addParents(head.parentRelations(entities[i]), entities); + function addEntity(entity, graph, changeType) { + relevant[entity.id] = { + entity: entity, + graph: graph, + changeType: changeType + }; } - return entities; + + function addParents(entity) { + var parents = head.parentWays(entity); + for (var j = parents.length - 1; j >= 0; j--) { + var parent = parents[j]; + if (!(parent.id in relevant)) addEntity(parent, head, 'modified'); + } + } + + _.each(changes, function(change) { + if (change.head && change.head.geometry(head) !== 'vertex') { + addEntity(change.head, head, change.base ? 'modified' : 'created'); + + } else if (change.base && change.base.geometry(base) !== 'vertex') { + addEntity(change.base, base, 'deleted'); + + } else if (change.base && change.head) { // modified vertex + var moved = !_.isEqual(change.base.loc, change.head.loc), + retagged = !_.isEqual(change.base.tags, change.head.tags); + + if (moved) { + addParents(change.head); + } + + if (retagged || (moved && change.head.hasInterestingTags())) { + addEntity(change.head, head, 'modified'); + } + + } else if (change.head && change.head.hasInterestingTags()) { // created vertex + addEntity(change.head, head, 'created'); + + } else if (change.base && change.base.hasInterestingTags()) { // deleted vertex + addEntity(change.base, base, 'deleted'); + } + }); + + return d3.values(relevant); }; difference.complete = function(extent) { @@ -20568,18 +20980,12 @@ iD.Entity.prototype = { resolver.parentRelations(this).length > 0; }, - area: function(resolver) { - return resolver.transient(this, 'area', function() { - return d3.geo.area(this.asGeoJSON(resolver, true)); - }); - }, - hasInterestingTags: function() { return _.keys(this.tags).some(function(key) { - return key != 'attribution' && - key != 'created_by' && - key != 'source' && - key != 'odbl' && + return key !== 'attribution' && + key !== 'created_by' && + key !== 'source' && + key !== 'odbl' && key.indexOf('tiger:') !== 0; }); }, @@ -20591,8 +20997,8 @@ iD.Entity.prototype = { iD.data.deprecated.forEach(function(d) { var match = _.pairs(d.old)[0]; tags.forEach(function(t) { - if (t[0] == match[0] && - (t[1] == match[1] || match[1] == '*')) { + if (t[0] === match[0] && + (t[1] === match[1] || match[1] === '*')) { deprecated[t[0]] = t[1]; } }); @@ -20612,17 +21018,10 @@ iD.Graph = function(other, mutable) { this.inherited = true; } else { - if (Array.isArray(other)) { - var entities = {}; - for (var i = 0; i < other.length; i++) { - entities[other[i].id] = other[i]; - } - other = entities; - } this.entities = Object.create({}); this._parentWays = Object.create({}); this._parentRels = Object.create({}); - this.rebase(other || {}); + this.rebase(other || []); } this.transients = {}; @@ -20711,11 +21110,12 @@ iD.Graph.prototype = { // Merging of data only needed if graph is the base graph if (!this.inherited) { - for (i in entities) { - if (!base.entities[i]) { - base.entities[i] = entities[i]; - this._updateCalculated(undefined, entities[i], - base.parentWays, base.parentRels); + for (i = 0; i < entities.length; i++) { + var entity = entities[i]; + if (!base.entities[entity.id]) { + base.entities[entity.id] = entity; + this._updateCalculated(undefined, entity, + base.parentWays, base.parentRels); } } } @@ -20783,7 +21183,6 @@ iD.Graph.prototype = { ways.push(entity.id); parentWays[added[i]] = ways; } - } else if (type === 'node') { } else if (type === 'relation') { @@ -20846,24 +21245,6 @@ iD.Graph.prototype = { return this; }, - hasAllChildren: function(entity) { - // we're only checking changed entities, since we assume fetched data - // must have all children present - var i; - if (this.entities.hasOwnProperty(entity.id)) { - if (entity.type === 'way') { - for (i = 0; i < entity.nodes.length; i++) { - if (!this.entities[entity.nodes[i]]) return false; - } - } else if (entity.type === 'relation') { - for (i = 0; i < entity.members.length; i++) { - if (!this.entities[entity.members[i].id]) return false; - } - } - } - return true; - }, - // Obliterates any existing entities load: function(entities) { var base = this.base(); @@ -20881,7 +21262,7 @@ iD.History = function(context) { var stack, index, tree, imageryUsed = ['Bing'], dispatch = d3.dispatch('change', 'undone', 'redone'), - lock = false; + lock = iD.util.SessionMutex('lock'); function perform(actions) { actions = Array.prototype.slice.call(actions); @@ -20921,17 +21302,11 @@ iD.History = function(context) { }, merge: function(entities, extent) { - - var base = stack[0].graph.base(), - newentities = Object.keys(entities).filter(function(i) { - return !base.entities[i]; - }); - for (var i = 0; i < stack.length; i++) { stack[i].graph.rebase(entities); } - tree.rebase(newentities); + tree.rebase(entities); dispatch.change(undefined, extent); }, @@ -21037,10 +21412,6 @@ iD.History = function(context) { return this.difference().length() > 0; }, - numChanges: function() { - return this.difference().length(); - }, - imageryUsed: function(sources) { if (sources) { imageryUsed = sources; @@ -21116,14 +21487,18 @@ iD.History = function(context) { stack = h.stack.map(function(d) { var entities = {}, entity; - d.modified && d.modified.forEach(function(key) { - entity = allEntities[key]; - entities[entity.id] = entity; - }); + if (d.modified) { + d.modified.forEach(function(key) { + entity = allEntities[key]; + entities[entity.id] = entity; + }); + } - d.deleted && d.deleted.forEach(function(id) { - entities[id] = undefined; - }); + if (d.deleted) { + d.deleted.forEach(function(id) { + entities[id] = undefined; + }); + } return { graph: iD.Graph(stack[0].graph).load(entities), @@ -21152,39 +21527,37 @@ iD.History = function(context) { }, save: function() { - if (!lock) return history; - context.storage(getKey('lock'), null); - context.storage(getKey('saved_history'), this.toJSON() || null); + if (lock.locked()) context.storage(getKey('saved_history'), history.toJSON() || null); return history; }, clearSaved: function() { - if (!lock) return; - context.storage(getKey('saved_history'), null); + if (lock.locked()) context.storage(getKey('saved_history'), null); + return history; }, lock: function() { - if (context.storage(getKey('lock'))) return false; - context.storage(getKey('lock'), true); - lock = true; - return lock; + return lock.lock(); + }, + + unlock: function() { + lock.unlock(); }, // is iD not open in another window and it detects that // there's a history stored in localStorage that's recoverable? restorableChanges: function() { - return lock && !!context.storage(getKey('saved_history')); + return lock.locked() && !!context.storage(getKey('saved_history')); }, // load history from a version stored in localStorage restore: function() { - if (!lock) return; + if (!lock.locked()) return; var json = context.storage(getKey('saved_history')); - if (json) this.fromJSON(json); + if (json) history.fromJSON(json); context.storage(getKey('saved_history', null)); - }, _getKey: getKey @@ -21206,7 +21579,7 @@ iD.Node = iD.Entity.node = function iD_Node() { iD.Node.prototype = Object.create(iD.Entity.prototype); _.extend(iD.Node.prototype, { - type: "node", + type: 'node', extent: function() { return new iD.geo.Extent(this.loc); @@ -21252,12 +21625,8 @@ _.extend(iD.Node.prototype, { asGeoJSON: function() { return { - type: 'Feature', - properties: this.tags, - geometry: { - type: 'Point', - coordinates: this.loc - } + type: 'Point', + coordinates: this.loc }; } }); @@ -21272,7 +21641,7 @@ iD.Relation = iD.Entity.relation = function iD_Relation() { iD.Relation.prototype = Object.create(iD.Entity.prototype); _.extend(iD.Relation.prototype, { - type: "relation", + type: 'relation', members: [], extent: function(resolver) { @@ -21303,7 +21672,7 @@ _.extend(iD.Relation.prototype, { indexedMembers: function() { var result = new Array(this.members.length); for (var i = 0; i < this.members.length; i++) { - result[i] = _.extend({}, this.members[i], {index: i}) + result[i] = _.extend({}, this.members[i], {index: i}); } return result; }, @@ -21404,12 +21773,8 @@ _.extend(iD.Relation.prototype, { return resolver.transient(this, 'GeoJSON', function () { if (this.isMultipolygon()) { return { - type: 'Feature', - properties: this.tags, - geometry: { - type: 'MultiPolygon', - coordinates: this.multipolygon(resolver) - } + type: 'MultiPolygon', + coordinates: this.multipolygon(resolver) }; } else { return { @@ -21423,6 +21788,12 @@ _.extend(iD.Relation.prototype, { }); }, + area: function(resolver) { + return resolver.transient(this, 'area', function() { + return d3.geo.area(this.asGeoJSON(resolver)); + }); + }, + isMultipolygon: function() { return this.tags.type === 'multipolygon'; }, @@ -21499,14 +21870,9 @@ _.extend(iD.Relation.prototype, { return result; } }); -iD.Tree = function(graph) { - +iD.Tree = function(head) { var rtree = rbush(), - head = graph, - queuedCreated = [], - queuedModified = [], - rectangles = {}, - rebased; + rectangles = {}; function extentRectangle(extent) { return [ @@ -21524,90 +21890,69 @@ iD.Tree = function(graph) { return rect; } - function remove(entity) { - rtree.remove(rectangles[entity.id]); - delete rectangles[entity.id]; - } - - function bulkInsert(entities) { - for (var i = 0, rects = []; i < entities.length; i++) { - rects.push(entityRectangle(entities[i])); - } - rtree.load(rects); - } - - function bulkReinsert(entities) { - entities.forEach(remove); - bulkInsert(entities); - } - - var tree = { - - rebase: function(entities) { - for (var i = 0, inserted = []; i < entities.length; i++) { - if (!graph.entities.hasOwnProperty(entities[i])) { - inserted.push(graph.entity(entities[i])); - } + function updateParents(entity, insertions) { + head.parentWays(entity).forEach(function(parent) { + if (rectangles[parent.id]) { + rtree.remove(rectangles[parent.id]); + insertions.push(entityRectangle(parent)); } - bulkInsert(inserted); - rebased = true; - return tree; - }, + }); - intersects: function(extent, g) { + head.parentRelations(entity).forEach(function(parent) { + if (rectangles[parent.id]) { + rtree.remove(rectangles[parent.id]); + insertions.push(entityRectangle(parent)); + } + updateParents(parent, insertions); + }); + } - head = g; + var tree = {}; - if (graph !== head || rebased) { - var diff = iD.Difference(graph, head), - modified = {}; + tree.rebase = function(entities) { + var insertions = []; - diff.modified().forEach(function(d) { - var loc = graph.entities[d.id].loc; - if (!loc || loc[0] !== d.loc[0] || loc[1] !== d.loc[1]) { - modified[d.id] = d; - } - }); + entities.forEach(function(entity) { + if (head.entities.hasOwnProperty(entity.id) || rectangles[entity.id]) + return; - var created = diff.created().concat(queuedCreated); - modified = d3.values(diff.addParents(modified)) - // some parents might be created, not modified - .filter(function(d) { return !!graph.hasEntity(d.id); }) - .concat(queuedModified); - queuedCreated = []; - queuedModified = []; + insertions.push(entityRectangle(entity)); + updateParents(entity, insertions); + }); - var reinserted = [], - inserted = []; + rtree.load(insertions); - modified.forEach(function(d) { - if (head.hasAllChildren(d)) reinserted.push(d); - else queuedModified.push(d); - }); + return tree; + }; - created.forEach(function(d) { - if (head.hasAllChildren(d)) inserted.push(d); - else queuedCreated.push(d); - }); + tree.intersects = function(extent, graph) { + if (graph !== head) { + var diff = iD.Difference(head, graph), + insertions = []; - bulkReinsert(reinserted); - bulkInsert(inserted); + head = graph; - diff.deleted().forEach(remove); + diff.deleted().forEach(function(entity) { + rtree.remove(rectangles[entity.id]); + delete rectangles[entity.id]; + }); - graph = head; - rebased = false; - } + diff.modified().forEach(function(entity) { + rtree.remove(rectangles[entity.id]); + insertions.push(entityRectangle(entity)); + updateParents(entity, insertions); + }); - return rtree.search(extentRectangle(extent)).map(function (rect) { - return graph.entities[rect.id]; + diff.created().forEach(function(entity) { + insertions.push(entityRectangle(entity)); }); - }, - graph: function() { - return graph; + rtree.load(insertions); } + return rtree.search(extentRectangle(extent)).map(function(rect) { + return head.entity(rect.id); + }); }; return tree; @@ -21623,13 +21968,18 @@ iD.Way = iD.Entity.way = function iD_Way() { iD.Way.prototype = Object.create(iD.Entity.prototype); _.extend(iD.Way.prototype, { - type: "way", + type: 'way', nodes: [], extent: function(resolver) { return resolver.transient(this, 'extent', function() { return this.nodes.reduce(function(extent, id) { - return extent.extend(resolver.entity(id).extent(resolver)); + var node = resolver.hasEntity(id); + if (node) { + return extent.extend(node.extent()); + } else { + return extent; + } }, iD.geo.Extent()); }); }, @@ -21725,13 +22075,13 @@ _.extend(iD.Way.prototype, { for (var i = 0; i < this.nodes.length; i++) { var node = this.nodes[i]; - if (node != id && nodes[nodes.length - 1] != node) { + if (node !== id && nodes[nodes.length - 1] !== node) { nodes.push(node); } } // Preserve circularity - if (this.nodes.length > 1 && this.first() === id && this.last() === id && nodes[nodes.length - 1] != nodes[0]) { + if (this.nodes.length > 1 && this.first() === id && this.last() === id && nodes[nodes.length - 1] !== nodes[0]) { nodes.push(nodes[0]); } @@ -21755,41 +22105,46 @@ _.extend(iD.Way.prototype, { return r; }, - asGeoJSON: function(resolver, polygon) { + asGeoJSON: function(resolver) { return resolver.transient(this, 'GeoJSON', function() { + var coordinates = _.pluck(resolver.childNodes(this), 'loc'); + if (this.isArea() && this.isClosed()) { + return { + type: 'Polygon', + coordinates: [coordinates] + }; + } else { + return { + type: 'LineString', + coordinates: coordinates + }; + } + }); + }, + + area: function(resolver) { + return resolver.transient(this, 'area', function() { var nodes = resolver.childNodes(this); - if (this.isArea() && polygon && nodes.length >= 4) { - if (!this.isClosed()) { - nodes = nodes.concat([nodes[0]]); - } + if (!this.isClosed() && nodes.length) { + nodes = nodes.concat([nodes[0]]); + } - var json = { - type: 'Feature', - properties: this.tags, - geometry: { - type: 'Polygon', - coordinates: [_.pluck(nodes, 'loc')] - } - }; + var json = { + type: 'Polygon', + coordinates: [_.pluck(nodes, 'loc')] + }; - // Heuristic for detecting counterclockwise winding order. Assumes - // that OpenStreetMap polygons are not hemisphere-spanning. - if (d3.geo.area(json) > 2 * Math.PI) { - json.geometry.coordinates[0] = json.geometry.coordinates[0].reverse(); - } + var area = d3.geo.area(json); - return json; - } else { - return { - type: 'Feature', - properties: this.tags, - geometry: { - type: 'LineString', - coordinates: _.pluck(nodes, 'loc') - } - }; + // Heuristic for detecting counterclockwise winding order. Assumes + // that OpenStreetMap polygons are not hemisphere-spanning. + if (d3.geo.area(json) > 2 * Math.PI) { + json.coordinates[0] = json.coordinates[0].reverse(); + area = d3.geo.area(json); } + + return isNaN(area) ? 0 : area; }); } }); @@ -21835,6 +22190,8 @@ iD.Background = function(context) { } }); + backgroundSources.unshift(iD.BackgroundSource.None()); + function findSource(id) { return _.find(backgroundSources, function(d) { return d.id && d.id === id; @@ -21847,7 +22204,7 @@ iD.Background = function(context) { q = iD.util.stringQs(location.hash.substring(1)); var id = b.id; - if (!id && b.name === 'Custom') { + if (id === 'custom') { id = 'custom:' + b.template; } @@ -21865,17 +22222,12 @@ iD.Background = function(context) { location.replace('#' + iD.util.qsString(q, true)); - var imageryUsed = []; - if (b.name === 'Custom') { - imageryUsed.push('Custom (' + b.template + ')'); - } else { - imageryUsed.push(b.id || b.name); - } + var imageryUsed = [b.imageryUsed()]; overlayLayers.forEach(function (d) { var source = d.source(); if (!source.isLocatorOverlay()) { - imageryUsed.push(source.id || source.name); + imageryUsed.push(source.imageryUsed()); } }); @@ -21904,7 +22256,7 @@ iD.Background = function(context) { gpx.call(gpxLayer); var overlays = selection.selectAll('.overlay-layer') - .data(overlayLayers, function(d) { return d.source().name }); + .data(overlayLayers, function(d) { return d.source().name(); }); overlays.enter().insert('div', '.layer-data') .attr('class', 'layer-layer overlay-layer'); @@ -21943,7 +22295,7 @@ iD.Background = function(context) { }; background.bing = function() { - background.baseLayerSource(findSource("Bing")); + background.baseLayerSource(findSource('Bing')); }; background.hasGpxLayer = function() { @@ -21954,6 +22306,23 @@ iD.Background = function(context) { return background.hasGpxLayer() && gpxLayer.enable(); }; + function toDom(x) { + return (new DOMParser()).parseFromString(x, 'text/xml'); + } + + background.gpxLayerFiles = function(fileList) { + var f = fileList[0], + reader = new FileReader(); + + reader.onload = function(e) { + gpxLayer.geojson(toGeoJSON.gpx(toDom(e.target.result))); + dispatch.change(); + context.map().pan([0, 0]); + }; + + reader.readAsText(f); + }; + background.zoomToGpxLayer = function() { if (background.hasGpxLayer()) { context.map() @@ -21968,10 +22337,14 @@ iD.Background = function(context) { background.showsLayer = function(d) { return d === baseLayer.source() || - (d.name === 'Custom' && baseLayer.source().name === 'Custom') || + (d.id === 'custom' && baseLayer.source().id === 'custom') || overlayLayers.some(function(l) { return l.source() === d; }); }; + background.overlayLayerSources = function() { + return overlayLayers.map(function (l) { return l.source(); }); + }; + background.toggleOverlayLayer = function(d) { var layer; @@ -22012,12 +22385,9 @@ iD.Background = function(context) { chosen = q.background || q.layer; if (chosen && chosen.indexOf('custom:') === 0) { - background.baseLayerSource(iD.BackgroundSource({ - template: chosen.replace(/^custom:/, ''), - name: 'Custom' - })); + background.baseLayerSource(iD.BackgroundSource.Custom(chosen.replace(/^custom:/, ''))); } else { - background.baseLayerSource(findSource(chosen) || findSource("Bing")); + background.baseLayerSource(findSource(chosen) || findSource('Bing')); } var locator = _.find(backgroundSources, function(d) { @@ -22038,7 +22408,8 @@ iD.Background = function(context) { }; iD.BackgroundSource = function(data) { var source = _.clone(data), - offset = [0, 0]; + offset = [0, 0], + name = source.name; source.scaleExtent = data.scaleExtent || [0, 20]; @@ -22054,6 +22425,14 @@ iD.BackgroundSource = function(data) { return source; }; + source.name = function() { + return name; + }; + + source.imageryUsed = function() { + return source.id || name; + }; + source.url = function(coord) { return data.template .replace('{x}', coord[0]) @@ -22080,7 +22459,7 @@ iD.BackgroundSource = function(data) { }; source.isLocatorOverlay = function() { - return source.name === 'Locator Overlay'; + return name === 'Locator Overlay'; }; source.copyrightNotices = function() {}; @@ -22113,7 +22492,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) { dispatch.change(); }); - var template = "http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z", + var template = 'http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z', subdomains = [0, 1, 2, 3]; bing.url = function(coord) { @@ -22145,12 +22524,40 @@ iD.BackgroundSource.Bing = function(data, dispatch) { }).join(', '); }; - bing.logo = "bing_maps.png"; - bing.terms_url = "http://opengeodata.org/microsoft-imagery-details"; + bing.logo = 'bing_maps.png'; + bing.terms_url = 'http://opengeodata.org/microsoft-imagery-details'; return bing; }; -iD.GpxLayer = function(context, dispatch) { + +iD.BackgroundSource.None = function() { + var source = iD.BackgroundSource({id: 'none', template: ''}); + + source.name = function() { + return t('background.none'); + }; + + source.imageryUsed = function() { + return 'None'; + }; + + return source; +}; + +iD.BackgroundSource.Custom = function(template) { + var source = iD.BackgroundSource({id: 'custom', template: template}); + + source.name = function() { + return t('background.custom'); + }; + + source.imageryUsed = function() { + return 'Custom (' + template + ')'; + }; + + return source; +}; +iD.GpxLayer = function(context) { var projection, gj = {}, enable = true, @@ -22205,10 +22612,6 @@ iD.GpxLayer = function(context, dispatch) { } } - function toDom(x) { - return (new DOMParser()).parseFromString(x, 'text/xml'); - } - render.projection = function(_) { if (!arguments.length) return projection; projection = _; @@ -22247,16 +22650,7 @@ iD.GpxLayer = function(context, dispatch) { d3.event.stopPropagation(); d3.event.preventDefault(); if (!iD.detect().filedrop) return; - var f = d3.event.dataTransfer.files[0], - reader = new FileReader(); - - reader.onload = function(e) { - render.geojson(toGeoJSON.gpx(toDom(e.target.result))); - dispatch.change(); - context.map().pan([0, 0]); - }; - - reader.readAsText(f); + context.background().gpxLayerFiles(d3.event.dataTransfer.files); }) .on('dragenter.localgpx', over) .on('dragexit.localgpx', over) @@ -22282,9 +22676,9 @@ iD.Map = function(context) { points = iD.svg.Points(roundedProjection, context), vertices = iD.svg.Vertices(roundedProjection, context), lines = iD.svg.Lines(projection), - areas = iD.svg.Areas(roundedProjection), + areas = iD.svg.Areas(projection), midpoints = iD.svg.Midpoints(roundedProjection, context), - labels = iD.svg.Labels(roundedProjection, context), + labels = iD.svg.Labels(projection, context), supersurface, surface, mouse, mousemove; @@ -22309,7 +22703,7 @@ iD.Map = function(context) { map.surface = surface = dataLayer.append('svg') .on('mousedown.zoom', function() { - if (d3.event.button == 2) { + if (d3.event.button === 2) { d3.event.stopPropagation(); } }, true) @@ -22480,7 +22874,8 @@ iD.Map = function(context) { var zoom = String(~~map.zoom()); if (surface.attr('data-zoom') !== zoom) { - surface.attr('data-zoom', zoom); + surface.attr('data-zoom', zoom) + .classed('low-zoom', zoom <= 16); } if (!difference) { @@ -22521,7 +22916,7 @@ iD.Map = function(context) { map.mouse = function() { var e = mousemove || d3.event, s; - while (s = e.sourceEvent) e = s; + while ((s = e.sourceEvent)) e = s; return mouse(e); }; @@ -22535,10 +22930,10 @@ iD.Map = function(context) { return map; }; - function setZoom(z, force) { - if (z === map.zoom() && !force) + function setZoom(_, force) { + if (_ === map.zoom() && !force) return false; - var scale = 256 * Math.pow(2, z), + var scale = 256 * Math.pow(2, _), center = pxCenter(), l = pointLocation(center); scale = Math.max(1024, Math.min(256 * Math.pow(2, 24), scale)); @@ -22553,15 +22948,16 @@ iD.Map = function(context) { return true; } - function setCenter(loc) { - var t = projection.translate(), - c = pxCenter(), - ll = projection(loc); - if (ll[0] === c[0] && ll[1] === c[1]) + function setCenter(_) { + var c = map.center(); + if (_[0] === c[0] && _[1] === c[1]) return false; + var t = projection.translate(), + pxC = pxCenter(), + ll = projection(_); projection.translate([ - t[0] - ll[0] + c[0], - t[1] - ll[1] + c[1]]); + t[0] - ll[0] + pxC[0], + t[1] - ll[1] + pxC[1]]); zoom.translate(projection.translate()); return true; } @@ -22645,7 +23041,7 @@ iD.Map = function(context) { d3.timer(function() { if (stop) return true; map.center(iD.geo.interp(from, loc, (t += 1) / 10)); - return t == 10; + return t === 10; }, 20); return map; }; @@ -22757,6 +23153,7 @@ iD.TileLayer = function() { if (source.validZoom(z)) { tile().forEach(function(d) { addSource(d); + if (d[3] === '') return; requests.push(d); if (cache[d[3]] === false && lookUp(d)) { requests.push(addSource(lookUp(d))); @@ -22865,29 +23262,27 @@ iD.svg = { }; }, + Round: function () { + return d3.geo.transform({ + point: function(x, y) { return this.stream.point(Math.floor(x), Math.floor(y)); } + }); + }, + Path: function(projection, graph, polygon) { var cache = {}, - path = d3.geo.path().projection(projection); - - function result(entity) { - if (entity.id in cache) return cache[entity.id]; + round = iD.svg.Round().stream, + clip = d3.geo.clipExtent().extent(projection.clipExtent()).stream, + project = projection.stream, + path = d3.geo.path() + .projection({stream: function(output) { return polygon ? project(round(output)) : project(clip(round(output))); }}); - var buffer = ''; - - path.context({ - beginPath: function() {}, - moveTo: function(x, y) { buffer += 'M' + Math.floor(x) + ',' + Math.floor(y); }, - lineTo: function(x, y) { buffer += 'L' + Math.floor(x) + ',' + Math.floor(y); }, - arc: function() {}, - closePath: function() { buffer += 'Z'; } - }); - - path(entity.asGeoJSON(graph, polygon)); - - return cache[entity.id] = buffer; - } - - return result; + return function(entity) { + if (entity.id in cache) { + return cache[entity.id]; + } else { + return cache[entity.id] = path(entity.asGeoJSON(graph)); // jshint ignore:line + } + }; }, OneWaySegments: function(projection, graph, dt) { @@ -22962,7 +23357,8 @@ iD.svg = { } }; iD.svg.Areas = function(projection) { - // Patterns only work in Firefox when set directly on element + // Patterns only work in Firefox when set directly on element. + // (This is not a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=750632) var patterns = { wetland: 'wetland', beach: 'beach', @@ -22997,7 +23393,8 @@ iD.svg.Areas = function(projection) { var entity = entities[i]; if (entity.geometry(graph) !== 'area') continue; - if (multipolygon = iD.geo.isSimpleMultipolygonOuterMember(entity, graph)) { + multipolygon = iD.geo.isSimpleMultipolygonOuterMember(entity, graph); + if (multipolygon) { areas[multipolygon.id] = { entity: multipolygon.mergeTags(entity.tags), area: Math.abs(entity.area(graph)) @@ -23024,23 +23421,28 @@ iD.svg.Areas = function(projection) { fill: areas }; + var paths = surface.selectAll('.layer-shadow, .layer-stroke, .layer-fill') + .selectAll('path.area') + .filter(filter) + .data(function(layer) { return data[layer]; }, iD.Entity.key); + + // Remove exiting areas first, so they aren't included in the `fills` + // array used for sorting below (https://github.com/systemed/iD/issues/1903). + paths.exit() + .remove(); + + var fills = surface.selectAll('.layer-fill path.area')[0]; + var bisect = d3.bisector(function(node) { return -node.__data__.area(graph); }).left; - var fills = surface.selectAll('.layer-fill path.area')[0]; - function sortedByArea(entity) { if (this.__data__ === 'fill') { return fills[bisect(fills, -entity.area(graph))]; } } - var paths = surface.selectAll('.layer-shadow, .layer-stroke, .layer-fill') - .selectAll('path.area') - .filter(filter) - .data(function(layer) { return data[layer]; }, iD.Entity.key); - paths.enter() .insert('path', sortedByArea) .each(function(entity) { @@ -23056,12 +23458,10 @@ iD.svg.Areas = function(projection) { paths .attr('d', path); - - paths.exit() - .remove(); }; }; iD.svg.Labels = function(projection, context) { + var path = d3.geo.path().projection(projection); // Replace with dict and iterate over entities tags instead? var label_stack = [ @@ -23096,11 +23496,11 @@ iD.svg.Labels = function(projection, context) { var font_sizes = label_stack.map(function(d) { var style = iD.util.getStyle('text.' + d[0] + '.tag-' + d[1]), - m = style && style.cssText.match("font-size: ([0-9]{1,2})px;"); + m = style && style.cssText.match('font-size: ([0-9]{1,2})px;'); if (m) return parseInt(m[1], 10); style = iD.util.getStyle('text.' + d[0]); - m = style && style.cssText.match("font-size: ([0-9]{1,2})px;"); + m = style && style.cssText.match('font-size: ([0-9]{1,2})px;'); if (m) return parseInt(m[1], 10); return default_size; @@ -23153,19 +23553,18 @@ iD.svg.Labels = function(projection, context) { } function drawLineLabels(group, entities, filter, classes, labels) { - var texts = group.selectAll('text.' + classes) .filter(filter) .data(entities, iD.Entity.key); - var tp = texts.enter() + texts.enter() .append('text') .attr('class', function(d, i) { return classes + ' ' + labels[i].classes + ' ' + d.id; }) .append('textPath') .attr('class', 'textpath'); - var tps = texts.selectAll('.textpath') + texts.selectAll('.textpath') .filter(filter) .data(entities, iD.Entity.key) .attr({ @@ -23175,11 +23574,9 @@ iD.svg.Labels = function(projection, context) { .text(iD.util.displayName); texts.exit().remove(); - } function drawLinePaths(group, entities, filter, classes, labels) { - var halos = group.selectAll('path') .filter(filter) .data(entities, iD.Entity.key); @@ -23431,8 +23828,7 @@ iD.svg.Labels = function(projection, context) { } function getAreaLabel(entity, width, height) { - var path = d3.geo.path().projection(projection), - centroid = path.centroid(entity.asGeoJSON(graph, true)), + var centroid = path.centroid(entity.asGeoJSON(graph, true)), extent = entity.extent(graph), entitywidth = projection(extent[1])[0] - projection(extent[0])[0], rect; @@ -23769,7 +24165,7 @@ iD.svg.Restrictions = function(context) { } drawRestrictions.turns = function (graph, selectedIDs) { - if (selectedIDs.length != 1) + if (selectedIDs.length !== 1) return []; var from = graph.entity(selectedIDs[0]); @@ -23810,7 +24206,7 @@ iD.svg.Restrictions = function(context) { to: to, restriction: restriction, angle: Math.atan2(b[1] - a[1], b[0] - a[0]) - } + }; }; return drawRestrictions; @@ -23838,7 +24234,7 @@ iD.svg.Surface = function(context) { .data(data) .enter().append('use') .attr('id', function(d) { return d.key; }) - .attr('transform', function(d) { return "translate(-" + d.value[0] + ",-" + d.value[1] + ")"; }) + .attr('transform', function(d) { return 'translate(-' + d.value[0] + ',-' + d.value[1] + ')'; }) .attr('xlink:href', '#' + id); }; } @@ -23934,11 +24330,15 @@ iD.svg.Surface = function(context) { }; }; iD.svg.TagClasses = function() { - var keys = d3.set([ - 'highway', 'railway', 'waterway', 'power', 'motorway', 'amenity', - 'natural', 'landuse', 'building', 'oneway', 'bridge', 'boundary', - 'tunnel', 'leisure', 'construction', 'place', 'aeroway' - ]), tagClassRe = /^tag-/, + var primary = [ + 'highway', 'railway', 'waterway', 'aeroway', 'motorway', + 'boundary', 'power', 'amenity', 'natural', 'landuse', + 'building', 'leisure', 'place' + ], + secondary = [ + 'oneway', 'bridge', 'tunnel', 'construction' + ], + tagClassRe = /^tag-/, tags = function(entity) { return entity.tags; }; var tagClasses = function(selection) { @@ -23951,10 +24351,21 @@ iD.svg.TagClasses = function() { return name.length && !tagClassRe.test(name); }).join(' '); - var t = tags(entity); - for (var k in t) { - if (!keys.has(k) || t[k] === 'no') continue; - classes += ' tag-' + k + ' tag-' + k + '-' + t[k]; + var t = tags(entity), i, k, v; + + for (i = 0; i < primary.length; i++) { + k = primary[i]; + v = t[k]; + if (!v || v === 'no') continue; + classes += ' tag-' + k + ' tag-' + k + '-' + v; + break; + } + + for (i = 0; i < secondary.length; i++) { + k = secondary[i]; + v = t[k]; + if (!v || v === 'no') continue; + classes += ' tag-' + k + ' tag-' + k + '-' + v; } classes = classes.trim(); @@ -24035,9 +24446,10 @@ iD.svg.Vertices = function(projection, context) { var icons = {}; function icon(entity) { if (entity.id in icons) return icons[entity.id]; - return icons[entity.id] = (zoom !== 0 && + icons[entity.id] = zoom !== 0 && entity.hasInterestingTags() && - context.presets().match(entity, graph).icon); + context.presets().match(entity, graph).icon; + return icons[entity.id]; } function circle(klass) { @@ -24050,7 +24462,7 @@ iD.svg.Vertices = function(projection, context) { this.setAttribute('cx', c); this.setAttribute('cy', -c); this.setAttribute('r', r); - } + }; } var enter = groups.enter().append('g') @@ -24095,7 +24507,7 @@ iD.svg.Vertices = function(projection, context) { if (entity.id in selected || entity.hasInterestingTags() || entity.isIntersection(graph)) { - vertices.push(entity) + vertices.push(entity); } } @@ -24124,8 +24536,7 @@ iD.svg.Vertices = function(projection, context) { }; iD.ui = function(context) { function render(container) { - var history = context.history(), - map = context.map(); + var map = context.map(); if (iD.detect().opera) container.classed('opera', true); @@ -24153,7 +24564,7 @@ iD.ui = function(context) { .attr('id', 'map') .call(map); - var spacer = bar.append('div') + bar.append('div') .attr('class', 'spacer col4'); var limiter = bar.append('div') @@ -24175,14 +24586,12 @@ iD.ui = function(context) { .attr('class', 'spinner') .call(iD.ui.Spinner(context)); - content.append('div') - .attr('class', 'attribution') - .attr('tabindex', -1) + content .call(iD.ui.Attribution(context)); content.append('div') .style('display', 'none') - .attr('class', 'help-wrap fillL col5 content'); + .attr('class', 'help-wrap map-overlay fillL col5 content'); var controls = bar.append('div') .attr('class', 'map-controls'); @@ -24250,6 +24659,10 @@ iD.ui = function(context) { return context.save(); }; + window.onunload = function() { + context.history().unlock(); + }; + d3.select(window).on('resize.editor', function() { map.dimensions(m.dimensions()); }); @@ -24363,20 +24776,28 @@ iD.ui.Account = function(context) { iD.ui.Attribution = function(context) { var selection; - function update() { - if (!context.background().baseLayerSource()) { - selection.html(''); - return; - } + function attribution(data, klass) { + var div = selection.selectAll('.' + klass) + .data([0]); + + div.enter() + .append('div') + .attr('class', klass); - var attribution = selection.selectAll('.provided-by') - .data([context.background().baseLayerSource()], function(d) { return d.name; }); + var background = div.selectAll('.attribution') + .data(data, function(d) { return d.name(); }); - attribution.enter() + background.enter() .append('span') - .attr('class', 'provided-by') + .attr('class', 'attribution') .each(function(d) { - var source = d.terms_text || d.id || d.name; + if (d.terms_html) { + d3.select(this) + .html(d.terms_html); + return; + } + + var source = d.terms_text || d.id || d.name(); if (d.logo) { source = ''; @@ -24394,10 +24815,10 @@ iD.ui.Attribution = function(context) { } }); - attribution.exit() + background.exit() .remove(); - var copyright = attribution.selectAll('.copyright-notice') + var copyright = background.selectAll('.copyright-notice') .data(function(d) { var notice = d.copyrightNotices(context.map().zoom(), context.map().extent()); return notice ? [notice] : []; @@ -24413,6 +24834,13 @@ iD.ui.Attribution = function(context) { .remove(); } + function update() { + attribution([context.background().baseLayerSource()], 'base-layer-attribution'); + attribution(context.background().overlayLayerSources().filter(function (s) { + return s.validZoom(context.map().zoom()); + }), 'overlay-layer-attribution'); + } + return function(select) { selection = select; @@ -24427,15 +24855,18 @@ iD.ui.Attribution = function(context) { }; iD.ui.Background = function(context) { var key = 'b', - opacities = [1, 0.5, 0], + opacities = [1, 0.75, 0.5, 0.25], directions = [ ['left', [1, 0]], ['top', [0, -1]], ['right', [-1, 0]], ['bottom', [0, 1]]], - opacityDefault = (context.storage('background-opacity') != undefined) ? + opacityDefault = (context.storage('background-opacity') !== null) ? (+context.storage('background-opacity')) : 0.5; + // Can be 0 from <1.3.0 use or due to issue #1923. + if (opacityDefault === 0) opacityDefault = 0.5; + function background(selection) { function setOpacity(d) { @@ -24455,7 +24886,7 @@ iD.ui.Background = function(context) { return context.background().showsLayer(d); } - content.selectAll('label.layer, label.custom_layer') + content.selectAll('.layer, .custom_layer') .classed('active', active) .selectAll('input') .property('checked', active); @@ -24470,14 +24901,13 @@ iD.ui.Background = function(context) { function clickCustom() { d3.event.preventDefault(); var template = window.prompt(t('background.custom_prompt')); - if (!template) { + if (!template || template.indexOf('google.com') !== -1 || + template.indexOf('googleapis.com') !== -1 || + template.indexOf('google.ru') !== -1) { selectLayer(); return; } - context.background().baseLayerSource(iD.BackgroundSource({ - template: template, - name: 'Custom' - })); + context.background().baseLayerSource(iD.BackgroundSource.Custom(template)); selectLayer(); } @@ -24497,33 +24927,33 @@ iD.ui.Background = function(context) { .sources(context.map().extent()) .filter(filter); - var layerLinks = layerList.selectAll('label.layer') - .data(sources, function(d) { return d.name; }); + var layerLinks = layerList.selectAll('li.layer') + .data(sources, function(d) { return d.name(); }); - var layerInner = layerLinks.enter() - .insert('label', '.custom_layer') + var enter = layerLinks.enter() + .insert('li', '.custom_layer') .attr('class', 'layer'); // only set tooltips for layers with tooltips - layerInner - .filter(function(d) { return d.description; }) + enter.filter(function(d) { return d.description; }) .call(bootstrap.tooltip() .title(function(d) { return d.description; }) - .placement('left')); + .placement('top')); - layerInner.append('input') + var label = enter.append('label'); + + label.append('input') .attr('type', type) .attr('name', 'layers') - .attr('value', function(d) { return d.name; }) .on('change', change); - layerInner.append('span') - .text(function(d) { return d.name; }); + label.append('span') + .text(function(d) { return d.name(); }); layerLinks.exit() .remove(); - layerList.style('display', layerList.selectAll('label.layer').data().length > 0 ? 'block' : 'none'); + layerList.style('display', layerList.selectAll('li.layer').data().length > 0 ? 'block' : 'none'); } function update() { @@ -24564,7 +24994,7 @@ iD.ui.Background = function(context) { } var content = selection.append('div') - .attr('class', 'fillL map-overlay content hide'), + .attr('class', 'fillL map-overlay col3 content hide'), tooltip = bootstrap.tooltip() .placement('left') .html(true) @@ -24575,9 +25005,7 @@ iD.ui.Background = function(context) { function toggle() { if (d3.event) d3.event.preventDefault(); tooltip.hide(button); - var visible = !button.classed('active'); - setVisible(visible); - if (visible) content.selectAll('.toggle-list label:first-child').node().focus(); + setVisible(!button.classed('active')); } function setVisible(show) { @@ -24590,16 +25018,16 @@ iD.ui.Background = function(context) { return d3.event.stopPropagation(); }); content.style('display', 'block') - .style('left', '0px') + .style('right', '-300px') .transition() .duration(200) - .style('left', '-260px'); + .style('right', '0px'); } else { content.style('display', 'block') - .style('left', '-260px') + .style('right', '0px') .transition() .duration(200) - .style('left', '0px') + .style('right', '-300px') .each('end', function() { d3.select(this).style('display', 'none'); }); @@ -24634,66 +25062,82 @@ iD.ui.Background = function(context) { return t('background.percent_brightness', { opacity: (d * 100) }); }) .on('click.set-opacity', setOpacity) - .html("
") + .html('
') .call(bootstrap.tooltip() - .placement('top')) + .placement('left')) .append('div') .attr('class', 'opacity') .style('opacity', String); - var backgroundList = content - .append('div') - .attr('class', 'toggle-list layer-list'); + var backgroundList = content.append('ul') + .attr('class', 'layer-list'); - var custom = backgroundList - .append('label') + var custom = backgroundList.append('li') .attr('class', 'custom_layer') - .datum({name: 'Custom'}); + .datum(iD.BackgroundSource.Custom()); + + var label = custom.append('label'); - custom.append('input') + label.append('input') .attr('type', 'radio') .attr('name', 'layers') .on('change', clickCustom); - custom.append('span') + label.append('span') .text(t('background.custom')); - var overlayList = content - .append('div') - .attr('class', 'toggle-list layer-list'); + var overlayList = content.append('ul') + .attr('class', 'layer-list'); - var gpxLayerItem = content - .append('div') + var gpxLayerItem = content.append('ul') .style('display', iD.detect().filedrop ? 'block' : 'none') - .attr('class', 'toggle-list layer-list') - .append('label') + .attr('class', 'layer-list') + .append('li') .classed('layer-toggle-gpx', true); - gpxLayerItem.call(bootstrap.tooltip() - .title(t('gpx.drag_drop')) - .placement('left')); - - gpxLayerItem.append('input') - .attr('type', 'checkbox') - .property('disabled', true) - .on('change', clickGpx); - - gpxLayerItem.append('span') - .text(t('gpx.local_layer')); - - gpxLayerItem - .append('button') - .attr('class', 'minor layer-extent') + gpxLayerItem.append('button') + .attr('class', 'layer-extent') + .call(bootstrap.tooltip() + .title(t('gpx.zoom')) + .placement('left')) .on('click', function() { d3.event.preventDefault(); d3.event.stopPropagation(); context.background().zoomToGpxLayer(); }) .append('span') - .attr('class', 'icon geocode' ); + .attr('class', 'icon geolocate'); - var adjustments = content - .append('div') + gpxLayerItem.append('button') + .attr('class', 'layer-browse') + .call(bootstrap.tooltip() + .title(t('gpx.browse')) + .placement('left')) + .on('click', function() { + d3.select(document.createElement('input')) + .attr('type', 'file') + .on('change', function() { + context.background().gpxLayerFiles(d3.event.target.files); + }) + .node().click(); + }) + .append('span') + .attr('class', 'icon geocode'); + + label = gpxLayerItem.append('label') + .call(bootstrap.tooltip() + .title(t('gpx.drag_drop')) + .placement('top')); + + label.append('input') + .attr('type', 'checkbox') + .property('disabled', true) + .on('change', clickGpx); + + label.append('span') + .text(t('gpx.local_layer')); + + var adjustments = content.append('div') .attr('class', 'adjustments'); adjustments.append('a') @@ -24708,8 +25152,7 @@ iD.ui.Background = function(context) { d3.event.preventDefault(); }); - var nudgeContainer = adjustments - .append('div') + var nudgeContainer = adjustments.append('div') .attr('class', 'nudge-container cf') .style('display', 'none'); @@ -24729,10 +25172,6 @@ iD.ui.Background = function(context) { resetButton.append('div') .attr('class', 'icon undo'); - resetButton.call(bootstrap.tooltip() - .title(t('background.reset')) - .placement('bottom')); - context.map() .on('move.background-update', _.debounce(update, 1000)); update(); @@ -24779,33 +25218,22 @@ iD.ui.cmd = function(code) { return keys.join('+'); }; iD.ui.Commit = function(context) { - var event = d3.dispatch('cancel', 'save', 'fix'), - presets = context.presets(); - - function zipSame(d) { - var c = {}, n = -1; - for (var i = 0; i < d.length; i++) { - var desc = { - name: d[i].tags.name || presets.match(d[i], context.graph()).name(), - geometry: d[i].geometry(context.graph()), - count: 1, - tagText: iD.util.tagText(d[i]) - }; + var event = d3.dispatch('cancel', 'save'); - var fingerprint = desc.name + desc.tagText; - if (c[fingerprint]) { - c[fingerprint].count++; - } else { - c[fingerprint] = desc; + function commit(selection) { + var changes = context.history().changes(), + summary = context.history().difference().summary(); + + function zoomToEntity(change) { + var entity = change.entity; + if (change.changeType !== 'deleted' && + context.graph().entity(entity.id).geometry(context.graph()) !== 'vertex') { + context.map().zoomTo(entity); + context.surface().selectAll( + iD.util.entityOrMemberSelector([entity.id], context.graph())) + .classed('hover', true); } } - return _.values(c); - } - - function commit(selection) { - var changes = context.history().changes(); - - function changesLength(d) { return changes[d].length; } var header = selection.append('div') .attr('class', 'header fillL'); @@ -24870,7 +25298,7 @@ iD.ui.Commit = function(context) { // Confirm Button var saveButton = saveSection.append('button') - .attr('class', 'action col3 button') + .attr('class', 'action col4 button') .on('click.save', function() { event.save({ comment: commentField.node().value @@ -24881,11 +25309,13 @@ iD.ui.Commit = function(context) { .attr('class', 'label') .text(t('commit.save')); + // Warnings var warnings = body.selectAll('div.warning-section') - .data(iD.validate(changes, context.graph())) + .data([iD.validate(changes, context.graph())]) .enter() .append('div') - .attr('class', 'modal-section warning-section fillL2'); + .attr('class', 'modal-section warning-section fillL2') + .style('display', function(d) { return _.isEmpty(d) ? 'none' : null; }); warnings.append('h3') .text(t('commit.warnings')); @@ -24895,52 +25325,90 @@ iD.ui.Commit = function(context) { .selectAll('li') .data(function(d) { return d; }) .enter() - .append('li'); + .append('li') + .on('mouseover', mouseover) + .on('mouseout', mouseout) + .on('click', warningClick); - // only show the fix icon when an entity is given - warningLi.filter(function(d) { return d.entity; }) - .append('button') - .attr('class', 'minor') - .on('click', event.fix) - .append('span') - .attr('class', 'icon warning'); + warningLi.append('span') + .attr('class', 'alert icon icon-pre-text'); warningLi.append('strong').text(function(d) { return d.message; }); - var section = body.selectAll('div.commit-section') - .data(['modified', 'deleted', 'created'].filter(changesLength)) + var changeSection = body.selectAll('div.commit-section') + .data([0]) .enter() .append('div') .attr('class', 'commit-section modal-section fillL2'); - section.append('h3') - .text(function(d) { return t('commit.' + d); }) - .append('small') - .attr('class', 'count') - .text(changesLength); + changeSection.append('h3') + .text(summary.length + ' Changes'); - var li = section.append('ul') + var li = changeSection.append('ul') .attr('class', 'changeset-list') .selectAll('li') - .data(function(d) { return zipSame(changes[d]); }) + .data(summary) .enter() - .append('li'); + .append('li') + .on('mouseover', mouseover) + .on('mouseout', mouseout) + .on('click', zoomToEntity); + + li.append('span') + .attr('class', function(d) { + return d.entity.geometry(d.graph) + ' ' + d.changeType + ' icon icon-pre-text'; + }); + + li.append('span') + .attr('class', 'change-type') + .text(function(d) { + return d.changeType + ' '; + }); li.append('strong') + .attr('class', 'entity-type') .text(function(d) { - return d.geometry + ' '; + return context.presets().match(d.entity, d.graph).name(); }); li.append('span') - .text(function(d) { return d.name; }) - .attr('title', function(d) { return d.tagText; }); + .attr('class', 'entity-name') + .text(function(d) { + var name = iD.util.displayName(d.entity) || '', + string = ''; + if (name !== '') string += ':'; + return string += ' ' + name; + }); - li.filter(function(d) { return d.count > 1; }) - .append('span') - .attr('class', 'count') - .text(function(d) { return d.count; }); + li.style('opacity', 0) + .transition() + .style('opacity', 1); + + li.style('opacity', 0) + .transition() + .style('opacity', 1); + + function mouseover(d) { + if (d.entity) { + context.surface().selectAll( + iD.util.entityOrMemberSelector([d.entity.id], context.graph()) + ).classed('hover', true); + } + } + + function mouseout() { + context.surface().selectAll('.hover') + .classed('hover', false); + } + + function warningClick(d) { + if (d.entity) { + context.map().zoomTo(d.entity); + context.enter(iD.modes.Select(context, [d.entity.id])); + } + } } return d3.rebind(commit, event, 'on'); @@ -24953,16 +25421,16 @@ iD.ui.confirm = function(selection) { var section = modal.select('.content'); - var modalHeader = section.append('div') + section.append('div') .attr('class', 'modal-section header'); - var description = section.append('div') + section.append('div') .attr('class', 'modal-section message-text'); var buttonwrap = section.append('div') .attr('class', 'modal-section buttons cf'); - var okbutton = buttonwrap.append('button') + buttonwrap.append('button') .attr('class', 'col2 action') .on('click.confirm', function() { modal.remove(); @@ -25356,15 +25824,18 @@ iD.ui.FeatureList = function(context) { } (geocodeResults || []).forEach(function(d) { - result.push({ - id: iD.Entity.id.fromOSM(d.osm_type, d.osm_id), - geometry: d.osm_type === 'relation' ? 'relation' : d.osm_type === 'way' ? 'line' : 'point', - type: (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' '), - name: d.display_name, - extent: new iD.geo.Extent( - [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])], - [parseFloat(d.boundingbox[2]), parseFloat(d.boundingbox[1])]) - }) + // https://github.com/systemed/iD/issues/1890 + if (d.osm_type && d.osm_id) { + result.push({ + id: iD.Entity.id.fromOSM(d.osm_type, d.osm_id), + geometry: d.osm_type === 'relation' ? 'relation' : d.osm_type === 'way' ? 'line' : 'point', + type: (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' '), + name: d.display_name, + extent: new iD.geo.Extent( + [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])], + [parseFloat(d.boundingbox[2]), parseFloat(d.boundingbox[1])]) + }); + } }); return result; @@ -25674,9 +26145,6 @@ iD.ui.Help = function(context) { return d3.event.stopPropagation(); }); - selection.on('mousedown.help-inside', function() { - return d3.event.stopPropagation(); - }); } return help; @@ -25795,13 +26263,13 @@ iD.ui.intro = function(context) { // Load semi-real data used in intro context.connection().toggle(false).flush(); - context.history().save().reset(); + context.history().reset(); introGraph = JSON.parse(iD.introGraph); for (var key in introGraph) { introGraph[key] = iD.Entity(introGraph[key]); } - context.history().merge(iD.Graph().load(introGraph).entities); + context.history().merge(d3.values(iD.Graph().load(introGraph).entities)); context.background().bing(); // Block saving @@ -25837,7 +26305,7 @@ iD.ui.intro = function(context) { navwrap.remove(); d3.select('.background-layer').style('opacity', opacity); context.connection().toggle(true).flush().loadedTiles(loadedTiles); - context.history().reset().merge(baseEntities); + context.history().reset().merge(d3.values(baseEntities)); context.background().baseLayerSource(background); if (history) context.history().fromJSON(history); window.location.replace(hash); @@ -26051,7 +26519,7 @@ iD.ui.modal = function(selection, blocking) { .attr('class', 'modal fillL col6'); shaded.on('click.remove-modal', function() { - if (d3.event.target == this && !blocking) shaded.close(); + if (d3.event.target === this && !blocking) shaded.close(); }); modal.append('button') @@ -26124,12 +26592,12 @@ iD.ui.Modes = function(context) { context.on('enter.editor', function(entered) { buttons.classed('active', function(mode) { return entered.button === mode.button; }); context.container() - .classed("mode-" + entered.id, true); + .classed('mode-' + entered.id, true); }); context.on('exit.editor', function(exited) { context.container() - .classed("mode-" + exited.id, false); + .classed('mode-' + exited.id, false); }); var keybinding = d3.keybinding('mode-buttons'); @@ -26186,11 +26654,7 @@ iD.ui.preset = function(context) { field.input = iD.ui.preset[field.type](field, context) .on('change', event.change); - if (field.type === 'address' || - field.type === 'wikipedia' || - field.type === 'maxspeed') { - field.input.entity(entity); - } + if (field.input.entity) field.input.entity(entity); field.keys = field.keys || [field.key]; @@ -26216,6 +26680,20 @@ iD.ui.preset = function(context) { return t; }; + field.present = function() { + return _.any(field.keys, function(key) { + return tags[key]; + }); + }; + + field.remove = function() { + var t = {}; + field.keys.forEach(function(key) { + t[key] = undefined; + }); + return t; + }; + return field; } @@ -26268,21 +26746,35 @@ iD.ui.preset = function(context) { .attr('for', function(field) { return 'preset-input-' + field.id; }) .text(function(field) { return field.label(); }); - $label.append('button') - .attr('class', 'modified-icon minor') + var wrap = $label.append('div') + .attr('class', 'form-label-button-wrap'); + + wrap.append('button') + .attr('class', 'remove-icon') + .append('span').attr('class', 'icon delete'); + + wrap.append('button') + .attr('class', 'modified-icon') .attr('tabindex', -1) .append('div') .attr('class', 'icon undo'); // Update + $fields.select('.form-label-button-wrap .remove-icon') + .on('click', remove); + $fields.select('.modified-icon') .on('click', revert); $fields + .order() .classed('modified', function(field) { return field.modified(); }) + .classed('present', function(field) { + return field.present(); + }) .each(function(field) { var reference = iD.ui.TagReference({key: field.key}); @@ -26293,7 +26785,7 @@ iD.ui.preset = function(context) { d3.select(this) .call(field.input) .call(reference.body) - .select('.form-label') + .select('.form-label-button-wrap') .call(reference.button); field.input.tags(tags); @@ -26336,6 +26828,12 @@ iD.ui.preset = function(context) { d3.event.preventDefault(); event.change(field.revert()); } + + function remove(field) { + d3.event.stopPropagation(); + d3.event.preventDefault(); + event.change(field.remove()); + } } presets.preset = function(_) { @@ -26532,7 +27030,7 @@ iD.ui.PresetList = function(context) { function drawList(list, presets) { var collection = presets.collection.map(function(preset) { - return preset.members ? CategoryItem(preset) : PresetItem(preset) + return preset.members ? CategoryItem(preset) : PresetItem(preset); }); var items = list.selectAll('.preset-list-item') @@ -26689,7 +27187,7 @@ iD.ui.RadialMenu = function(context, operations) { menu = selection.append('g') .attr('class', 'radial-menu') - .attr('transform', "translate(" + center + ")") + .attr('transform', 'translate(' + center + ')') .attr('opacity', 0); menu.transition() @@ -26723,6 +27221,7 @@ iD.ui.RadialMenu = function(context, operations) { .attr('r', 15) .classed('disabled', function(d) { return d.disabled(); }) .on('click', click) + .on('mousedown', mousedown) .on('mouseover', mouseover) .on('mouseout', mouseout); @@ -26735,6 +27234,10 @@ iD.ui.RadialMenu = function(context, operations) { .append('div') .attr('class', 'tooltip-inner radial-menu-tooltip'); + function mousedown() { + d3.event.stopPropagation(); // https://github.com/systemed/iD/issues/1869 + } + function mouseover(d, i) { var rect = context.surfaceRect(), angle = a0 + i * a, @@ -26795,6 +27298,7 @@ iD.ui.RawMemberEditor = function(context) { var id; function selectMember(d) { + d3.event.preventDefault(); context.enter(iD.modes.Select(context, [d.id])); } @@ -26851,7 +27355,8 @@ iD.ui.RawMemberEditor = function(context) { }); var $enter = $items.enter().append('li') - .attr('class', 'member-row form-field'); + .attr('class', 'member-row form-field') + .classed('member-incomplete', function(d) { return !d.member; }); $enter.each(function(d) { if (d.member) { @@ -26871,7 +27376,7 @@ iD.ui.RawMemberEditor = function(context) { } else { d3.select(this).append('label') - .attr('class', 'form-label member-incomplete') + .attr('class', 'form-label') .text(t('inspector.incomplete')); } }); @@ -26908,6 +27413,7 @@ iD.ui.RawMembershipEditor = function(context) { var id, showBlank; function selectRelation(d) { + d3.event.preventDefault(); context.enter(iD.modes.Select(context, [d.relation.id])); } @@ -26980,7 +27486,7 @@ iD.ui.RawMembershipEditor = function(context) { if (member.id === entity.id) { memberships.push({relation: relation, member: member, index: index}); } - }) + }); }); selection.call(iD.ui.Disclosure() @@ -27413,13 +27919,13 @@ iD.ui.Save = function(context) { var numChanges = 0; context.history().on('change.save', function() { - var _ = history.numChanges(); + var _ = history.difference().summary().length; if (_ === numChanges) return; numChanges = _; tooltip.title(iD.ui.tooltipHtml(t(numChanges > 0 ? - 'save.help' : 'save.no_changes'), key)) + 'save.help' : 'save.no_changes'), key)); button .classed('disabled', numChanges === 0) @@ -27435,6 +27941,75 @@ iD.ui.Save = function(context) { }); }; }; +iD.ui.SelectionList = function(context, selectedIDs) { + + function selectionList(selection) { + selection.classed('selection-list-pane', true); + + var header = selection.append('div') + .attr('class', 'header fillL cf'); + + header.append('h3') + .text(t('inspector.multiselect')); + + var listWrap = selection.append('div') + .attr('class', 'inspector-body'); + + var list = listWrap.append('div') + .attr('class', 'feature-list cf'); + + context.history().on('change.selection-list', drawList); + drawList(); + + function drawList() { + var entities = selectedIDs + .map(function(id) { return context.hasEntity(id); }) + .filter(function(entity) { return entity; }); + + var items = list.selectAll('.feature-list-item') + .data(entities, iD.Entity.key); + + var enter = items.enter().append('button') + .attr('class', 'feature-list-item') + .on('click', function(entity) { + context.enter(iD.modes.Select(context, [entity.id])); + }); + + // Enter + + var label = enter.append('div') + .attr('class', 'label'); + + label.append('span') + .attr('class', 'icon icon-pre-text'); + + label.append('span') + .attr('class', 'entity-type'); + + label.append('span') + .attr('class', 'entity-name'); + + // Update + + items.selectAll('.icon') + .attr('class', function(entity) { return context.geometry(entity.id) + ' icon icon-pre-text'; }); + + items.selectAll('.entity-type') + .text(function(entity) { return context.presets().match(entity, context.graph()).name(); }); + + items.selectAll('.entity-name') + .text(function(entity) { return iD.util.displayName(entity); }); + + // Exit + + items.exit() + .remove(); + } + } + + return selectionList; + +}; iD.ui.Sidebar = function(context) { var inspector = iD.ui.Inspector(context), current; @@ -27669,13 +28244,13 @@ iD.ui.Success = function(context) { .attr('class', 'fr') .append('span') .attr('class', 'icon close') - .on('click', function() { event.cancel(success) }); + .on('click', function() { event.cancel(success); }); header.append('h3') .text(t('success.just_edited')); var body = selection.append('div') - .attr('class', 'body save-success'); + .attr('class', 'body save-success fillL'); body.append('p') .html(t('success.help_html')); @@ -27766,7 +28341,7 @@ iD.ui.TagReference = function(tag) { body .append('img') .attr('class', 'wiki-image') - .attr('src', docs.image.thumb_url_prefix + "100" + docs.image.thumb_url_suffix) + .attr('src', docs.image.thumb_url_prefix + '100' + docs.image.thumb_url_suffix) .on('load', function() { show(); }) .on('error', function() { d3.select(this).remove(); show(); }); } else { @@ -27819,7 +28394,7 @@ iD.ui.TagReference = function(tag) { var enter = button.enter().append('button') .attr('tabindex', -1) - .attr('class', 'tag-reference-button minor'); + .attr('class', 'tag-reference-button'); enter.append('span') .attr('class', 'icon inspect'); @@ -28010,9 +28585,8 @@ iD.ui.Zoom = function(context) { .call(keybinding); }; }; -iD.ui.preset.access = function(field, context) { +iD.ui.preset.access = function(field) { var event = d3.dispatch('change'), - entity, items; function access(selection) { @@ -28064,7 +28638,7 @@ iD.ui.preset.access = function(field, context) { access.options = function(type) { var options = ['no', 'permissive', 'private', 'designated', 'destination']; - if (type != 'access') { + if (type !== 'access') { options.unshift('yes'); } @@ -28076,18 +28650,84 @@ iD.ui.preset.access = function(field, context) { }); }; - access.entity = function(_) { - if (!arguments.length) return entity; - entity = _; - return access; + var placeholders = { + footway: { + foot: 'yes', + motor_vehicle: 'no' + }, + steps: { + foot: 'yes', + motor_vehicle: 'no' + }, + pedestrian: { + foot: 'yes', + motor_vehicle: 'no' + }, + cycleway: { + bicycle: 'yes', + motor_vehicle: 'no' + }, + bridleway: { + horse: 'yes' + }, + path: { + motor_vehicle: 'no' + }, + motorway: { + motor_vehicle: 'yes' + }, + trunk: { + motor_vehicle: 'yes' + }, + primary: { + motor_vehicle: 'yes' + }, + secondary: { + motor_vehicle: 'yes' + }, + tertiary: { + motor_vehicle: 'yes' + }, + residential: { + motor_vehicle: 'yes' + }, + unclassified: { + motor_vehicle: 'yes' + }, + service: { + motor_vehicle: 'yes' + }, + motorway_link: { + motor_vehicle: 'yes' + }, + trunk_link: { + motor_vehicle: 'yes' + }, + primary_link: { + motor_vehicle: 'yes' + }, + secondary_link: { + motor_vehicle: 'yes' + }, + tertiary_link: { + motor_vehicle: 'yes' + } }; access.tags = function(tags) { items.selectAll('.preset-input-access') .value(function(d) { return tags[d] || ''; }) - .attr('placeholder', function(d) { - return d !== 'access' && tags.access ? tags.access : field.placeholder(); + .attr('placeholder', function() { + return tags.access ? tags.access : field.placeholder(); }); + + items.selectAll('#preset-input-access-access') + .attr('placeholder', 'yes'); + + _.forEach(placeholders[tags.highway], function(value, key) { + items.selectAll('#preset-input-access-' + key) + .attr('placeholder', value); + }); }; access.focus = function() { @@ -28107,7 +28747,6 @@ iD.ui.preset.address = function(field, context) { entity; function getStreets() { - var extent = entity.extent(context.graph()), l = extent.center(), box = iD.geo.Extent(l).padByMeters(200); @@ -28133,6 +28772,62 @@ iD.ui.preset.address = function(field, context) { } } + function getCities() { + var extent = entity.extent(context.graph()), + l = extent.center(), + box = iD.geo.Extent(l).padByMeters(200); + + return context.intersects(box) + .filter(isAddressable) + .map(function(d) { + return { + title: d.tags['addr:city'] || d.tags.name, + value: d.tags['addr:city'] || d.tags.name, + dist: iD.geo.sphericalDistance(d.extent(context.graph()).center(), l) + }; + }).sort(function(a, b) { + return a.dist - b.dist; + }); + + function isAddressable(d) { + if (d.tags.name && + (d.tags.admin_level === '8' || d.tags.border_type === 'city')) + return true; + + if (d.tags.place && d.tags.name && ( + d.tags.place === 'city' || + d.tags.place === 'town' || + d.tags.place === 'village')) + return true; + + if (d.tags['addr:city']) return true; + + return false; + } + } + + function getPostCodes() { + var extent = entity.extent(context.graph()), + l = extent.center(), + box = iD.geo.Extent(l).padByMeters(200); + + return context.intersects(box) + .filter(isAddressable) + .map(function(d) { + return { + title: d.tags['addr:postcode'], + value: d.tags['addr:postcode'], + dist: iD.geo.sphericalDistance(d.extent(context.graph()).center(), l) + }; + }).sort(function(a, b) { + return a.dist - b.dist; + }); + + function isAddressable(d) { + return d.tags['addr:postcode']; + } + } + function address(selection) { var wrap = selection.selectAll('.preset-input-wrap') .data([0]); @@ -28185,6 +28880,18 @@ iD.ui.preset.address = function(field, context) { .fetcher(function(value, callback) { callback(getStreets()); })); + + city + .call(d3.combobox() + .fetcher(function(value, callback) { + callback(getCities()); + })); + + postcode + .call(d3.combobox() + .fetcher(function(value, callback) { + callback(getPostCodes()); + })); } function change() { @@ -28258,7 +28965,7 @@ iD.ui.preset.check = function(field) { value = tags[field.key]; box.property('indeterminate', !value); box.property('checked', value === 'yes'); - text.text(value || t('inspector.unknown')); + text.text(value ? t('inspector.check.' + value, {default: value}) : t('inspector.unknown')); label.classed('set', !!value); }; @@ -28268,7 +28975,8 @@ iD.ui.preset.check = function(field) { return d3.rebind(check, event, 'on'); }; -iD.ui.preset.combo = function(field) { +iD.ui.preset.combo = +iD.ui.preset.typeCombo = function(field) { var event = d3.dispatch('change'), input; @@ -28313,13 +29021,18 @@ iD.ui.preset.combo = function(field) { } function change() { + var value = input.value().replace(' ', '_'); + if (field.type === 'typeCombo' && !value) value = 'yes'; + var t = {}; - t[field.key] = input.value().replace(' ', '_') || undefined; + t[field.key] = value || undefined; event.change(t); } combo.tags = function(tags) { - input.value(tags[field.key] || ''); + var value = tags[field.key] || ''; + if (field.type === 'typeCombo' && value === 'yes') value = ''; + input.value(value); }; combo.focus = function() { @@ -28380,7 +29093,7 @@ iD.ui.preset.url = function(field) { .on('blur', change) .on('change', change); - if (field.type == 'number') { + if (field.type === 'number') { input.attr('type', 'text'); var spinControl = selection.selectAll('.spin-control') @@ -28427,7 +29140,8 @@ iD.ui.preset.localized = function(field, context) { var event = d3.dispatch('change'), wikipedia = iD.wikipedia(), - input, localizedInputs, wikiTitles; + input, localizedInputs, wikiTitles, + entity; function i(selection) { input = selection.selectAll('.localized-main') @@ -28443,6 +29157,13 @@ iD.ui.preset.localized = function(field, context) { .on('blur', change) .on('change', change); + if (field.id === 'name') { + var preset = context.presets().match(entity, context.graph()); + input.call(d3.combobox().fetcher( + iD.util.SuggestNames(preset, iD.data.suggestions) + )); + } + var translateButton = selection.selectAll('.localized-add') .data([0]); @@ -28480,35 +29201,38 @@ iD.ui.preset.localized = function(field, context) { function key(lang) { return field.key + ':' + lang; } function changeLang(d) { - var value = d3.select(this).value(), + var lang = d3.select(this).value(), t = {}, language = _.find(iD.data.wikipedia, function(d) { - return d[0].toLowerCase() === value.toLowerCase() || - d[1].toLowerCase() === value.toLowerCase(); + return d[0].toLowerCase() === lang.toLowerCase() || + d[1].toLowerCase() === lang.toLowerCase(); }); - if (language) value = language[2]; + if (language) lang = language[2]; - if (d.lang) { - t[key(d.lang)] = ''; + if (d.lang && d.lang !== lang) { + t[key(d.lang)] = undefined; } - if (d.value) { - t[key(value)] = d.value; - } else if (wikiTitles && wikiTitles[d.lang]) { - t[key(value)] = wikiTitles[d.lang]; + var value = d3.select(this.parentNode) + .selectAll('.localized-value') + .value(); + + if (lang && value) { + t[key(lang)] = value; + } else if (lang && wikiTitles && wikiTitles[d.lang]) { + t[key(lang)] = wikiTitles[d.lang]; } + d.lang = lang; event.change(t); - - d.lang = value; } function changeValue(d) { + if (!d.lang) return; var t = {}; - t[key(d.lang)] = d3.select(this).value() || ''; + t[key(d.lang)] = d3.select(this).value() || undefined; event.change(t); - } function fetcher(value, cb) { @@ -28535,11 +29259,28 @@ iD.ui.preset.localized = function(field, context) { var wrap = d3.select(this); var langcombo = d3.combobox().fetcher(fetcher); - wrap.append('label') + var label = wrap.append('label') .attr('class','form-label') .text(t('translate.localized_translation_label')) .attr('for','localized-lang'); + label.append('button') + .attr('class', 'minor remove') + .on('click', function(d){ + d3.event.preventDefault(); + var t = {}; + t[key(d.lang)] = undefined; + event.change(t); + d3.select(this.parentNode.parentNode) + .style('top','0') + .style('max-height','240px') + .transition() + .style('opacity', '0') + .style('max-height','0px') + .remove(); + }) + .append('span').attr('class', 'icon delete'); + wrap.append('input') .attr('class', 'localized-lang') .attr('type', 'text') @@ -28554,23 +29295,6 @@ iD.ui.preset.localized = function(field, context) { .attr('type', 'text') .attr('placeholder', t('translate.localized_translation_name')) .attr('class', 'localized-value'); - - wrap.append('button') - .attr('class', 'minor button-input-action remove') - .on('click', function(d) { - d3.event.preventDefault(); - var t = {}; - t[key(d.lang)] = undefined; - event.change(t); - d3.select(this.parentNode) - .style('top','0') - .style('max-height','240px') - .transition() - .style('opacity', '0') - .style('max-height','0px') - .remove(); - }) - .append('span').attr('class', 'icon delete'); }); innerWrap @@ -28596,16 +29320,16 @@ iD.ui.preset.localized = function(field, context) { .style('top','-10px') .remove(); - selection.selectAll('.entry').select('.localized-lang').value(function(d) { - var lang = _.find(iD.data.wikipedia, function(lang) { - return lang[2] === d.lang; + var entry = selection.selectAll('.entry'); + + entry.select('.localized-lang') + .value(function(d) { + var lang = _.find(iD.data.wikipedia, function(lang) { return lang[2] === d.lang; }); + return lang ? lang[1] : d.lang; }); - return lang ? lang[1] : d.lang; - }); - selection.selectAll('.entry').select('.localized-value').value(function(d) { - return d.value; - }); + entry.select('.localized-value') + .value(function(d) { return d.value; }); } i.tags = function(tags) { @@ -28635,7 +29359,11 @@ iD.ui.preset.localized = function(field, context) { }; i.focus = function() { - title.node().focus(); + input.node().focus(); + }; + + i.entity = function(_) { + entity = _; }; return d3.rebind(i, event, 'on'); @@ -28754,7 +29482,7 @@ iD.ui.preset.maxspeed = function(field, context) { iD.ui.preset.radio = function(field) { var event = d3.dispatch('change'), - labels, radios; + labels, radios, placeholder; function radio(selection) { selection.classed('preset-radio', true); @@ -28765,6 +29493,11 @@ iD.ui.preset.radio = function(field) { var buttonWrap = wrap.enter().append('div') .attr('class', 'preset-input-wrap toggle-list'); + buttonWrap.append('span') + .attr('class', 'placeholder'); + + placeholder = selection.selectAll('.placeholder'); + labels = wrap.selectAll('label') .data(field.options || field.keys); @@ -28781,29 +29514,6 @@ iD.ui.preset.radio = function(field) { radios = labels.selectAll('input') .on('change', change); - - buttonWrap.append('span') - .attr('class', 'placeholder') - .text(field.placeholder()); - - var remove = wrap.selectAll('label.remove') - .data([0]); - - var removeButton = remove.enter().append('label') - .attr('class', 'remove'); - - removeButton.append('span') - .attr('class', 'icon remove'); - - removeButton.append('span') - .text(t('inspector.remove')); - - remove - .on('click', function() { - d3.event.preventDefault(); - radios.property('checked', false); - change(); - }); } function change() { @@ -28831,6 +29541,12 @@ iD.ui.preset.radio = function(field) { labels.classed('active', checked); radios.property('checked', checked); + var selection = radios.filter(function() { return this.checked; }); + if (selection.empty()) { + placeholder.text(t('inspector.none')); + } else { + placeholder.text(selection.attr('value')); + } }; radio.focus = function() { @@ -28878,7 +29594,6 @@ iD.ui.preset.wikipedia = function(field, context) { var event = d3.dispatch('change'), wikipedia = iD.wikipedia(), - language = iD.data.wikipedia[0], link, entity, lang, title; function i(selection) { @@ -28902,7 +29617,7 @@ iD.ui.preset.wikipedia = function(field, context) { if (!value) value = context.entity(entity.id).tags.name || ''; var searchfn = value.length > 7 ? wikipedia.search : wikipedia.suggestions; - searchfn(language && language[2], value, function(query, data) { + searchfn(language()[2], value, function(query, data) { cb(data.map(function(d) { return { value: d }; })); @@ -28914,7 +29629,8 @@ iD.ui.preset.wikipedia = function(field, context) { lang.enter().append('input') .attr('type', 'text') - .attr('class', 'wiki-lang'); + .attr('class', 'wiki-lang') + .value('English'); lang .on('blur', changeLang) @@ -28944,63 +29660,53 @@ iD.ui.preset.wikipedia = function(field, context) { .attr('class', 'icon out-link'); } - function changeLang() { + function language() { var value = lang.value().toLowerCase(); - language = _.find(iD.data.wikipedia, function(d) { + return _.find(iD.data.wikipedia, function(d) { return d[0].toLowerCase() === value || d[1].toLowerCase() === value || d[2].toLowerCase() === value; }) || iD.data.wikipedia[0]; + } - if (value !== language[0]) { - lang.value(language[1]); - } - + function changeLang() { + lang.value(language()[1]); change(); } function change() { - var t = {}; - - var value = title.value(); - - var m = value.match('http://([a-z]+)\\.wikipedia.org/wiki/(.*)'), - newlanguage = m && m[1] && m[2] && _.find(iD.data.wikipedia, function(d) { - return m[1] === d[2]; - }); + var value = title.value(), + m = value.match(/https?:\/\/([a-z]+)\.wikipedia\.org\/wiki\/(.+)/), + l = m && _.find(iD.data.wikipedia, function(d) { return m[1] === d[2]; }); - if (newlanguage) { + if (l) { // Normalize title http://www.mediawiki.org/wiki/API:Query#Title_normalization value = m[2].replace(/_/g, ' '); value = value.slice(0, 1).toUpperCase() + value.slice(1); - language = newlanguage; - lang.value(language[0]); + lang.value(l[1]); + title.value(value); } - t[field.key] = value ? language[2] + ':' + value : undefined; + var t = {}; + t[field.key] = value ? language()[2] + ':' + value : undefined; event.change(t); - link.attr('href', 'http://' + language[2] + '.wikipedia.org/wiki/' + (value || '')); } i.tags = function(tags) { - var m = tags[field.key] ? tags[field.key].match(/([^:]+):(.+)/) : null; - - var language = m && m[1] && m[2] && _.find(iD.data.wikipedia, function(d) { - return m[1] === d[2]; - }); + var value = tags[field.key] || '', + m = value.match(/([^:]+):(.+)/), + l = m && _.find(iD.data.wikipedia, function(d) { return m[1] === d[2]; }); // value in correct format - if (language) { - lang.value(language[1]); + if (l) { + lang.value(l[1]); title.value(m[2]); link.attr('href', 'http://' + m[1] + '.wikipedia.org/wiki/' + m[2]); // unrecognized value format } else { - lang.value('English'); - title.value(tags[field.key] || ''); - language = iD.data.wikipedia[0]; - link.attr('href', 'http://en.wikipedia.org/wiki/Special:Search?search=' + tags[field.key]); + title.value(value); + link.attr('href', 'http://en.wikipedia.org/wiki/Special:Search?search=' + value); } }; @@ -29108,10 +29814,6 @@ iD.ui.intro.line = function(context, reveal) { title: 'intro.lines.title' }; - function one(target, e, f) { - d3.selection.prototype.one.call(target, e, f); - } - function timeout(f, t) { timeouts.push(window.setTimeout(f, t)); } @@ -29220,7 +29922,7 @@ iD.ui.intro.line = function(context, reveal) { } // selected wrong road type - function retryPreset(mode) { + function retryPreset() { timeout(function() { var preset = d3.select('.entity-editor-pane .preset-list-button'); reveal(preset.node(), t('intro.lines.wrong_preset')); @@ -29843,7 +30545,7 @@ iD.presets.Preset = function(id, preset, fields) { return tags; }; - var applyTags = preset.applyTags || preset.tags; + var applyTags = preset.addTags || preset.tags; preset.applyTags = function(tags, geometry) { tags = _.clone(tags); @@ -29868,7 +30570,7 @@ iD.presets.Preset = function(id, preset, fields) { return preset; }; iD.validate = function(changes, graph) { - var warnings = [], change; + var warnings = []; // https://github.com/openstreetmap/josm/blob/mirror/src/org/ // openstreetmap/josm/data/validation/tests/UnclosedWays.java#L80 @@ -29891,20 +30593,16 @@ iD.validate = function(changes, graph) { } for (var i = 0; i < changes.created.length; i++) { - change = changes.created[i]; + var change = changes.created[i], + geometry = change.geometry(graph); - if (change.geometry(graph) === 'point' && _.isEmpty(change.tags)) { + if ((geometry === 'point' || geometry === 'line' || geometry === 'area') && !change.isUsed(graph)) { warnings.push({ - message: t('validations.untagged_point'), + message: t('validations.untagged_' + geometry), entity: change }); } - if (change.geometry(graph) === 'line' && _.isEmpty(change.tags) && - graph.parentRelations(change).length === 0) { - warnings.push({ message: t('validations.untagged_line'), entity: change }); - } - var deprecatedTags = change.deprecatedTags(); if (!_.isEmpty(deprecatedTags)) { warnings.push({ @@ -29913,11 +30611,7 @@ iD.validate = function(changes, graph) { }), entity: change }); } - if (change.geometry(graph) === 'area' && _.isEmpty(change.tags)) { - warnings.push({ message: t('validations.untagged_area'), entity: change }); - } - - if (change.geometry(graph) === 'line' && tagSuggestsArea(change)) { + if (geometry === 'line' && tagSuggestsArea(change)) { warnings.push({ message: t('validations.tag_suggests_area', {tag: tagSuggestsArea(change)}), entity: change @@ -29925,8 +30619,9 @@ iD.validate = function(changes, graph) { } } - return warnings.length ? [warnings] : []; + return warnings; }; +/* jshint ignore:start */ })(); window.locale = { _current: 'en' }; @@ -32866,6 +33561,777 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "terms_url": "http://wiki.openstreetmap.org/wiki/Fugro", "terms_text": "Fugro Aerial Mapping" }, + { + "name": "Geoimage.at MaxRes", + "type": "tms", + "template": "http://geoimage.openstreetmap.at/4d80de696cd562a63ce463a58a61488d/{zoom}/{x}/{y}.jpg", + "polygon": [ + [ + [ + 16.5073284, + 46.9929304 + ], + [ + 16.283417, + 46.9929304 + ], + [ + 16.135839, + 46.8713046 + ], + [ + 15.9831722, + 46.8190947 + ], + [ + 16.0493278, + 46.655175 + ], + [ + 15.8610387, + 46.7180116 + ], + [ + 15.7592608, + 46.6900933 + ], + [ + 15.5607938, + 46.6796202 + ], + [ + 15.5760605, + 46.6342132 + ], + [ + 15.4793715, + 46.6027553 + ], + [ + 15.4335715, + 46.6516819 + ], + [ + 15.2249267, + 46.6342132 + ], + [ + 15.0468154, + 46.6481886 + ], + [ + 14.9908376, + 46.5887681 + ], + [ + 14.9603042, + 46.6237293 + ], + [ + 14.8534374, + 46.6027553 + ], + [ + 14.8330818, + 46.5012666 + ], + [ + 14.7516595, + 46.4977636 + ], + [ + 14.6804149, + 46.4381781 + ], + [ + 14.6142593, + 46.4381781 + ], + [ + 14.578637, + 46.3785275 + ], + [ + 14.4412369, + 46.4311638 + ], + [ + 14.1613476, + 46.4276563 + ], + [ + 14.1257253, + 46.4767409 + ], + [ + 14.0188585, + 46.4767409 + ], + [ + 13.9119917, + 46.5257813 + ], + [ + 13.8254805, + 46.5047694 + ], + [ + 13.4438134, + 46.560783 + ], + [ + 13.3064132, + 46.5502848 + ], + [ + 13.1283019, + 46.5887681 + ], + [ + 12.8433237, + 46.6132433 + ], + [ + 12.7262791, + 46.6412014 + ], + [ + 12.5125455, + 46.6656529 + ], + [ + 12.3598787, + 46.7040543 + ], + [ + 12.3649676, + 46.7703197 + ], + [ + 12.2886341, + 46.7772902 + ], + [ + 12.2733674, + 46.8852187 + ], + [ + 12.2072118, + 46.8747835 + ], + [ + 12.1308784, + 46.9026062 + ], + [ + 12.1156117, + 46.9998721 + ], + [ + 12.2530119, + 47.0657733 + ], + [ + 12.2123007, + 47.0934969 + ], + [ + 11.9833004, + 47.0449712 + ], + [ + 11.7339445, + 46.9616816 + ], + [ + 11.6321666, + 47.010283 + ], + [ + 11.5405665, + 46.9755722 + ], + [ + 11.4998553, + 47.0068129 + ], + [ + 11.418433, + 46.9651546 + ], + [ + 11.2555884, + 46.9755722 + ], + [ + 11.1130993, + 46.913036 + ], + [ + 11.0418548, + 46.7633482 + ], + [ + 10.8891879, + 46.7598621 + ], + [ + 10.7416099, + 46.7842599 + ], + [ + 10.7059877, + 46.8643462 + ], + [ + 10.5787653, + 46.8399847 + ], + [ + 10.4566318, + 46.8504267 + ], + [ + 10.4769874, + 46.9269392 + ], + [ + 10.3853873, + 46.9894592 + ], + [ + 10.2327204, + 46.8643462 + ], + [ + 10.1207647, + 46.8330223 + ], + [ + 9.8663199, + 46.9408389 + ], + [ + 9.9019422, + 47.0033426 + ], + [ + 9.6831197, + 47.0588402 + ], + [ + 9.6118752, + 47.0380354 + ], + [ + 9.6322307, + 47.128131 + ], + [ + 9.5813418, + 47.1662025 + ], + [ + 9.5406306, + 47.2664422 + ], + [ + 9.6067863, + 47.3492559 + ], + [ + 9.6729419, + 47.369939 + ], + [ + 9.6424085, + 47.4457079 + ], + [ + 9.5660751, + 47.4801122 + ], + [ + 9.7136531, + 47.5282405 + ], + [ + 9.7848976, + 47.5969187 + ], + [ + 9.8357866, + 47.5454185 + ], + [ + 9.9477423, + 47.538548 + ], + [ + 10.0902313, + 47.4491493 + ], + [ + 10.1105869, + 47.3664924 + ], + [ + 10.2428982, + 47.3871688 + ], + [ + 10.1869203, + 47.2698953 + ], + [ + 10.3243205, + 47.2975125 + ], + [ + 10.4820763, + 47.4491493 + ], + [ + 10.4311873, + 47.4869904 + ], + [ + 10.4413651, + 47.5900549 + ], + [ + 10.4871652, + 47.5522881 + ], + [ + 10.5482319, + 47.5351124 + ], + [ + 10.5991209, + 47.5660246 + ], + [ + 10.7568766, + 47.5316766 + ], + [ + 10.8891879, + 47.5454185 + ], + [ + 10.9400769, + 47.4869904 + ], + [ + 10.9960547, + 47.3906141 + ], + [ + 11.2352328, + 47.4422662 + ], + [ + 11.2810328, + 47.3975039 + ], + [ + 11.4235219, + 47.5144941 + ], + [ + 11.5761888, + 47.5076195 + ], + [ + 11.6067221, + 47.5900549 + ], + [ + 11.8357224, + 47.5866227 + ], + [ + 12.003656, + 47.6243647 + ], + [ + 12.2072118, + 47.6037815 + ], + [ + 12.1614117, + 47.6963421 + ], + [ + 12.2581008, + 47.7442718 + ], + [ + 12.2530119, + 47.6792136 + ], + [ + 12.4311232, + 47.7100408 + ], + [ + 12.4921899, + 47.631224 + ], + [ + 12.5685234, + 47.6277944 + ], + [ + 12.6295901, + 47.6894913 + ], + [ + 12.7720792, + 47.6689338 + ], + [ + 12.8331459, + 47.5419833 + ], + [ + 12.975635, + 47.4732332 + ], + [ + 13.0417906, + 47.4938677 + ], + [ + 13.0367017, + 47.5557226 + ], + [ + 13.0977685, + 47.6415112 + ], + [ + 13.0316128, + 47.7100408 + ], + [ + 12.9043905, + 47.7203125 + ], + [ + 13.0061684, + 47.84683 + ], + [ + 12.9451016, + 47.9355501 + ], + [ + 12.8636793, + 47.9594103 + ], + [ + 12.8636793, + 48.0036929 + ], + [ + 12.7517236, + 48.0989418 + ], + [ + 12.8738571, + 48.2109733 + ], + [ + 12.9603683, + 48.2109733 + ], + [ + 13.0417906, + 48.2652035 + ], + [ + 13.1842797, + 48.2990682 + ], + [ + 13.2606131, + 48.2922971 + ], + [ + 13.3980133, + 48.3565867 + ], + [ + 13.4438134, + 48.417418 + ], + [ + 13.4387245, + 48.5523383 + ], + [ + 13.509969, + 48.5860123 + ], + [ + 13.6117469, + 48.5725454 + ], + [ + 13.7287915, + 48.5118999 + ], + [ + 13.7847694, + 48.5725454 + ], + [ + 13.8203916, + 48.6263915 + ], + [ + 13.7949471, + 48.7171267 + ], + [ + 13.850925, + 48.7741724 + ], + [ + 14.0595697, + 48.6633774 + ], + [ + 14.0137696, + 48.6331182 + ], + [ + 14.0748364, + 48.5927444 + ], + [ + 14.2173255, + 48.5961101 + ], + [ + 14.3649034, + 48.5489696 + ], + [ + 14.4666813, + 48.6499311 + ], + [ + 14.5582815, + 48.5961101 + ], + [ + 14.5989926, + 48.6263915 + ], + [ + 14.7211261, + 48.5759124 + ], + [ + 14.7211261, + 48.6868997 + ], + [ + 14.822904, + 48.7271983 + ], + [ + 14.8178151, + 48.777526 + ], + [ + 14.9647227, + 48.7851754 + ], + [ + 14.9893637, + 49.0126611 + ], + [ + 15.1485933, + 48.9950306 + ], + [ + 15.1943934, + 48.9315502 + ], + [ + 15.3063491, + 48.9850128 + ], + [ + 15.3928603, + 48.9850128 + ], + [ + 15.4844604, + 48.9282069 + ], + [ + 15.749083, + 48.8545973 + ], + [ + 15.8406831, + 48.8880697 + ], + [ + 16.0086166, + 48.7808794 + ], + [ + 16.2070835, + 48.7339115 + ], + [ + 16.3953727, + 48.7372678 + ], + [ + 16.4920617, + 48.8110498 + ], + [ + 16.6905286, + 48.7741724 + ], + [ + 16.7057953, + 48.7339115 + ], + [ + 16.8991733, + 48.713769 + ], + [ + 16.9755067, + 48.515271 + ], + [ + 16.8482844, + 48.4511817 + ], + [ + 16.8533733, + 48.3464411 + ], + [ + 16.9551512, + 48.2516513 + ], + [ + 16.9907734, + 48.1498955 + ], + [ + 17.0925513, + 48.1397088 + ], + [ + 17.0823736, + 48.0241182 + ], + [ + 17.1739737, + 48.0207146 + ], + [ + 17.0823736, + 47.8741447 + ], + [ + 16.9856845, + 47.8673174 + ], + [ + 17.0823736, + 47.8092489 + ], + [ + 17.0925513, + 47.7031919 + ], + [ + 16.7414176, + 47.6792136 + ], + [ + 16.7057953, + 47.7511153 + ], + [ + 16.5378617, + 47.7545368 + ], + [ + 16.5480395, + 47.7066164 + ], + [ + 16.4208172, + 47.6689338 + ], + [ + 16.573484, + 47.6175045 + ], + [ + 16.670173, + 47.631224 + ], + [ + 16.7108842, + 47.538548 + ], + [ + 16.6599952, + 47.4491493 + ], + [ + 16.5429506, + 47.3940591 + ], + [ + 16.4615283, + 47.3940591 + ], + [ + 16.4920617, + 47.276801 + ], + [ + 16.425906, + 47.1973317 + ], + [ + 16.4717061, + 47.1489007 + ], + [ + 16.5480395, + 47.1489007 + ], + [ + 16.476795, + 47.0796369 + ], + [ + 16.527684, + 47.0588402 + ] + ] + ], + "terms_text": "geoimage.at", + "id": "geoimage.at" + }, { "name": "Imagerie Drone (Haiti)", "type": "tms", @@ -37777,6 +39243,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," { "name": "Locator Overlay", "type": "tms", + "description": "Shows major features to help orient you.", "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/openstreetmap.map-btyhiati/{zoom}/{x}/{y}.png", "scaleExtent": [ 0, @@ -37806,6 +39273,41 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "template": "http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png", "default": true }, + { + "name": "NLS - Bartholomew Half Inch, 1897-1907", + "type": "tms", + "template": "http://geo.nls.uk/mapdata2/bartholomew/great_britain/{zoom}/{x}/{-y}.png", + "scaleExtent": [ + 0, + 15 + ], + "polygon": [ + [ + [ + -9, + 49.8 + ], + [ + -9, + 61.1 + ], + [ + 1.9, + 61.1 + ], + [ + 1.9, + 49.8 + ], + [ + -9, + 49.8 + ] + ] + ], + "terms_url": "http://geo.nls.uk/maps/", + "terms_text": "National Library of Scotland Historic Maps" + }, { "name": "NLS - OS 1-inch 7th Series 1955-61", "type": "tms", @@ -44031,6 +45533,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "terms_text": "© OpenStreetMap contributors, CC-BY-SA", "default": true }, + { + "name": "OpenStreetMap GPS traces", + "type": "tms", + "description": "Public GPS traces uploaded to OpenStreetMap.", + "template": "http://{switch:a,b,c}.gps-tile.openstreetmap.org/lines/{zoom}/{x}/{y}.png", + "scaleExtent": [ + 0, + 20 + ], + "terms_url": "http://www.openstreetmap.org/copyright", + "terms_text": "© OpenStreetMap contributors", + "terms_html": "© OpenStreetMap contributors. North: South: East: West: ", + "overlay": true + }, { "name": "Pangasinán/Bulacan (Phillipines HiRes)", "type": "tms", @@ -55034,6 +56550,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": { "addr:housenumber": "*" }, + "addTags": {}, "matchScore": 0.2, "name": "Address" }, @@ -55370,6 +56887,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Cafe" }, "amenity/car_rental": { + "icon": "car", "geometry": [ "point", "area" @@ -55383,6 +56901,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Car Rental" }, "amenity/car_sharing": { + "icon": "car", "geometry": [ "point", "area" @@ -55716,7 +57235,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "amenity": "parking" }, "terms": [], - "name": "Parking" + "name": "Car Parking" }, "amenity/pharmacy": { "icon": "pharmacy", @@ -56012,7 +57531,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "visitor centre", "permit center", "permit centre", - "backcountry office" + "backcountry office", + "warden office", + "warden center" ], "tags": { "amenity": "ranger_station" @@ -56105,6 +57626,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "School" }, + "amenity/shelter": { + "fields": [ + "shelter_type" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "shelter" + }, + "terms": [ + "lean-to" + ], + "name": "Shelter" + }, "amenity/swimming_pool": { "geometry": [ "point", @@ -56279,7 +57817,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "geometry": [ "area" - ] + ], + "matchScore": 0.1 }, "barrier": { "geometry": [ @@ -56365,6 +57904,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Ditch" }, "barrier/entrance": { + "icon": "entrance", "geometry": [ "vertex" ], @@ -56536,6 +58076,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Commercial Building" }, "building/entrance": { + "icon": "entrance", "geometry": [ "vertex" ], @@ -56554,7 +58095,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": { "building": "garage" }, - "name": "Garage" + "name": "Garage", + "icon": "warehouse" }, "building/house": { "icon": "building", @@ -56656,6 +58198,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Emergency Phone" }, "entrance": { + "icon": "entrance", "geometry": [ "vertex" ], @@ -56668,6 +58211,39 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ], "name": "Entrance" }, + "footway/crossing": { + "fields": [ + "crossing" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "crossing" + }, + "terms": [ + "crosswalk", + "zebra crossing" + ], + "name": "Crossing" + }, + "footway/sidewalk": { + "fields": [ + "surface", + "lit", + "access" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "footway", + "footway": "sidewalk" + }, + "terms": [], + "name": "Sidewalk" + }, "highway": { "fields": [ "highway" @@ -57514,7 +59090,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "landuse": "farmyard" }, "terms": [], - "name": "Farmyard" + "name": "Farmyard", + "icon": "farm" }, "landuse/forest": { "fields": [ @@ -57635,6 +59212,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Leisure" }, + "leisure/common": { + "geometry": [ + "point", + "area" + ], + "terms": [ + "open space" + ], + "tags": { + "leisure": "common" + }, + "name": "Common" + }, "leisure/dog_park": { "geometry": [ "point", @@ -57644,7 +59234,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": { "leisure": "dog_park" }, - "name": "Dog Park" + "name": "Dog Park", + "icon": "dog-park" }, "leisure/garden": { "icon": "garden", @@ -57845,6 +59436,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Volleyball Court" }, "leisure/playground": { + "icon": "playground", "geometry": [ "point", "area" @@ -57927,7 +59519,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": {}, "geometry": [ "line" - ] + ], + "matchScore": 0.1 }, "man_made": { "fields": [ @@ -57971,7 +59564,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": { "man_made": "lighthouse" }, - "name": "Lighthouse" + "name": "Lighthouse", + "icon": "lighthouse" + }, + "man_made/observation": { + "geometry": [ + "point", + "area" + ], + "terms": [ + "lookout tower", + "fire tower" + ], + "tags": { + "man_made": "tower", + "tower:type": "observation" + }, + "name": "Observation Tower" }, "man_made/pier": { "geometry": [ @@ -58242,6 +59851,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "natural/tree": { "fields": [ + "tree_type", "denotation" ], "icon": "park", @@ -58361,6 +59971,347 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "terms": [], "name": "Office" }, + "office/accountant": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "accountant" + }, + "terms": [], + "name": "Accountant" + }, + "office/administrative": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "administrative" + }, + "terms": [], + "name": "Administrative Office" + }, + "office/architect": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "architect" + }, + "terms": [], + "name": "Architect" + }, + "office/company": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "company" + }, + "terms": [], + "name": "Company Office" + }, + "office/educational_institution": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "educational_institution" + }, + "terms": [], + "name": "Educational Institution" + }, + "office/employment_agency": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "employment_agency" + }, + "terms": [], + "name": "Employment Agency" + }, + "office/estate_agent": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "estate_agent" + }, + "terms": [], + "name": "Real Estate Office" + }, + "office/financial": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "financial" + }, + "terms": [], + "name": "Financial Office" + }, + "office/government": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "government" + }, + "terms": [], + "name": "Government Office" + }, + "office/insurance": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "insurance" + }, + "terms": [], + "name": "Insurance Office" + }, + "office/it": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "it" + }, + "terms": [], + "name": "IT Office" + }, + "office/lawyer": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "lawyer" + }, + "terms": [], + "name": "Law Office" + }, + "office/newspaper": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "newspaper" + }, + "terms": [], + "name": "Newspaper" + }, + "office/ngo": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "ngo" + }, + "terms": [], + "name": "NGO Office" + }, + "office/physician": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "physician" + }, + "terms": [], + "name": "Physician" + }, + "office/political_party": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "political_party" + }, + "terms": [], + "name": "Political Party" + }, + "office/research": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "research" + }, + "terms": [], + "name": "Research Office" + }, + "office/telecommunication": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "telecommunication" + }, + "terms": [], + "name": "Telecom Office" + }, + "office/therapist": { + "icon": "commercial", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "therapist" + }, + "terms": [], + "name": "Therapist" + }, + "office/travel_agent": { + "icon": "suitcase", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "office": "travel_agent" + }, + "terms": [], + "name": "Travel Agency", + "searchable": false + }, "place": { "fields": [ "place" @@ -58465,7 +60416,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": {}, "geometry": [ "point" - ] + ], + "matchScore": 0.1 }, "power": { "geometry": [ @@ -58508,6 +60460,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Power Line", "icon": "power-line" }, + "power/minor_line": { + "geometry": [ + "line" + ], + "tags": { + "power": "minor_line" + }, + "name": "Minor Power Line", + "icon": "power-line" + }, "power/pole": { "geometry": [ "vertex" @@ -58680,6 +60642,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": { "railway": "station" }, + "terms": [ + "train station", + "station" + ], "name": "Railway Station" }, "railway/subway": { @@ -58697,7 +60663,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Subway" }, "railway/subway_entrance": { - "icon": "rail-underground", + "icon": "rail-metro", "geometry": [ "point" ], @@ -58783,7 +60749,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Liquor Store" }, "shop/bakery": { - "icon": "shop", + "icon": "bakery", "fields": [ "address", "building_area", @@ -58908,7 +60874,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Butcher" }, "shop/car": { - "icon": "shop", + "icon": "car", "fields": [ "address", "opening_hours" @@ -58975,7 +60941,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Chemist" }, "shop/clothes": { - "icon": "shop", + "icon": "clothing-store", "fields": [ "address", "building_area", @@ -59339,7 +61305,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Kiosk" }, "shop/laundry": { - "icon": "shop", + "icon": "laundry", "fields": [ "address", "building_area", @@ -59355,6 +61321,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Laundry" }, + "shop/locksmith": { + "icon": "shop", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "keys" + ], + "tags": { + "shop": "locksmith" + }, + "name": "Locksmith" + }, "shop/mall": { "icon": "shop", "fields": [ @@ -59475,7 +61461,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Outdoor Store" }, "shop/pet": { - "icon": "shop", + "icon": "dog-park", "fields": [ "address", "building_area", @@ -59491,6 +61477,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "name": "Pet Store" }, + "shop/photo": { + "icon": "camera", + "fields": [ + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "photo" + }, + "name": "Photography Store" + }, "shop/shoes": { "icon": "shop", "fields": [ @@ -59564,6 +61567,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "five-and-dime", "flea market", "galleria", + "grocery store", "mall", "mart", "outlet", @@ -59600,7 +61604,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Toy Store" }, "shop/travel_agency": { - "icon": "shop", + "icon": "suitcase", "fields": [ "address", "building_area", @@ -59762,7 +61766,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "vertex", "area" ], - "terms": [], + "terms": [ + "camping" + ], "tags": { "tourism": "camp_site" }, @@ -60235,7 +62241,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "tags": {}, "geometry": [ "vertex" - ] + ], + "matchScore": 0.1 }, "waterway": { "fields": [ @@ -60385,9 +62392,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "defaults": { "area": [ "category-landuse", - "building", + "category-building", + "category-water-area", "leisure/park", - "natural/water", "amenity/hospital", "amenity/place_of_worship", "amenity/cafe", @@ -60398,7 +62405,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "category-road", "category-rail", "category-path", - "category-water", + "category-water-line", "power/line", "line" ], @@ -60431,6 +62438,19 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ] }, "categories": { + "category-building": { + "geometry": "area", + "name": "Building", + "icon": "building", + "members": [ + "building/house", + "building/apartments", + "building/commercial", + "building/industrial", + "building/residential", + "building" + ] + }, "category-landuse": { "geometry": "area", "name": "Land Use", @@ -60514,7 +62534,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "type/route" ] }, - "category-water": { + "category-water-area": { + "geometry": "area", + "name": "Water", + "icon": "water", + "members": [ + "natural/water/lake", + "natural/water/pond", + "natural/water/reservoir", + "natural/water" + ] + }, + "category-water-line": { "geometry": "line", "name": "Water", "icon": "category-water", @@ -60614,12 +62645,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "aeroway": { "key": "aeroway", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "amenity": { "key": "amenity", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "artist": { @@ -60644,7 +62675,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "barrier": { "key": "barrier", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "bicycle_parking": { @@ -60659,7 +62690,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "building": { "key": "building", - "type": "combo", + "type": "typeCombo", "label": "Building" }, "building_area": { @@ -60773,7 +62804,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "entrance": { "key": "entrance", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "fax": { @@ -60820,12 +62851,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "highway": { "key": "highway", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "historic": { "key": "historic", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "iata": { @@ -60866,7 +62897,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "landuse": { "key": "landuse", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "lanes": { @@ -60882,7 +62913,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "leisure": { "key": "leisure", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "levels": { @@ -60903,7 +62934,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "man_made": { "key": "man_made", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "maxspeed": { @@ -60920,7 +62951,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "natural": { "key": "natural", - "type": "combo", + "type": "typeCombo", "label": "Natural" }, "network": { @@ -60937,7 +62968,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "office": { "key": "office", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "oneway": { @@ -60990,17 +63021,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "place": { "key": "place", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "power": { "key": "power", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "railway": { "key": "railway", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "ref": { @@ -61075,9 +63106,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "type": "check", "label": "Shelter" }, + "shelter_type": { + "key": "shelter_type", + "type": "combo", + "options": [ + "public_transport", + "picnic_shelter", + "weather_shelter", + "lean_to", + "basic_hut", + "field_shelter", + "rock_shelter" + ], + "label": "Type" + }, "shop": { "key": "shop", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "source": { @@ -61128,7 +63173,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "tourism": { "key": "tourism", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "towertype": { @@ -61146,6 +63191,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "type": "combo", "label": "Trail Visibility" }, + "tree_type": { + "key": "type", + "type": "combo", + "options": [ + "broad_leaved", + "conifer", + "palm" + ], + "label": "Type" + }, "vending": { "key": "vending", "type": "combo", @@ -61158,7 +63213,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "waterway": { "key": "waterway", - "type": "combo", + "type": "typeCombo", "label": "Type" }, "website": { @@ -71072,1310 +73127,1548 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," ] }, "featureIcons": { - "airfield": { + "circle-stroked": { "12": [ - 0, + 42, 0 ], "18": [ - 0, - 14 + 24, + 0 ], "24": [ 0, - 34 + 0 ] }, - "airport": { + "circle": { "12": [ - 0, - 60 + 96, + 0 ], "18": [ - 0, - 74 + 78, + 0 ], "24": [ - 0, - 94 + 54, + 0 ] }, - "alcohol-shop": { + "square-stroked": { "12": [ - 0, - 120 + 150, + 0 ], "18": [ - 0, - 134 + 132, + 0 ], "24": [ - 0, - 154 + 108, + 0 ] }, - "america-football": { + "square": { "12": [ - 0, - 180 + 204, + 0 ], "18": [ - 0, - 194 + 186, + 0 ], "24": [ - 0, - 214 + 162, + 0 ] }, - "art-gallery": { + "triangle-stroked": { "12": [ - 0, - 240 + 258, + 0 ], "18": [ - 0, - 254 + 240, + 0 ], "24": [ - 0, - 274 + 216, + 0 ] }, - "bank": { + "triangle": { "12": [ - 0, - 300 + 42, + 24 ], "18": [ - 0, - 314 + 24, + 24 ], "24": [ 0, - 334 + 24 ] }, - "bar": { + "star-stroked": { "12": [ - 0, - 360 + 96, + 24 ], "18": [ - 0, - 374 + 78, + 24 ], "24": [ - 0, - 394 + 54, + 24 ] }, - "baseball": { + "star": { "12": [ - 0, - 420 + 150, + 24 ], "18": [ - 0, - 434 + 132, + 24 ], "24": [ - 0, - 454 + 108, + 24 ] }, - "basketball": { + "cross": { "12": [ - 0, - 480 + 204, + 24 ], "18": [ - 0, - 494 + 186, + 24 ], "24": [ - 0, - 514 + 162, + 24 ] }, - "beer": { + "marker-stroked": { "12": [ - 0, - 540 + 258, + 24 ], "18": [ - 0, - 554 + 240, + 24 ], "24": [ - 0, - 574 + 216, + 24 ] }, - "bicycle": { + "marker": { "12": [ - 0, - 600 + 42, + 48 ], "18": [ - 0, - 614 + 24, + 48 ], "24": [ 0, - 634 + 48 ] }, - "building": { + "religious-jewish": { "12": [ - 0, - 660 + 96, + 48 ], "18": [ - 0, - 674 + 78, + 48 ], "24": [ - 0, - 694 + 54, + 48 ] }, - "bus": { + "religious-christian": { "12": [ - 0, - 720 + 150, + 48 ], "18": [ - 0, - 734 + 132, + 48 ], "24": [ - 0, - 754 + 108, + 48 ] }, - "cafe": { + "religious-muslim": { "12": [ - 0, - 780 + 204, + 48 ], "18": [ - 0, - 794 + 186, + 48 ], "24": [ - 0, - 814 + 162, + 48 ] }, - "campsite": { + "cemetery": { "12": [ - 0, - 840 + 258, + 48 ], "18": [ - 0, - 854 + 240, + 48 ], "24": [ - 0, - 874 + 216, + 48 ] }, - "cemetery": { + "rocket": { "12": [ - 0, - 900 + 42, + 72 ], "18": [ - 0, - 914 + 24, + 72 ], "24": [ 0, - 934 + 72 ] }, - "cinema": { + "airport": { "12": [ - 0, - 960 + 96, + 72 ], "18": [ - 0, - 974 + 78, + 72 ], "24": [ - 0, - 994 + 54, + 72 ] }, - "circle": { + "heliport": { "12": [ - 0, - 1020 + 150, + 72 ], "18": [ - 0, - 1034 + 132, + 72 ], "24": [ - 0, - 1054 + 108, + 72 ] }, - "circle-stroked": { + "rail": { "12": [ - 0, - 1080 + 204, + 72 ], "18": [ - 0, - 1094 + 186, + 72 ], "24": [ - 0, - 1114 + 162, + 72 ] }, - "city": { + "rail-metro": { "12": [ - 0, - 1140 + 258, + 72 ], "18": [ - 0, - 1154 + 240, + 72 ], "24": [ - 0, - 1174 + 216, + 72 ] }, - "college": { + "rail-light": { "12": [ - 0, - 1200 + 42, + 96 ], "18": [ - 0, - 1214 + 24, + 96 ], "24": [ 0, - 1234 + 96 ] }, - "commercial": { + "bus": { "12": [ - 0, - 1260 + 96, + 96 ], "18": [ - 0, - 1274 + 78, + 96 ], "24": [ - 0, - 1294 + 54, + 96 ] }, - "cricket": { + "fuel": { "12": [ - 0, - 1320 + 150, + 96 ], "18": [ - 0, - 1334 + 132, + 96 ], "24": [ - 0, - 1354 + 108, + 96 ] }, - "cross": { + "parking": { "12": [ - 0, - 1380 + 204, + 96 ], "18": [ - 0, - 1394 + 186, + 96 ], "24": [ - 0, - 1414 + 162, + 96 ] }, - "dam": { + "parking-garage": { "12": [ - 0, - 1440 + 258, + 96 ], "18": [ - 0, - 1454 + 240, + 96 ], "24": [ - 0, - 1474 + 216, + 96 ] }, - "danger": { + "airfield": { "12": [ - 0, - 1500 + 42, + 120 ], "18": [ - 0, - 1514 + 24, + 120 ], "24": [ 0, - 1534 + 120 ] }, - "disability": { + "roadblock": { "12": [ - 0, - 1560 + 96, + 120 ], "18": [ - 0, - 1574 + 78, + 120 ], "24": [ - 0, - 1594 + 54, + 120 ] }, - "embassy": { + "ferry": { "12": [ - 0, - 1620 + 150, + 120 ], "18": [ - 0, - 1634 + 132, + 120 ], "24": [ - 0, - 1654 + 108, + 120 + ], + "line": [ + 2240, + 25 ] }, - "emergency-telephone": { + "harbor": { "12": [ - 0, - 1680 + 204, + 120 ], "18": [ - 0, - 1694 + 186, + 120 ], "24": [ - 0, - 1714 + 162, + 120 ] }, - "farm": { + "bicycle": { "12": [ - 0, - 1740 + 258, + 120 ], "18": [ - 0, - 1754 + 240, + 120 ], "24": [ - 0, - 1774 + 216, + 120 ] }, - "fast-food": { + "park": { "12": [ - 0, - 1800 + 42, + 144 ], "18": [ - 0, - 1814 + 24, + 144 ], "24": [ 0, - 1834 + 144 ] }, - "ferry": { + "park2": { "12": [ - 0, - 1860 + 96, + 144 ], "18": [ - 0, - 1874 + 78, + 144 ], "24": [ - 0, - 1894 - ], - "line": [ - 2240, - 25 + 54, + 144 ] }, - "fire-station": { + "museum": { "12": [ - 0, - 1920 + 150, + 144 ], "18": [ - 0, - 1934 + 132, + 144 ], "24": [ - 0, - 1954 + 108, + 144 ] }, - "fuel": { + "lodging": { "12": [ - 0, - 1980 + 204, + 144 ], "18": [ - 0, - 1994 + 186, + 144 ], "24": [ - 0, - 2014 + 162, + 144 ] }, - "garden": { + "monument": { "12": [ - 0, - 2040 + 258, + 144 ], "18": [ - 0, - 2054 + 240, + 144 ], "24": [ - 0, - 2074 + 216, + 144 ] }, - "golf": { + "zoo": { "12": [ - 0, - 2100 + 42, + 168 ], "18": [ - 0, - 2114 + 24, + 168 ], "24": [ 0, - 2134 + 168 ] }, - "grocery": { + "garden": { "12": [ - 0, - 2160 + 96, + 168 ], "18": [ - 0, - 2174 + 78, + 168 ], "24": [ - 0, - 2194 + 54, + 168 ] }, - "harbor": { + "campsite": { "12": [ - 0, - 2220 + 150, + 168 ], "18": [ - 0, - 2234 + 132, + 168 ], "24": [ - 0, - 2254 + 108, + 168 ] }, - "heliport": { + "theatre": { "12": [ - 0, - 2280 + 204, + 168 ], "18": [ - 0, - 2294 + 186, + 168 ], "24": [ - 0, - 2314 + 162, + 168 ] }, - "hospital": { + "art-gallery": { "12": [ - 0, - 2340 + 258, + 168 ], "18": [ - 0, - 2354 + 240, + 168 ], "24": [ - 0, - 2374 + 216, + 168 ] }, - "industrial": { + "pitch": { "12": [ - 0, - 2400 + 42, + 192 ], "18": [ - 0, - 2414 + 24, + 192 ], "24": [ 0, - 2434 + 192 ] }, - "land-use": { + "soccer": { "12": [ - 0, - 2460 + 96, + 192 ], "18": [ - 0, - 2474 + 78, + 192 ], "24": [ - 0, - 2494 + 54, + 192 ] }, - "library": { + "america-football": { "12": [ - 0, - 2520 + 150, + 192 ], "18": [ - 0, - 2534 + 132, + 192 ], "24": [ - 0, - 2554 + 108, + 192 ] }, - "lodging": { + "tennis": { "12": [ - 0, - 2580 + 204, + 192 ], "18": [ - 0, - 2594 + 186, + 192 ], "24": [ - 0, - 2614 + 162, + 192 ] }, - "logging": { + "basketball": { "12": [ - 0, - 2640 + 258, + 192 ], "18": [ - 0, - 2654 + 240, + 192 ], "24": [ - 0, - 2674 + 216, + 192 ] }, - "marker": { + "baseball": { "12": [ - 0, - 2700 + 42, + 216 ], "18": [ - 0, - 2714 + 24, + 216 ], "24": [ 0, - 2734 + 216 ] }, - "marker-stroked": { + "golf": { "12": [ - 0, - 2760 + 96, + 216 ], "18": [ - 0, - 2774 + 78, + 216 ], "24": [ - 0, - 2794 + 54, + 216 ] }, - "monument": { + "swimming": { "12": [ - 0, - 2820 + 150, + 216 ], "18": [ - 0, - 2834 + 132, + 216 ], "24": [ - 0, - 2854 + 108, + 216 ] }, - "museum": { + "cricket": { "12": [ - 0, - 2880 + 204, + 216 ], "18": [ - 0, - 2894 + 186, + 216 ], "24": [ - 0, - 2914 + 162, + 216 ] }, - "music": { + "skiing": { "12": [ - 0, - 2940 + 258, + 216 ], "18": [ - 0, - 2954 + 240, + 216 ], "24": [ - 0, - 2974 + 216, + 216 ] }, - "oil-well": { + "school": { "12": [ - 0, - 3000 + 42, + 240 ], "18": [ - 0, - 3014 + 24, + 240 ], "24": [ 0, - 3034 + 240 ] }, - "park": { + "college": { "12": [ - 0, - 3060 + 96, + 240 ], "18": [ - 0, - 3074 + 78, + 240 ], "24": [ - 0, - 3094 + 54, + 240 ] }, - "park2": { + "library": { "12": [ - 0, - 3120 + 150, + 240 ], "18": [ - 0, - 3134 + 132, + 240 ], "24": [ - 0, - 3154 + 108, + 240 ] }, - "parking": { + "post": { "12": [ - 0, - 3180 + 204, + 240 ], "18": [ - 0, - 3194 + 186, + 240 ], "24": [ - 0, - 3214 + 162, + 240 ] }, - "parking-garage": { + "fire-station": { "12": [ - 0, - 3240 + 258, + 240 ], "18": [ - 0, - 3254 + 240, + 240 ], "24": [ - 0, - 3274 + 216, + 240 ] }, - "pharmacy": { + "town-hall": { "12": [ - 0, - 3300 + 42, + 264 ], "18": [ - 0, - 3314 + 24, + 264 ], "24": [ 0, - 3334 + 264 ] }, - "pitch": { + "police": { "12": [ - 0, - 3360 + 96, + 264 ], "18": [ - 0, - 3374 + 78, + 264 ], "24": [ - 0, - 3394 + 54, + 264 ] }, - "place-of-worship": { + "prison": { "12": [ - 0, - 3420 + 150, + 264 ], "18": [ - 0, - 3434 + 132, + 264 ], "24": [ - 0, - 3454 + 108, + 264 ] }, - "police": { + "embassy": { "12": [ - 0, - 3480 + 204, + 264 ], "18": [ - 0, - 3494 + 186, + 264 ], "24": [ - 0, - 3514 + 162, + 264 ] }, - "post": { + "beer": { "12": [ - 0, - 3540 + 258, + 264 ], "18": [ - 0, - 3554 + 240, + 264 ], "24": [ - 0, - 3574 + 216, + 264 ] }, - "prison": { + "restaurant": { "12": [ - 0, - 3600 + 42, + 288 ], "18": [ - 0, - 3614 + 24, + 288 ], "24": [ 0, - 3634 + 288 ] }, - "rail": { + "cafe": { "12": [ - 0, - 3660 + 96, + 288 ], "18": [ - 0, - 3674 + 78, + 288 ], "24": [ - 0, - 3694 + 54, + 288 ] }, - "rail-above": { + "shop": { "12": [ - 0, - 3720 + 150, + 288 ], "18": [ - 0, - 3734 + 132, + 288 ], "24": [ - 0, - 3754 + 108, + 288 ] }, - "rail-underground": { + "fast-food": { "12": [ - 0, - 3780 + 204, + 288 ], "18": [ - 0, - 3794 + 186, + 288 ], "24": [ - 0, - 3814 + 162, + 288 ] }, - "religious-christian": { + "bar": { "12": [ - 0, - 3840 + 258, + 288 ], "18": [ - 0, - 3854 + 240, + 288 ], "24": [ - 0, - 3874 + 216, + 288 ] }, - "religious-jewish": { + "bank": { "12": [ - 0, - 3900 + 42, + 312 ], "18": [ - 0, - 3914 + 24, + 312 ], "24": [ 0, - 3934 + 312 ] }, - "religious-muslim": { + "grocery": { "12": [ - 0, - 3960 + 96, + 312 ], "18": [ - 0, - 3974 + 78, + 312 ], "24": [ - 0, - 3994 + 54, + 312 ] }, - "restaurant": { + "cinema": { "12": [ - 0, - 4020 + 150, + 312 ], "18": [ - 0, - 4034 + 132, + 312 ], "24": [ - 0, - 4054 + 108, + 312 ] }, - "roadblock": { + "pharmacy": { "12": [ - 0, - 4080 + 204, + 312 ], "18": [ - 0, - 4094 + 186, + 312 ], "24": [ - 0, - 4114 + 162, + 312 ] }, - "school": { + "hospital": { "12": [ - 0, - 4140 + 258, + 312 ], "18": [ - 0, - 4154 + 240, + 312 ], "24": [ - 0, - 4174 + 216, + 312 ] }, - "shop": { + "danger": { "12": [ - 0, - 4200 + 42, + 336 ], "18": [ - 0, - 4214 + 24, + 336 ], "24": [ 0, - 4234 + 336 ] }, - "skiing": { + "industrial": { "12": [ - 0, - 4260 + 96, + 336 ], "18": [ - 0, - 4274 + 78, + 336 ], "24": [ - 0, - 4294 + 54, + 336 ] }, - "slaughterhouse": { + "warehouse": { "12": [ - 0, - 4320 + 150, + 336 ], "18": [ - 0, - 4334 + 132, + 336 ], "24": [ - 0, - 4354 + 108, + 336 ] }, - "soccer": { + "commercial": { "12": [ - 0, - 4380 + 204, + 336 ], "18": [ - 0, - 4394 + 186, + 336 ], "24": [ - 0, - 4414 + 162, + 336 ] }, - "square": { + "building": { "12": [ - 0, - 4440 + 258, + 336 ], "18": [ - 0, - 4454 + 240, + 336 ], "24": [ - 0, - 4474 + 216, + 336 ] }, - "square-stroked": { + "place-of-worship": { "12": [ - 0, - 4500 + 42, + 360 ], "18": [ - 0, - 4514 + 24, + 360 ], "24": [ 0, - 4534 + 360 ] }, - "star": { + "alcohol-shop": { "12": [ - 0, - 4560 + 96, + 360 ], "18": [ - 0, - 4574 + 78, + 360 ], "24": [ - 0, - 4594 + 54, + 360 ] }, - "star-stroked": { + "logging": { "12": [ - 0, - 4620 + 150, + 360 ], "18": [ - 0, - 4634 + 132, + 360 ], "24": [ - 0, - 4654 + 108, + 360 ] }, - "swimming": { + "oil-well": { "12": [ - 0, - 4680 + 204, + 360 ], "18": [ - 0, - 4694 + 186, + 360 ], "24": [ - 0, - 4714 + 162, + 360 ] }, - "telephone": { + "slaughterhouse": { "12": [ - 0, - 4740 + 258, + 360 ], "18": [ - 0, - 4754 + 240, + 360 ], "24": [ - 0, - 4774 + 216, + 360 ] }, - "tennis": { + "dam": { "12": [ - 0, - 4800 + 42, + 384 ], "18": [ - 0, - 4814 + 24, + 384 ], "24": [ 0, - 4834 + 384 ] }, - "theatre": { + "water": { "12": [ - 0, - 4860 + 96, + 384 ], "18": [ - 0, - 4874 + 78, + 384 + ], + "24": [ + 54, + 384 + ] + }, + "wetland": { + "12": [ + 150, + 384 + ], + "18": [ + 132, + 384 + ], + "24": [ + 108, + 384 + ] + }, + "disability": { + "12": [ + 204, + 384 + ], + "18": [ + 186, + 384 + ], + "24": [ + 162, + 384 + ] + }, + "telephone": { + "12": [ + 258, + 384 + ], + "18": [ + 240, + 384 + ], + "24": [ + 216, + 384 + ] + }, + "emergency-telephone": { + "12": [ + 42, + 408 + ], + "18": [ + 24, + 408 ], "24": [ 0, - 4894 + 408 ] }, "toilets": { "12": [ - 0, - 4920 + 96, + 408 ], "18": [ - 0, - 4934 + 78, + 408 ], "24": [ - 0, - 4954 + 54, + 408 ] }, - "town": { + "waste-basket": { "12": [ - 0, - 4980 + 150, + 408 ], "18": [ - 0, - 4994 + 132, + 408 ], "24": [ - 0, - 5014 + 108, + 408 ] }, - "town-hall": { + "music": { "12": [ - 0, - 5040 + 204, + 408 ], "18": [ - 0, - 5054 + 186, + 408 ], "24": [ - 0, - 5074 + 162, + 408 ] }, - "triangle": { + "land-use": { "12": [ - 0, - 5100 + 258, + 408 ], "18": [ - 0, - 5114 + 240, + 408 ], "24": [ - 0, - 5134 + 216, + 408 ] }, - "triangle-stroked": { + "city": { "12": [ - 0, - 5160 + 42, + 432 ], "18": [ - 0, - 5174 + 24, + 432 ], "24": [ 0, - 5194 + 432 + ] + }, + "town": { + "12": [ + 96, + 432 + ], + "18": [ + 78, + 432 + ], + "24": [ + 54, + 432 ] }, "village": { "12": [ - 0, - 5220 + 150, + 432 ], "18": [ - 0, - 5234 + 132, + 432 ], "24": [ - 0, - 5254 + 108, + 432 ] }, - "warehouse": { + "farm": { "12": [ - 0, - 5280 + 204, + 432 ], "18": [ - 0, - 5294 + 186, + 432 ], "24": [ - 0, - 5314 + 162, + 432 ] }, - "waste-basket": { + "bakery": { "12": [ - 0, - 5340 + 258, + 432 ], "18": [ - 0, - 5354 + 240, + 432 ], "24": [ - 0, - 5374 + 216, + 432 ] }, - "water": { + "dog-park": { "12": [ - 0, - 5400 + 42, + 456 ], "18": [ - 0, - 5414 + 24, + 456 ], "24": [ 0, - 5434 + 456 ] }, - "wetland": { + "lighthouse": { "12": [ - 0, - 5460 + 96, + 456 ], "18": [ - 0, - 5474 + 78, + 456 ], "24": [ - 0, - 5494 + 54, + 456 ] }, - "zoo": { + "clothing-store": { "12": [ - 0, - 5520 + 150, + 456 ], "18": [ + 132, + 456 + ], + "24": [ + 108, + 456 + ] + }, + "polling-place": { + "12": [ + 204, + 456 + ], + "18": [ + 186, + 456 + ], + "24": [ + 162, + 456 + ] + }, + "playground": { + "12": [ + 258, + 456 + ], + "18": [ + 240, + 456 + ], + "24": [ + 216, + 456 + ] + }, + "entrance": { + "12": [ + 42, + 480 + ], + "18": [ + 24, + 480 + ], + "24": [ 0, - 5534 + 480 + ] + }, + "heart": { + "12": [ + 96, + 480 + ], + "18": [ + 78, + 480 + ], + "24": [ + 54, + 480 + ] + }, + "london-underground": { + "12": [ + 150, + 480 + ], + "18": [ + 132, + 480 + ], + "24": [ + 108, + 480 + ] + }, + "minefield": { + "12": [ + 204, + 480 + ], + "18": [ + 186, + 480 + ], + "24": [ + 162, + 480 + ] + }, + "rail-underground": { + "12": [ + 258, + 480 + ], + "18": [ + 240, + 480 + ], + "24": [ + 216, + 480 + ] + }, + "rail-above": { + "12": [ + 42, + 504 + ], + "18": [ + 24, + 504 ], "24": [ 0, - 5554 + 504 + ] + }, + "camera": { + "12": [ + 96, + 504 + ], + "18": [ + 78, + 504 + ], + "24": [ + 54, + 504 + ] + }, + "laundry": { + "12": [ + 150, + 504 + ], + "18": [ + 132, + 504 + ], + "24": [ + 108, + 504 + ] + }, + "car": { + "12": [ + 204, + 504 + ], + "18": [ + 186, + 504 + ], + "24": [ + 162, + 504 + ] + }, + "suitcase": { + "12": [ + 258, + 504 + ], + "18": [ + 240, + 504 + ], + "24": [ + 216, + 504 ] }, "highway-motorway": { @@ -72804,6 +75097,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "locales": [ "af", "ar", + "ar-AA", "ast", "bn", "bs", @@ -72813,6 +75107,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "zh-CN", "zh-CN.GB2312", "zh-TW", + "yue", "hr", "cs", "da", @@ -72833,6 +75128,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "lt", "no", "nn", + "fa", "pl", "pt", "pt-BR", @@ -73098,18 +75394,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "back_tooltip": "Change feature", "remove": "Remove", "search": "Search", + "multiselect": "Selected items", "unknown": "Unknown", "incomplete": "", "feature_list": "Search features", - "edit": "Edit feature" + "edit": "Edit feature", + "check": { + "yes": "Yes", + "no": "No" + }, + "none": "None" }, "background": { "title": "Background", "description": "Background settings", "percent_brightness": "{opacity}% brightness", + "none": "None", "custom": "Custom", "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.", - "fix_misalignment": "Fix misalignment", + "fix_misalignment": "Fix alignment", "reset": "reset" }, "restore": { @@ -73169,7 +75472,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "cannot_zoom": "Cannot zoom out further in current mode.", "gpx": { "local_layer": "Local GPX file", - "drag_drop": "Drag and drop a .gpx file on the page" + "drag_drop": "Drag and drop a .gpx file on the page, or click the button to the right to browse", + "zoom": "Zoom to GPX track", + "browse": "Browse for a .gpx file" }, "help": { "title": "Help", @@ -73177,9 +75482,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n", "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n", "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n", - "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the left.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n", + "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n", "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n", - "inspector": "# Using the Inspector\n\nThe inspector is the user interface element on the right-hand side of the\npage that appears when a feature is selected and allows you to edit its details.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n\n### Closing the Inspector\n\nYou can close the inspector by clicking the close button in the top-right,\npressing the 'Escape' key, or clicking on the map.\n", + "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n", "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n", "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n" }, @@ -73234,6 +75539,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "presets": { "categories": { + "category-building": { + "name": "Building" + }, "category-landuse": { "name": "Land Use" }, @@ -73249,7 +75557,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "category-route": { "name": "Route" }, - "category-water": { + "category-water-area": { + "name": "Water" + }, + "category-water-line": { "name": "Water" } }, @@ -73550,6 +75861,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "shelter": { "label": "Shelter" }, + "shelter_type": { + "label": "Type" + }, "shop": { "label": "Type" }, @@ -73590,6 +75904,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "trail_visibility": { "label": "Trail Visibility" }, + "tree_type": { + "label": "Type" + }, "vending": { "label": "Type of Goods" }, @@ -73770,7 +76087,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "terms": "" }, "amenity/parking": { - "name": "Parking", + "name": "Car Parking", "terms": "" }, "amenity/pharmacy": { @@ -73815,7 +76132,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "amenity/ranger_station": { "name": "Ranger Station", - "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office" + "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center" }, "amenity/restaurant": { "name": "Restaurant", @@ -73825,6 +76142,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "School", "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university" }, + "amenity/shelter": { + "name": "Shelter", + "terms": "lean-to" + }, "amenity/swimming_pool": { "name": "Swimming Pool", "terms": "" @@ -73989,6 +76310,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Entrance", "terms": "" }, + "footway/crossing": { + "name": "Crossing", + "terms": "crosswalk,zebra crossing" + }, + "footway/sidewalk": { + "name": "Sidewalk", + "terms": "" + }, "highway": { "name": "Highway", "terms": "" @@ -74237,6 +76566,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Leisure", "terms": "" }, + "leisure/common": { + "name": "Common", + "terms": "open space" + }, "leisure/dog_park": { "name": "Dog Park", "terms": "" @@ -74333,6 +76666,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Lighthouse", "terms": "" }, + "man_made/observation": { + "name": "Observation Tower", + "terms": "lookout tower,fire tower" + }, "man_made/pier": { "name": "Pier", "terms": "" @@ -74449,6 +76786,86 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Office", "terms": "" }, + "office/accountant": { + "name": "Accountant", + "terms": "" + }, + "office/administrative": { + "name": "Administrative Office", + "terms": "" + }, + "office/architect": { + "name": "Architect", + "terms": "" + }, + "office/company": { + "name": "Company Office", + "terms": "" + }, + "office/educational_institution": { + "name": "Educational Institution", + "terms": "" + }, + "office/employment_agency": { + "name": "Employment Agency", + "terms": "" + }, + "office/estate_agent": { + "name": "Real Estate Office", + "terms": "" + }, + "office/financial": { + "name": "Financial Office", + "terms": "" + }, + "office/government": { + "name": "Government Office", + "terms": "" + }, + "office/insurance": { + "name": "Insurance Office", + "terms": "" + }, + "office/it": { + "name": "IT Office", + "terms": "" + }, + "office/lawyer": { + "name": "Law Office", + "terms": "" + }, + "office/newspaper": { + "name": "Newspaper", + "terms": "" + }, + "office/ngo": { + "name": "NGO Office", + "terms": "" + }, + "office/physician": { + "name": "Physician", + "terms": "" + }, + "office/political_party": { + "name": "Political Party", + "terms": "" + }, + "office/research": { + "name": "Research Office", + "terms": "" + }, + "office/telecommunication": { + "name": "Telecom Office", + "terms": "" + }, + "office/therapist": { + "name": "Therapist", + "terms": "" + }, + "office/travel_agent": { + "name": "Travel Agency", + "terms": "" + }, "place": { "name": "Place", "terms": "" @@ -74497,6 +76914,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Power Line", "terms": "" }, + "power/minor_line": { + "name": "Minor Power Line", + "terms": "" + }, "power/pole": { "name": "Power Pole", "terms": "" @@ -74547,7 +76968,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "railway/station": { "name": "Railway Station", - "terms": "" + "terms": "train station,station" }, "railway/subway": { "name": "Subway", @@ -74709,6 +77130,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Laundry", "terms": "" }, + "shop/locksmith": { + "name": "Locksmith", + "terms": "keys" + }, "shop/mall": { "name": "Mall", "terms": "" @@ -74741,6 +77166,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," "name": "Pet Store", "terms": "" }, + "shop/photo": { + "name": "Photography Store", + "terms": "" + }, "shop/shoes": { "name": "Shoe Store", "terms": "" @@ -74755,7 +77184,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "shop/supermarket": { "name": "Supermarket", - "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop" + "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop" }, "shop/toys": { "name": "Toy Store", @@ -74799,7 +77228,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," }, "tourism/camp_site": { "name": "Camp Site", - "terms": "" + "terms": "camping" }, "tourism/caravan_site": { "name": "RV Park", @@ -74959,5 +77388,4570 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081]," } } } + }, + "suggestions": { + "amenity": { + "bank": { + "ABN AMRO": { + "count": 129 + }, + "ABSA": { + "count": 88 + }, + "AIB": { + "count": 71 + }, + "ANZ": { + "count": 199 + }, + "AXA": { + "count": 66 + }, + "Alior Bank": { + "count": 71 + }, + "Allied Bank": { + "count": 115 + }, + "Alpha Bank": { + "count": 94 + }, + "Argenta": { + "count": 84 + }, + "Axis Bank": { + "count": 52 + }, + "BAWAG PSK": { + "count": 105 + }, + "BB&T": { + "count": 126 + }, + "BBK": { + "count": 69 + }, + "BBVA": { + "count": 574 + }, + "BCI": { + "count": 57 + }, + "BCR": { + "count": 137 + }, + "BDO": { + "count": 275 + }, + "BES": { + "count": 68 + }, + "BMO": { + "count": 160 + }, + "BNL": { + "count": 78 + }, + "BNP": { + "count": 109 + }, + "BNP Paribas": { + "count": 574 + }, + "BNP Paribas Fortis": { + "count": 204 + }, + "BPI": { + "count": 393 + }, + "BRD": { + "count": 179 + }, + "BW-Bank": { + "count": 97 + }, + "BZ WBK": { + "count": 65 + }, + "Banamex": { + "count": 130 + }, + "Banca Intesa": { + "count": 58 + }, + "Banca Popolare di Novara": { + "count": 51 + }, + "Banca Popolare di Vicenza": { + "count": 67 + }, + "Banca Transilvania": { + "count": 131 + }, + "Bancaja": { + "count": 58 + }, + "Banco BCI": { + "count": 51 + }, + "Banco Estado": { + "count": 67 + }, + "Banco G&T Continental": { + "count": 62 + }, + "Banco Itaú": { + "count": 82 + }, + "Banco Nación": { + "count": 59 + }, + "Banco Pastor": { + "count": 62 + }, + "Banco Popular": { + "count": 262 + }, + "Banco Provincia": { + "count": 62 + }, + "Banco Santander": { + "count": 91 + }, + "Banco de Chile": { + "count": 95 + }, + "Banco de Costa Rica": { + "count": 64 + }, + "Banco de Desarrollo Banrural": { + "count": 74 + }, + "Banco de la Nación": { + "count": 93 + }, + "Banco do Brasil": { + "count": 440 + }, + "BancoEstado": { + "count": 79 + }, + "Bancolombia": { + "count": 85 + }, + "Bancomer": { + "count": 96 + }, + "Bancpost": { + "count": 51 + }, + "Banesco": { + "count": 86 + }, + "Banesto": { + "count": 198 + }, + "Bank Austria": { + "count": 174 + }, + "Bank Mandiri": { + "count": 56 + }, + "Bank Spółdzielczy": { + "count": 142 + }, + "Bank of America": { + "count": 836 + }, + "Bank of Ireland": { + "count": 109 + }, + "Bank of Montreal": { + "count": 111 + }, + "Bank of Scotland": { + "count": 85 + }, + "Bank of the West": { + "count": 86 + }, + "Bankia": { + "count": 108 + }, + "Bankinter": { + "count": 54 + }, + "Banorte": { + "count": 65 + }, + "Banque Nationale": { + "count": 56 + }, + "Banque Populaire": { + "count": 399 + }, + "Barclays": { + "count": 925 + }, + "Belfius": { + "count": 219 + }, + "Bendigo Bank": { + "count": 88 + }, + "Berliner Sparkasse": { + "count": 61 + }, + "Berliner Volksbank": { + "count": 79 + }, + "Bicentenario": { + "count": 183 + }, + "Bradesco": { + "count": 236 + }, + "CIBC": { + "count": 306 + }, + "CIC": { + "count": 393 + }, + "Caisse d'Épargne": { + "count": 801 + }, + "Caixa": { + "count": 99 + }, + "Caixa Econômica Federal": { + "count": 131 + }, + "Caixa Geral de Depósitos": { + "count": 119 + }, + "Caja Círculo": { + "count": 65 + }, + "Caja Duero": { + "count": 58 + }, + "Caja Madrid": { + "count": 115 + }, + "Caja Rural": { + "count": 87 + }, + "Caja de Burgos": { + "count": 58 + }, + "Cajamar": { + "count": 61 + }, + "Cajero Automatico Bancared": { + "count": 147 + }, + "Canara Bank": { + "count": 82 + }, + "Cassa di Risparmio del Veneto": { + "count": 58 + }, + "Chase": { + "count": 623 + }, + "China Bank": { + "count": 59 + }, + "Chinabank": { + "count": 54 + }, + "Citibank": { + "count": 249 + }, + "Citizens Bank": { + "count": 107 + }, + "CityCommerce Bank": { + "count": 53 + }, + "Commercial Bank of Ceylon PLC": { + "count": 80 + }, + "Commerzbank": { + "count": 799 + }, + "Commonwealth Bank": { + "count": 218 + }, + "Credit Agricole": { + "count": 143 + }, + "Credit Suisse": { + "count": 69 + }, + "Crédit Agricole": { + "count": 1160 + }, + "Crédit Mutuel": { + "count": 648 + }, + "Crédit Mutuel de Bretagne": { + "count": 335 + }, + "Crédit du Nord": { + "count": 88 + }, + "Danske Bank": { + "count": 130 + }, + "Davivienda": { + "count": 83 + }, + "De Venezuela": { + "count": 127 + }, + "Del Tesoro": { + "count": 94 + }, + "Deutsche Bank": { + "count": 836 + }, + "Dresdner Bank": { + "count": 77 + }, + "Ecobank": { + "count": 54 + }, + "Erste Bank": { + "count": 178 + }, + "Eurobank": { + "count": 89 + }, + "FNB": { + "count": 90 + }, + "Fifth Third Bank": { + "count": 66 + }, + "First National Bank": { + "count": 76 + }, + "GE Money Bank": { + "count": 72 + }, + "HDFC Bank": { + "count": 85 + }, + "HSBC": { + "count": 1039 + }, + "Halifax": { + "count": 214 + }, + "Hamburger Sparkasse": { + "count": 157 + }, + "Handelsbanken": { + "count": 178 + }, + "HypoVereinsbank": { + "count": 570 + }, + "ICICI Bank": { + "count": 78 + }, + "ING": { + "count": 468 + }, + "ING Bank Śląski": { + "count": 64 + }, + "Ibercaja": { + "count": 58 + }, + "Intesa San Paolo": { + "count": 60 + }, + "Itaú": { + "count": 278 + }, + "KBC": { + "count": 194 + }, + "Key Bank": { + "count": 139 + }, + "Komerční banka": { + "count": 136 + }, + "Kreissparkasse": { + "count": 579 + }, + "Kreissparkasse Köln": { + "count": 67 + }, + "LCL": { + "count": 508 + }, + "La Banque Postale": { + "count": 61 + }, + "La Caixa": { + "count": 513 + }, + "Landbank": { + "count": 79 + }, + "Lloyds Bank": { + "count": 541 + }, + "M&T Bank": { + "count": 80 + }, + "Maybank": { + "count": 81 + }, + "Mercantil": { + "count": 220 + }, + "Metrobank": { + "count": 253 + }, + "Millenium Bank": { + "count": 60 + }, + "Millennium Bank": { + "count": 415 + }, + "Monte dei Paschi di Siena": { + "count": 126 + }, + "NAB": { + "count": 123 + }, + "NatWest": { + "count": 606 + }, + "National Bank": { + "count": 87 + }, + "Nationwide": { + "count": 193 + }, + "Nedbank": { + "count": 74 + }, + "Nordea": { + "count": 312 + }, + "OLB": { + "count": 52 + }, + "OTP": { + "count": 184 + }, + "Oberbank": { + "count": 87 + }, + "Oldenburgische Landesbank": { + "count": 56 + }, + "Osuuspankki": { + "count": 74 + }, + "PKO BP": { + "count": 239 + }, + "PNB": { + "count": 106 + }, + "PNC Bank": { + "count": 215 + }, + "PSBank": { + "count": 57 + }, + "Pekao SA": { + "count": 53 + }, + "Peoples Bank": { + "count": 55 + }, + "Postbank": { + "count": 433 + }, + "RBC": { + "count": 220 + }, + "RBS": { + "count": 136 + }, + "RCBC": { + "count": 117 + }, + "Rabobank": { + "count": 619 + }, + "Raiffeisenbank": { + "count": 2028 + }, + "Regions Bank": { + "count": 59 + }, + "Royal Bank": { + "count": 65 + }, + "Royal Bank of Scotland": { + "count": 108 + }, + "SEB": { + "count": 129 + }, + "Santander": { + "count": 1181 + }, + "Santander Consumer Bank": { + "count": 81 + }, + "Santander Totta": { + "count": 63 + }, + "Sberbank": { + "count": 61 + }, + "Scotiabank": { + "count": 379 + }, + "Security Bank": { + "count": 71 + }, + "Slovenská sporiteľňa": { + "count": 127 + }, + "Société Générale": { + "count": 592 + }, + "Sparda-Bank": { + "count": 313 + }, + "Sparkasse": { + "count": 4521 + }, + "Sparkasse Aachen": { + "count": 58 + }, + "Sparkasse KölnBonn": { + "count": 55 + }, + "Stadtsparkasse": { + "count": 86 + }, + "Standard Bank": { + "count": 100 + }, + "State Bank of India": { + "count": 132 + }, + "SunTrust": { + "count": 63 + }, + "SunTrust Bank": { + "count": 66 + }, + "Swedbank": { + "count": 219 + }, + "TD Bank": { + "count": 178 + }, + "TD Canada Trust": { + "count": 421 + }, + "TSB": { + "count": 51 + }, + "Targobank": { + "count": 167 + }, + "Tatra banka": { + "count": 65 + }, + "UBS": { + "count": 129 + }, + "UCPB": { + "count": 87 + }, + "US Bank": { + "count": 214 + }, + "Ulster Bank": { + "count": 85 + }, + "UniCredit Bank": { + "count": 376 + }, + "Unicredit Banca": { + "count": 224 + }, + "Unicaja": { + "count": 74 + }, + "Union Bank": { + "count": 110 + }, + "VR-Bank": { + "count": 421 + }, + "Volksbank": { + "count": 2573 + }, + "VÚB": { + "count": 108 + }, + "Wachovia": { + "count": 61 + }, + "Wells Fargo": { + "count": 781 + }, + "Western Union": { + "count": 84 + }, + "Westpac": { + "count": 194 + }, + "Yorkshire Bank": { + "count": 60 + }, + "ČSOB": { + "count": 157 + }, + "Česká spořitelna": { + "count": 207 + }, + "Альфа-Банк": { + "count": 183 + }, + "Банк Москвы": { + "count": 116 + }, + "Белагропромбанк": { + "count": 66 + }, + "Беларусбанк": { + "count": 223 + }, + "ВТБ": { + "count": 54 + }, + "ВТБ24": { + "count": 298 + }, + "Возрождение": { + "count": 56 + }, + "Газпромбанк": { + "count": 93 + }, + "Ощадбанк": { + "count": 292 + }, + "ПриватБанк": { + "count": 480 + }, + "Промсвязьбанк": { + "count": 86 + }, + "Райффайзен Банк Аваль": { + "count": 57 + }, + "Росбанк": { + "count": 172 + }, + "Россельхозбанк": { + "count": 181 + }, + "Сбербанк": { + "count": 4579 + }, + "Совкомбанк": { + "count": 51 + }, + "УкрСиббанк": { + "count": 125 + }, + "Уралсиб": { + "count": 83 + }, + "ლიბერთი ბანკი (Liberty Bank)": { + "count": 55 + }, + "みずほ銀行": { + "count": 68 + }, + "りそな銀行": { + "count": 227 + }, + "三井住友銀行": { + "count": 122 + }, + "三菱東京UFJ銀行": { + "count": 149 + }, + "中国银行": { + "count": 65 + }, + "광주은행 (Gwangju Bank)": { + "count": 55 + }, + "국민은행": { + "count": 167 + }, + "농협": { + "count": 51 + }, + "신한은행": { + "count": 218 + }, + "우리은행": { + "count": 293 + }, + "중소기업은행 (Industrial Bank of Korea)": { + "count": 53 + }, + "하나은행": { + "count": 78 + } + }, + "cafe": { + "Cafe Amazon": { + "count": 51 + }, + "Cafe Coffee Day": { + "count": 103 + }, + "Cafeteria": { + "count": 69 + }, + "Caffè Nero": { + "count": 159 + }, + "Café Central": { + "count": 58 + }, + "Caribou Coffee": { + "count": 92 + }, + "Coffee Time": { + "count": 94 + }, + "Costa": { + "count": 548 + }, + "Dunkin Donuts": { + "count": 365 + }, + "Eiscafe": { + "count": 115 + }, + "Eiscafe Venezia": { + "count": 176 + }, + "Eisdiele": { + "count": 64 + }, + "Panera Bread": { + "count": 72 + }, + "Pret A Manger": { + "count": 115 + }, + "Second Cup": { + "count": 170 + }, + "Segafredo": { + "count": 67 + }, + "Starbucks": { + "count": 3837 + }, + "Subway": { + "count": 61 + }, + "Tchibo": { + "count": 91 + }, + "Tim Hortons": { + "count": 940 + }, + "Traveler's Coffee": { + "count": 59 + }, + "Кафе": { + "count": 244 + }, + "Кофе Хауз": { + "count": 99 + }, + "Столовая": { + "count": 320 + }, + "Шашлычная": { + "count": 51 + }, + "Шоколадница": { + "count": 124 + }, + "คาเฟ่ อเมซอน": { + "count": 63 + }, + "カフェ・ド・クリエ (Cafe de CRIE)": { + "count": 68 + }, + "スターバックス": { + "count": 54, + "name:en": "Starbucks" + }, + "スターバックス (Starbucks)": { + "count": 191 + }, + "ドトール": { + "count": 163 + } + }, + "car_rental": { + "Avis": { + "count": 263 + }, + "Budget": { + "count": 81 + }, + "Enterprise": { + "count": 173 + }, + "Europcar": { + "count": 271 + }, + "Hertz": { + "count": 276 + }, + "Sixt": { + "count": 150 + }, + "stadtmobil CarSharing-Station": { + "count": 162 + } + }, + "fast_food": { + "A&W": { + "count": 255 + }, + "Ali Baba": { + "count": 57 + }, + "Arby's": { + "count": 714 + }, + "Asia Imbiss": { + "count": 103 + }, + "Baskin Robbins": { + "count": 69 + }, + "Boston Market": { + "count": 57 + }, + "Burger King": { + "count": 3449 + }, + "Carl's Jr.": { + "count": 272 + }, + "Chick-fil-A": { + "count": 214 + }, + "Chipotle": { + "count": 260 + }, + "Chowking": { + "count": 138 + }, + "Church's Chicken": { + "count": 86 + }, + "Culver's": { + "count": 427 + }, + "Dairy Queen": { + "count": 722 + }, + "Del Taco": { + "count": 137 + }, + "Domino's Pizza": { + "count": 896 + }, + "Dunkin Donuts": { + "count": 411 + }, + "Döner": { + "count": 221 + }, + "El Pollo Loco": { + "count": 61 + }, + "Fish & Chips": { + "count": 82 + }, + "Five Guys": { + "count": 124 + }, + "Greggs": { + "count": 77 + }, + "Hallo Pizza": { + "count": 76 + }, + "Hardee's": { + "count": 242 + }, + "Harvey's": { + "count": 83 + }, + "Hesburger": { + "count": 97 + }, + "Hungry Jacks": { + "count": 163 + }, + "Imbiss": { + "count": 181 + }, + "In-N-Out Burger": { + "count": 58 + }, + "Istanbul": { + "count": 52 + }, + "Jack in the Box": { + "count": 517 + }, + "Jamba Juice": { + "count": 60 + }, + "Jimmy John's": { + "count": 119 + }, + "Jollibee": { + "count": 384 + }, + "KFC": { + "count": 2975 + }, + "Kebab": { + "count": 167 + }, + "Kochlöffel": { + "count": 69 + }, + "Kotipizza": { + "count": 75 + }, + "Little Caesars": { + "count": 61 + }, + "Long John Silver's": { + "count": 76 + }, + "Mang Inasal": { + "count": 66 + }, + "McDonald's": { + "count": 11760 + }, + "Mr. Sub": { + "count": 108 + }, + "Nando's": { + "count": 58 + }, + "Nordsee": { + "count": 159 + }, + "Panda Express": { + "count": 212 + }, + "Panera Bread": { + "count": 59 + }, + "Papa John's": { + "count": 274 + }, + "Pizza Express": { + "count": 65 + }, + "Pizza Hut": { + "count": 1010 + }, + "Pizza Nova": { + "count": 57 + }, + "Pizza Pizza": { + "count": 202 + }, + "Pollo Campero": { + "count": 63 + }, + "Popeye's": { + "count": 147 + }, + "Quick": { + "count": 484 + }, + "Quiznos": { + "count": 262 + }, + "Red Rooster": { + "count": 145 + }, + "Sibylla": { + "count": 61 + }, + "Sonic": { + "count": 506 + }, + "Steers": { + "count": 139 + }, + "Subway": { + "count": 5113 + }, + "Taco Bell": { + "count": 1257 + }, + "Taco John's": { + "count": 64 + }, + "Taco Time": { + "count": 82 + }, + "Telepizza": { + "count": 188 + }, + "Tim Hortons": { + "count": 292 + }, + "Wendy's": { + "count": 1487 + }, + "Whataburger": { + "count": 147 + }, + "White Castle": { + "count": 74 + }, + "Wimpy": { + "count": 136 + }, + "Макдоналдс": { + "count": 309, + "name:en": "McDonald's" + }, + "Робин Сдобин": { + "count": 72 + }, + "Русский Аппетит": { + "count": 65 + }, + "Столовая": { + "count": 189 + }, + "Теремок": { + "count": 63 + }, + "すき家": { + "count": 245 + }, + "なか卯": { + "count": 52 + }, + "ケンタッキーフライドチキン": { + "count": 54, + "name:en": "KFC" + }, + "ケンタッキーフライドチキン (Kentucky Fried Chicken)": { + "count": 104 + }, + "マクドナルド": { + "count": 632, + "name:en": "McDonald's" + }, + "モスバーガー": { + "count": 237 + }, + "吉野家": { + "count": 172 + }, + "松屋": { + "count": 224 + }, + "肯德基": { + "count": 81 + }, + "麥當勞": { + "count": 51 + } + }, + "fuel": { + "76": { + "count": 282 + }, + "1-2-3": { + "count": 71 + }, + "7-Eleven": { + "count": 422 + }, + "ABC": { + "count": 80 + }, + "Agip": { + "count": 2654 + }, + "ANP": { + "count": 65 + }, + "ARAL": { + "count": 371 + }, + "AVIA": { + "count": 257 + }, + "Afriquia": { + "count": 90 + }, + "Agrola": { + "count": 72 + }, + "Api": { + "count": 313 + }, + "Aral": { + "count": 1334 + }, + "Arco": { + "count": 153 + }, + "Auchan": { + "count": 52 + }, + "Avanti": { + "count": 92 + }, + "Avia": { + "count": 614 + }, + "BFT": { + "count": 88 + }, + "BP": { + "count": 2330 + }, + "BR": { + "count": 81 + }, + "Benzina": { + "count": 70 + }, + "Bliska": { + "count": 149 + }, + "C. C. E. Leclerc": { + "count": 84 + }, + "CAMPSA": { + "count": 630 + }, + "CARREFOUR": { + "count": 75 + }, + "CEPSA": { + "count": 1020 + }, + "COSMO": { + "count": 65 + }, + "Caltex": { + "count": 948 + }, + "Canadian Tire": { + "count": 63 + }, + "Carrefour": { + "count": 196 + }, + "Casey's General Store": { + "count": 162 + }, + "Cenex": { + "count": 106 + }, + "Cepsa": { + "count": 75 + }, + "Chevron": { + "count": 825 + }, + "Circle K": { + "count": 149 + }, + "Citgo": { + "count": 246 + }, + "Coles Express": { + "count": 99 + }, + "Conoco": { + "count": 169 + }, + "Coop": { + "count": 55 + }, + "Copec": { + "count": 496 + }, + "E.Leclerc": { + "count": 250 + }, + "EKO": { + "count": 61 + }, + "ENEOS": { + "count": 644 + }, + "ERG": { + "count": 74 + }, + "Esso": { + "count": 3566 + }, + "Eko": { + "count": 58 + }, + "Elan": { + "count": 114 + }, + "Elf": { + "count": 138 + }, + "Eneos": { + "count": 97 + }, + "Engen": { + "count": 224 + }, + "Eni": { + "count": 199 + }, + "Erg": { + "count": 609 + }, + "Esso Express": { + "count": 81 + }, + "Exxon": { + "count": 435 + }, + "Flying V": { + "count": 130 + }, + "Freie Tankstelle": { + "count": 210 + }, + "GALP": { + "count": 582 + }, + "Gulf": { + "count": 184 + }, + "HEM": { + "count": 216 + }, + "HP": { + "count": 59 + }, + "Hess": { + "count": 110 + }, + "Holiday": { + "count": 96 + }, + "Husky": { + "count": 115 + }, + "IDEMITSU": { + "count": 79 + }, + "IES": { + "count": 62 + }, + "INA": { + "count": 118 + }, + "IP": { + "count": 830 + }, + "Indian Oil": { + "count": 134 + }, + "Indipend.": { + "count": 178 + }, + "Intermarché": { + "count": 417 + }, + "Ipiranga": { + "count": 79 + }, + "Irving": { + "count": 79 + }, + "JET": { + "count": 177 + }, + "JOMO": { + "count": 65 + }, + "Jet": { + "count": 439 + }, + "Kum & Go": { + "count": 76 + }, + "Kwik Trip": { + "count": 100 + }, + "LPG": { + "count": 151 + }, + "Lotos": { + "count": 168 + }, + "Lukoil": { + "count": 667 + }, + "MEROIL": { + "count": 80 + }, + "MOL": { + "count": 216 + }, + "Marathon": { + "count": 154 + }, + "Metano": { + "count": 205 + }, + "Migrol": { + "count": 66 + }, + "Mobil": { + "count": 564 + }, + "Mol": { + "count": 58 + }, + "Morrisons": { + "count": 104 + }, + "Neste": { + "count": 197 + }, + "Neste A24": { + "count": 58 + }, + "OIL!": { + "count": 57 + }, + "OK": { + "count": 159 + }, + "OKKO": { + "count": 56 + }, + "OKQ8": { + "count": 186 + }, + "OMV": { + "count": 718 + }, + "Oilibya": { + "count": 65 + }, + "Orlen": { + "count": 541 + }, + "Pemex": { + "count": 357 + }, + "PETRONOR": { + "count": 209 + }, + "PTT": { + "count": 175 + }, + "Pertamina": { + "count": 176 + }, + "Petro-Canada": { + "count": 466 + }, + "Petrobras": { + "count": 256 + }, + "Petrom": { + "count": 253 + }, + "Petron": { + "count": 824 + }, + "Petronas": { + "count": 143 + }, + "Phillips 66": { + "count": 193 + }, + "Phoenix": { + "count": 138 + }, + "Q8": { + "count": 1137 + }, + "QuikTrip": { + "count": 84 + }, + "REPSOL": { + "count": 1610 + }, + "Raiffeisenbank": { + "count": 118 + }, + "Repsol": { + "count": 390 + }, + "Rompetrol": { + "count": 161 + }, + "Shell": { + "count": 7936 + }, + "Sainsbury's": { + "count": 55 + }, + "Sasol": { + "count": 55 + }, + "Sheetz": { + "count": 95 + }, + "Shell Express": { + "count": 133 + }, + "Sinclair": { + "count": 78 + }, + "Slovnaft": { + "count": 217 + }, + "Sokimex": { + "count": 59 + }, + "Speedway": { + "count": 124 + }, + "St1": { + "count": 100 + }, + "Stacja paliw": { + "count": 84 + }, + "Star": { + "count": 316 + }, + "Total": { + "count": 2498 + }, + "Statoil": { + "count": 588 + }, + "Stewart's": { + "count": 62 + }, + "Sunoco": { + "count": 307 + }, + "Super U": { + "count": 122 + }, + "Tamoil": { + "count": 864 + }, + "Tango": { + "count": 119 + }, + "Tankstelle": { + "count": 114 + }, + "Teboil": { + "count": 119 + }, + "Tela": { + "count": 113 + }, + "Terpel": { + "count": 255 + }, + "Tesco": { + "count": 192 + }, + "Texaco": { + "count": 645 + }, + "Tinq": { + "count": 218 + }, + "Topaz": { + "count": 78 + }, + "TotalErg": { + "count": 71 + }, + "Turmöl": { + "count": 57 + }, + "Ultramar": { + "count": 119 + }, + "United": { + "count": 83 + }, + "Valero": { + "count": 328 + }, + "WOG": { + "count": 139 + }, + "Wawa": { + "count": 78 + }, + "Westfalen": { + "count": 97 + }, + "YPF": { + "count": 141 + }, + "Z": { + "count": 76 + }, + "bft": { + "count": 168 + }, + "ÖMV": { + "count": 100 + }, + "АГЗС": { + "count": 471 + }, + "АЗС": { + "count": 1012 + }, + "Башнефть": { + "count": 52 + }, + "Белоруснефть": { + "count": 55 + }, + "Газпромнефть": { + "count": 727 + }, + "Лукойл": { + "count": 1472 + }, + "Макпетрол": { + "count": 110 + }, + "НК Альянс": { + "count": 89 + }, + "ОККО": { + "count": 112 + }, + "ОМВ": { + "count": 57 + }, + "ПТК": { + "count": 82 + }, + "Петрол": { + "count": 82 + }, + "Роснефть": { + "count": 594 + }, + "Славнефть": { + "count": 53 + }, + "Сургутнефтегаз": { + "count": 60 + }, + "ТНК": { + "count": 503 + }, + "Татнефтепродукт": { + "count": 55 + }, + "Татнефть": { + "count": 250 + }, + "บางจาก": { + "count": 60 + }, + "ป ต ท": { + "count": 154 + }, + "ปตท": { + "count": 89 + }, + "コスモ石油 (COSMO)": { + "count": 132 + }, + "出光": { + "count": 205 + }, + "昭和シェル (Showa-shell)": { + "count": 93 + } + }, + "pharmacy": { + "36,6": { + "count": 107 + }, + "Adler Apotheke": { + "count": 302 + }, + "Alte Apotheke": { + "count": 85 + }, + "Apotheke": { + "count": 167 + }, + "Apotheke am Markt": { + "count": 62 + }, + "Apteka": { + "count": 335 + }, + "Bahnhof-Apotheke": { + "count": 64 + }, + "Boots": { + "count": 809 + }, + "Brunnen-Apotheke": { + "count": 52 + }, + "Burg-Apotheke": { + "count": 56 + }, + "Bären-Apotheke": { + "count": 72 + }, + "CVS": { + "count": 1400 + }, + "Clicks": { + "count": 110 + }, + "Cruz Verde": { + "count": 96 + }, + "Engel-Apotheke": { + "count": 126 + }, + "Eurovaistinė": { + "count": 60 + }, + "Farmacia Comunale": { + "count": 103 + }, + "Farmacias Ahumada": { + "count": 101 + }, + "Farmacias Cruz Verde": { + "count": 84 + }, + "Farmacias SalcoBrand": { + "count": 133 + }, + "Farmacity": { + "count": 62 + }, + "Farmahorro": { + "count": 61 + }, + "Farmatodo": { + "count": 133 + }, + "Gintarinė vaistinė": { + "count": 100 + }, + "Hirsch-Apotheke": { + "count": 80 + }, + "Hubertus Apotheke": { + "count": 103 + }, + "Jean Coutu": { + "count": 56 + }, + "Kinney Drugs": { + "count": 67 + }, + "Linden-Apotheke": { + "count": 210 + }, + "Ljekarna": { + "count": 55 + }, + "Lloyds Pharmacy": { + "count": 286 + }, + "Löwen-Apotheke": { + "count": 354 + }, + "Marien-Apotheke": { + "count": 315 + }, + "Markt-Apotheke": { + "count": 161 + }, + "Mercury Drug": { + "count": 401 + }, + "Neue Apotheke": { + "count": 111 + }, + "Pharmacie Centrale": { + "count": 60 + }, + "Pharmaprix": { + "count": 57 + }, + "Pharmasave": { + "count": 63 + }, + "Rathaus-Apotheke": { + "count": 130 + }, + "Rats-Apotheke": { + "count": 85 + }, + "Rite Aid": { + "count": 659 + }, + "Rosen-Apotheke": { + "count": 208 + }, + "Rowlands Pharmacy": { + "count": 68 + }, + "SalcoBrand": { + "count": 88 + }, + "Shoppers Drug Mart": { + "count": 396 + }, + "Sonnen-Apotheke": { + "count": 306 + }, + "Stadt-Apotheke": { + "count": 300 + }, + "Stern-Apotheke": { + "count": 67 + }, + "Superdrug": { + "count": 108 + }, + "The Generics Pharmacy": { + "count": 82 + }, + "Walgreens": { + "count": 1447 + }, + "Айболит": { + "count": 51 + }, + "Аптека": { + "count": 1879 + }, + "Аптека 36,6": { + "count": 113 + }, + "Аптечный пункт": { + "count": 136 + }, + "Вита": { + "count": 107 + }, + "Имплозия": { + "count": 59 + }, + "Классика": { + "count": 66 + }, + "Невис": { + "count": 58 + }, + "Первая помощь": { + "count": 73 + }, + "Радуга": { + "count": 69 + }, + "Ригла": { + "count": 109 + }, + "Фармакор": { + "count": 71 + }, + "Фармация": { + "count": 118 + }, + "Фармленд": { + "count": 80 + }, + "аптека": { + "count": 100 + }, + "ავერსი (Aversi)": { + "count": 63 + }, + "サンドラッグ": { + "count": 52 + }, + "スギ薬局": { + "count": 76 + }, + "トモズ (Tomod's)": { + "count": 82 + }, + "ドラッグてらしま (Drug Terashima)": { + "count": 96 + }, + "マツモトキヨシ": { + "count": 107 + } + }, + "pub": { + "Cross Keys": { + "count": 59 + }, + "Irish Pub": { + "count": 82 + }, + "Kings Arms": { + "count": 68 + }, + "Kings Head": { + "count": 56 + }, + "New Inn": { + "count": 89 + }, + "Prince of Wales": { + "count": 76 + }, + "Red Lion": { + "count": 201 + }, + "Rose & Crown": { + "count": 51 + }, + "Rose and Crown": { + "count": 77 + }, + "Royal Hotel": { + "count": 52 + }, + "Royal Oak": { + "count": 149 + }, + "The Anchor": { + "count": 64 + }, + "The Angel": { + "count": 55 + }, + "The Bell": { + "count": 121 + }, + "The Black Horse": { + "count": 94 + }, + "The Bull": { + "count": 67 + }, + "The Castle": { + "count": 56 + }, + "The Chequers": { + "count": 65 + }, + "The Cross Keys": { + "count": 55 + }, + "The Crown": { + "count": 239 + }, + "The Crown Inn": { + "count": 69 + }, + "The Fox": { + "count": 78 + }, + "The George": { + "count": 109 + }, + "The Green Man": { + "count": 52 + }, + "The Greyhound": { + "count": 97 + }, + "The Kings Arms": { + "count": 59 + }, + "The Kings Head": { + "count": 54 + }, + "The New Inn": { + "count": 105 + }, + "The Plough": { + "count": 173 + }, + "The Prince of Wales": { + "count": 51 + }, + "The Queens Head": { + "count": 51 + }, + "The Railway": { + "count": 100 + }, + "The Red Lion": { + "count": 230 + }, + "The Rising Sun": { + "count": 70 + }, + "The Royal Oak": { + "count": 207 + }, + "The Ship": { + "count": 89 + }, + "The Ship Inn": { + "count": 80 + }, + "The Star": { + "count": 74 + }, + "The Swan": { + "count": 148 + }, + "The Victoria": { + "count": 68 + }, + "The Wheatsheaf": { + "count": 120 + }, + "The White Hart": { + "count": 223 + }, + "The White Horse": { + "count": 201 + }, + "The White Lion": { + "count": 117 + } + }, + "recycling": { + "Altglas": { + "count": 98 + }, + "Déchèterie": { + "count": 244 + }, + "Glas": { + "count": 106 + }, + "Glascontainer": { + "count": 144 + }, + "Recyclinghof": { + "count": 131 + }, + "Wertstoffhof": { + "count": 262 + } + }, + "restaurant": { + "Adler": { + "count": 154 + }, + "Akropolis": { + "count": 149 + }, + "Alte Post": { + "count": 62 + }, + "Applebee's": { + "count": 467 + }, + "Athen": { + "count": 65 + }, + "Bella Italia": { + "count": 125 + }, + "Bob Evans": { + "count": 99 + }, + "Boston Market": { + "count": 57 + }, + "Boston Pizza": { + "count": 148 + }, + "Buffalo Grill": { + "count": 192 + }, + "Buffalo Wild Wings": { + "count": 147 + }, + "Burger King": { + "count": 141 + }, + "Bären": { + "count": 58 + }, + "California Pizza Kitchen": { + "count": 56 + }, + "Chili's": { + "count": 294 + }, + "China Garden": { + "count": 64 + }, + "China Town": { + "count": 70 + }, + "Chipotle": { + "count": 125 + }, + "Chowking": { + "count": 53 + }, + "Courtepaille": { + "count": 95 + }, + "Cracker Barrel": { + "count": 162 + }, + "Da Vinci": { + "count": 53 + }, + "Dairy Queen": { + "count": 92 + }, + "Delphi": { + "count": 86 + }, + "Denny's": { + "count": 395 + }, + "Deutsches Haus": { + "count": 88 + }, + "Dionysos": { + "count": 68 + }, + "Dolce Vita": { + "count": 74 + }, + "Domino's Pizza": { + "count": 98 + }, + "El Greco": { + "count": 80 + }, + "Flunch": { + "count": 71 + }, + "Frankie & Benny's": { + "count": 58 + }, + "Friendly's": { + "count": 72 + }, + "Gasthaus Adler": { + "count": 51 + }, + "Gasthaus Krone": { + "count": 54 + }, + "Gasthof zur Post": { + "count": 72 + }, + "Golden Corral": { + "count": 91 + }, + "Grüner Baum": { + "count": 116 + }, + "Hard Rock Cafe": { + "count": 66 + }, + "Hellas": { + "count": 54 + }, + "Hippopotamus": { + "count": 91 + }, + "Hirsch": { + "count": 77 + }, + "Hirschen": { + "count": 83 + }, + "Hong Kong": { + "count": 81 + }, + "Hooters": { + "count": 94 + }, + "IHOP": { + "count": 286 + }, + "KFC": { + "count": 191 + }, + "Kantine": { + "count": 52 + }, + "Kelsey's": { + "count": 56 + }, + "Kirchenwirt": { + "count": 79 + }, + "Kreuz": { + "count": 75 + }, + "Krone": { + "count": 173 + }, + "La Cantina": { + "count": 54 + }, + "La Dolce Vita": { + "count": 68 + }, + "La Perla": { + "count": 66 + }, + "La Piazza": { + "count": 67 + }, + "Lamm": { + "count": 67 + }, + "Linde": { + "count": 102 + }, + "Lindenhof": { + "count": 82 + }, + "Little Chef": { + "count": 68 + }, + "Longhorn Steakhouse": { + "count": 56 + }, + "Lotus": { + "count": 64 + }, + "Löwen": { + "count": 114 + }, + "Mamma Mia": { + "count": 61 + }, + "Mandarin": { + "count": 64 + }, + "Mang Inasal": { + "count": 81 + }, + "McDonald's": { + "count": 297 + }, + "Mensa": { + "count": 87 + }, + "Milano": { + "count": 52 + }, + "Mykonos": { + "count": 59 + }, + "Nando's": { + "count": 219 + }, + "Ochsen": { + "count": 93 + }, + "Olive Garden": { + "count": 241 + }, + "Olympia": { + "count": 78 + }, + "Outback Steakhouse": { + "count": 189 + }, + "Panda Express": { + "count": 53 + }, + "Panera Bread": { + "count": 171 + }, + "Panorama": { + "count": 60 + }, + "Peking": { + "count": 54 + }, + "Perkins": { + "count": 96 + }, + "Pizza Express": { + "count": 241 + }, + "Pizza Hut": { + "count": 1038 + }, + "Poseidon": { + "count": 111 + }, + "Prezzo": { + "count": 68 + }, + "Ratskeller": { + "count": 148 + }, + "Red Lobster": { + "count": 205 + }, + "Red Robin": { + "count": 169 + }, + "Rhodos": { + "count": 80 + }, + "Roma": { + "count": 60 + }, + "Ruby Tuesday": { + "count": 137 + }, + "Rössli": { + "count": 68 + }, + "Sakura": { + "count": 69 + }, + "San Marco": { + "count": 66 + }, + "Schwarzer Adler": { + "count": 58 + }, + "Schützenhaus": { + "count": 129 + }, + "Seeblick": { + "count": 51 + }, + "Shanghai": { + "count": 79 + }, + "Shari's": { + "count": 63 + }, + "Sonne": { + "count": 123 + }, + "Sportheim": { + "count": 57 + }, + "Spur": { + "count": 60 + }, + "Sternen": { + "count": 78 + }, + "Subway": { + "count": 470 + }, + "Swiss Chalet": { + "count": 101 + }, + "TGI Friday's": { + "count": 138 + }, + "Taco Bell": { + "count": 82 + }, + "Taj Mahal": { + "count": 101 + }, + "Texas Roadhouse": { + "count": 96 + }, + "The Keg": { + "count": 52 + }, + "Traube": { + "count": 65 + }, + "Vapiano": { + "count": 81 + }, + "Village Inn": { + "count": 88 + }, + "Vips": { + "count": 51 + }, + "Waffle House": { + "count": 182 + }, + "Wagamama": { + "count": 58 + }, + "Waldschänke": { + "count": 55 + }, + "Wendy's": { + "count": 86 + }, + "Zizzi": { + "count": 62 + }, + "Zum Löwen": { + "count": 82 + }, + "Zur Krone": { + "count": 92 + }, + "Zur Linde": { + "count": 200 + }, + "Zur Post": { + "count": 117 + }, + "Zur Sonne": { + "count": 73 + }, + "Евразия": { + "count": 98 + }, + "Столовая": { + "count": 126 + }, + "Якитория": { + "count": 74 + }, + "ガスト": { + "count": 204 + }, + "サイゼリヤ": { + "count": 81 + }, + "ジョナサン": { + "count": 56 + }, + "デニーズ": { + "count": 73 + }, + "바다횟집 (Bada Fish Restaurant)": { + "count": 55 + } + } + }, + "shop": { + "alcohol": { + "Alko": { + "count": 141 + }, + "BWS": { + "count": 58 + }, + "Bargain Booze": { + "count": 59 + }, + "Botilleria": { + "count": 75 + }, + "Gall & Gall": { + "count": 514 + }, + "LCBO": { + "count": 214 + }, + "Nicolas": { + "count": 109 + }, + "SAQ": { + "count": 66 + }, + "Systembolaget": { + "count": 199 + }, + "The Beer Store": { + "count": 141 + }, + "Ароматный мир": { + "count": 56 + }, + "Живое пиво": { + "count": 62 + } + }, + "bakery": { + "Anker": { + "count": 65 + }, + "Backwerk": { + "count": 94 + }, + "Boulangerie": { + "count": 232 + }, + "Boulangerie Patisserie": { + "count": 76 + }, + "Bäcker": { + "count": 65 + }, + "Bäckerei": { + "count": 163 + }, + "Bäckerei Schmidt": { + "count": 56 + }, + "Dat Backhus": { + "count": 62 + }, + "Der Beck": { + "count": 97 + }, + "Goeken backen": { + "count": 52 + }, + "Goldilocks": { + "count": 55 + }, + "Greggs": { + "count": 255 + }, + "Hofpfisterei": { + "count": 108 + }, + "Ihle": { + "count": 76 + }, + "K&U": { + "count": 54 + }, + "Kamps": { + "count": 252 + }, + "Müller": { + "count": 91 + }, + "Oebel": { + "count": 57 + }, + "Panaderia": { + "count": 154 + }, + "Panificio": { + "count": 63 + }, + "Paul": { + "count": 74 + }, + "Piekarnia": { + "count": 52 + }, + "Stadtbäckerei": { + "count": 58 + }, + "Stadtbäckerei Junge": { + "count": 53 + }, + "Steinecke": { + "count": 135 + }, + "Thürmann": { + "count": 57 + }, + "Хлеб": { + "count": 81 + } + }, + "books": { + "Barnes & Noble": { + "count": 239 + }, + "Bruna": { + "count": 55 + }, + "Libro": { + "count": 59 + }, + "Thalia": { + "count": 122 + }, + "Waterstones": { + "count": 85 + }, + "Weltbild": { + "count": 72 + }, + "Книги": { + "count": 110 + } + }, + "car_repair": { + "ATU": { + "count": 257 + }, + "AutoZone": { + "count": 51 + }, + "Carglass": { + "count": 99 + }, + "Euromaster": { + "count": 80 + }, + "Feu Vert": { + "count": 104 + }, + "Firestone": { + "count": 77 + }, + "Jiffy Lube": { + "count": 178 + }, + "Kwik Fit": { + "count": 73 + }, + "Midas": { + "count": 171 + }, + "Norauto": { + "count": 141 + }, + "O'Reilly Auto Parts": { + "count": 62 + }, + "Peugeot": { + "count": 80 + }, + "Pit Stop": { + "count": 55 + }, + "Renault": { + "count": 158 + }, + "Roady": { + "count": 52 + }, + "Speedy": { + "count": 104 + }, + "ÖAMTC": { + "count": 51 + }, + "Автозапчасти": { + "count": 172 + }, + "Автосервис": { + "count": 314 + }, + "СТО": { + "count": 338 + }, + "Шиномонтаж": { + "count": 995 + } + }, + "car": { + "Audi": { + "count": 101 + }, + "BMW": { + "count": 139 + }, + "Chevrolet": { + "count": 75 + }, + "Citroen": { + "count": 259 + }, + "Fiat": { + "count": 83 + }, + "Ford": { + "count": 216 + }, + "Honda": { + "count": 134 + }, + "Hyundai": { + "count": 146 + }, + "Mazda": { + "count": 96 + }, + "Mercedes-Benz": { + "count": 218 + }, + "Mitsubishi": { + "count": 66 + }, + "Nissan": { + "count": 173 + }, + "Opel": { + "count": 161 + }, + "Peugeot": { + "count": 291 + }, + "Renault": { + "count": 356 + }, + "Skoda": { + "count": 92 + }, + "Suzuki": { + "count": 73 + }, + "Toyota": { + "count": 238 + }, + "Volkswagen": { + "count": 200 + }, + "Volvo": { + "count": 82 + }, + "Автозапчасти": { + "count": 290 + }, + "Автомагазин": { + "count": 64 + }, + "Шиномонтаж": { + "count": 263 + } + }, + "chemist": { + "Bipa": { + "count": 276 + }, + "Boots": { + "count": 94 + }, + "dm": { + "count": 873 + }, + "Douglas": { + "count": 62 + }, + "Etos": { + "count": 465 + }, + "Ihr Platz": { + "count": 76 + }, + "Kruidvat": { + "count": 114 + }, + "Müller": { + "count": 195 + }, + "Rossmann": { + "count": 1623 + }, + "Schlecker": { + "count": 201 + }, + "Superdrug": { + "count": 64 + } + }, + "clothes": { + "AWG": { + "count": 62 + }, + "Ackermans": { + "count": 91 + }, + "Adidas": { + "count": 81 + }, + "Adler": { + "count": 53 + }, + "American Apparel": { + "count": 53 + }, + "Benetton": { + "count": 96 + }, + "Bonita": { + "count": 143 + }, + "C&A": { + "count": 484 + }, + "Calzedonia": { + "count": 56 + }, + "Cecil": { + "count": 51 + }, + "Celio": { + "count": 71 + }, + "Charles Vögele": { + "count": 63 + }, + "Deichmann": { + "count": 61 + }, + "Dorothy Perkins": { + "count": 51 + }, + "Edgars": { + "count": 111 + }, + "Ernsting's family": { + "count": 286 + }, + "Esprit": { + "count": 209 + }, + "Etam": { + "count": 51 + }, + "Gap": { + "count": 74 + }, + "Gerry Weber": { + "count": 68 + }, + "H&M": { + "count": 607 + }, + "Jack & Jones": { + "count": 51 + }, + "Jack Wolfskin": { + "count": 55 + }, + "Jet": { + "count": 62 + }, + "Jules": { + "count": 61 + }, + "KiK": { + "count": 1148 + }, + "Kiabi": { + "count": 139 + }, + "Kohl's": { + "count": 101 + }, + "Lacoste": { + "count": 66 + }, + "Levi's": { + "count": 58 + }, + "Lindex": { + "count": 70 + }, + "Mango": { + "count": 115 + }, + "Matalan": { + "count": 83 + }, + "Mexx": { + "count": 65 + }, + "Mr Price": { + "count": 86 + }, + "NKD": { + "count": 444 + }, + "New Look": { + "count": 115 + }, + "New Yorker": { + "count": 173 + }, + "Next": { + "count": 163 + }, + "Old Navy": { + "count": 154 + }, + "Orsay": { + "count": 71 + }, + "Peacocks": { + "count": 86 + }, + "Pep": { + "count": 136 + }, + "Pimkie": { + "count": 72 + }, + "Primark": { + "count": 87 + }, + "Promod": { + "count": 71 + }, + "River Island": { + "count": 56 + }, + "Ross": { + "count": 77 + }, + "Street One": { + "count": 74 + }, + "TK Maxx": { + "count": 73 + }, + "Takko": { + "count": 476 + }, + "Tally Weijl": { + "count": 67 + }, + "Tommy Hilfiger": { + "count": 65 + }, + "Truworths": { + "count": 64 + }, + "Ulla Popken": { + "count": 59 + }, + "United Colors of Benetton": { + "count": 90 + }, + "Urban Outfitters": { + "count": 61 + }, + "Vero Moda": { + "count": 89 + }, + "Vögele": { + "count": 129 + }, + "Winners": { + "count": 59 + }, + "Woolworths": { + "count": 116 + }, + "Zara": { + "count": 199 + }, + "Zeeman": { + "count": 108 + }, + "s.Oliver": { + "count": 53 + }, + "Одежда": { + "count": 68 + }, + "洋服の青山": { + "count": 86 + } + }, + "computer": { + "DNS": { + "count": 119 + }, + "PC World": { + "count": 58 + } + }, + "convenience": { + "24 часа": { + "count": 56 + }, + "7-Eleven": { + "count": 3898 + }, + "8 à Huit": { + "count": 57 + }, + "ABC": { + "count": 138 + }, + "Alepa": { + "count": 63 + }, + "Alfamart": { + "count": 74 + }, + "Almacen": { + "count": 201 + }, + "BP": { + "count": 157 + }, + "Biedronka": { + "count": 67 + }, + "Boutique": { + "count": 59 + }, + "CBA": { + "count": 122 + }, + "COOP": { + "count": 122 + }, + "COOP Jednota": { + "count": 160 + }, + "CVS": { + "count": 64 + }, + "Carrefour City": { + "count": 54 + }, + "Carrefour Express": { + "count": 73 + }, + "Casey's General Store": { + "count": 80 + }, + "Casino": { + "count": 85 + }, + "Centra": { + "count": 112 + }, + "Central Convenience Store": { + "count": 52 + }, + "Chevron": { + "count": 57 + }, + "Circle K": { + "count": 269 + }, + "Citgo": { + "count": 63 + }, + "Coop": { + "count": 505 + }, + "Coop Jednota": { + "count": 58 + }, + "Costcutter": { + "count": 272 + }, + "Cumberland Farms": { + "count": 62 + }, + "Delikatesy": { + "count": 77 + }, + "Dollar General": { + "count": 101 + }, + "Dorfladen": { + "count": 76 + }, + "Epicerie": { + "count": 64 + }, + "Esso": { + "count": 64 + }, + "FamilyMart": { + "count": 489 + }, + "Food Mart": { + "count": 88 + }, + "Four Square": { + "count": 51 + }, + "Franprix": { + "count": 64 + }, + "Groszek": { + "count": 57 + }, + "Hasty Market": { + "count": 53 + }, + "Indomaret": { + "count": 126 + }, + "Jednota": { + "count": 56 + }, + "K-Market": { + "count": 57 + }, + "Kiosk": { + "count": 57 + }, + "Konzum": { + "count": 164 + }, + "Kum & Go": { + "count": 55 + }, + "Kwik Trip": { + "count": 69 + }, + "LAWSON": { + "count": 397 + }, + "Lewiatan": { + "count": 111 + }, + "Lidl": { + "count": 81 + }, + "Londis": { + "count": 341 + }, + "Mac's": { + "count": 147 + }, + "Mace": { + "count": 111 + }, + "McColl's": { + "count": 97 + }, + "Mercator": { + "count": 59 + }, + "Mini Market": { + "count": 190 + }, + "Mini Stop": { + "count": 210 + }, + "Mobil": { + "count": 63 + }, + "Nisa": { + "count": 52 + }, + "Nisa Local": { + "count": 71 + }, + "Oxxo": { + "count": 614 + }, + "One Stop": { + "count": 142 + }, + "Petit Casino": { + "count": 227 + }, + "Picard": { + "count": 53 + }, + "Potraviny": { + "count": 243 + }, + "Premier": { + "count": 123 + }, + "Proxi": { + "count": 114 + }, + "QuikTrip": { + "count": 59 + }, + "Rossmann": { + "count": 62 + }, + "SPAR": { + "count": 185 + }, + "Sainsbury's Local": { + "count": 96 + }, + "Sale": { + "count": 80 + }, + "Select": { + "count": 58 + }, + "Shell": { + "count": 241 + }, + "Siwa": { + "count": 212 + }, + "Sklep spożywczy": { + "count": 235 + }, + "Spar": { + "count": 888 + }, + "Społem": { + "count": 84 + }, + "Spożywczy": { + "count": 67 + }, + "Statoil": { + "count": 69 + }, + "Stewart's": { + "count": 254 + }, + "Stores": { + "count": 61 + }, + "Studenac": { + "count": 74 + }, + "Sunkus": { + "count": 63 + }, + "Tchibo": { + "count": 54 + }, + "Tesco": { + "count": 55 + }, + "Tesco Express": { + "count": 415 + }, + "The Co-operative Food": { + "count": 109 + }, + "Valintatalo": { + "count": 62 + }, + "Vival": { + "count": 182 + }, + "Volg": { + "count": 110 + }, + "Walgreens": { + "count": 89 + }, + "Wawa": { + "count": 129 + }, + "abc": { + "count": 61 + }, + "Å»abka": { + "count": 497 + }, + "Авоська": { + "count": 53 + }, + "Березка": { + "count": 71 + }, + "Весна": { + "count": 56 + }, + "Визит": { + "count": 55 + }, + "Виктория": { + "count": 67 + }, + "Гастроном": { + "count": 136 + }, + "Дикси": { + "count": 118 + }, + "Кировский": { + "count": 69 + }, + "Копеечка": { + "count": 56 + }, + "Кулинария": { + "count": 53 + }, + "Магазин": { + "count": 760 + }, + "Магнит": { + "count": 645 + }, + "Мария-Ра": { + "count": 76 + }, + "Мечта": { + "count": 53 + }, + "Минимаркет": { + "count": 97 + }, + "Монетка": { + "count": 59 + }, + "Надежда": { + "count": 54 + }, + "Перекресток": { + "count": 51 + }, + "Продукти": { + "count": 153 + }, + "Продуктовый": { + "count": 65 + }, + "Продуктовый магазин": { + "count": 87 + }, + "Продукты": { + "count": 3813 + }, + "Пятёрочка": { + "count": 377 + }, + "Радуга": { + "count": 80 + }, + "Смак": { + "count": 70 + }, + "Теремок": { + "count": 53 + }, + "Универсам": { + "count": 75 + }, + "магазин": { + "count": 102 + }, + "продукты": { + "count": 113 + }, + "เซเว่นอีเลฟเว่น": { + "count": 193 + }, + "მარკეტი (Market)": { + "count": 145 + }, + "サンクス": { + "count": 517 + }, + "サークルK": { + "count": 450, + "name:en": "Circle K" + }, + "スリーエフ": { + "count": 84 + }, + "セイコーマート (Seicomart)": { + "count": 52 + }, + "セブンイレブン": { + "count": 2742 + }, + "デイリーヤマザキ": { + "count": 124 + }, + "ファミリーマート": { + "count": 1352, + "name:en": "FamilyMart" + }, + "ミニストップ": { + "count": 282 + }, + "ローソン": { + "count": 1399, + "name:en": "LAWSON" + }, + "ローソンストア100": { + "count": 65 + }, + "ローソンストア100 (LAWSON STORE 100)": { + "count": 84 + }, + "全家": { + "count": 60 + }, + "全家便利商店": { + "count": 104 + } + }, + "department_store": { + "Big W": { + "count": 51 + }, + "Canadian Tire": { + "count": 69 + }, + "Costco": { + "count": 79 + }, + "Debenhams": { + "count": 65 + }, + "Galeria Kaufhof": { + "count": 57 + }, + "Karstadt": { + "count": 62 + }, + "Kmart": { + "count": 120 + }, + "Kohl's": { + "count": 123 + }, + "Macy's": { + "count": 119 + }, + "Marks & Spencer": { + "count": 59 + }, + "Sears": { + "count": 208 + }, + "Target": { + "count": 468 + }, + "Walmart": { + "count": 456 + }, + "Walmart Supercenter": { + "count": 67 + }, + "Woolworth": { + "count": 74 + }, + "Универмаг": { + "count": 57 + } + }, + "doityourself": { + "Ace Hardware": { + "count": 130 + }, + "B&Q": { + "count": 222 + }, + "Bauhaus": { + "count": 178 + }, + "Baumax": { + "count": 94 + }, + "Brico": { + "count": 99 + }, + "Bricomarché": { + "count": 213 + }, + "Bricorama": { + "count": 59 + }, + "Bunnings Warehouse": { + "count": 87 + }, + "Canadian Tire": { + "count": 92 + }, + "Castorama": { + "count": 160 + }, + "Gamma": { + "count": 105 + }, + "Hagebau": { + "count": 61 + }, + "Hagebaumarkt": { + "count": 109 + }, + "Hellweg": { + "count": 62 + }, + "Home Depot": { + "count": 789 + }, + "Home Hardware": { + "count": 66 + }, + "Homebase": { + "count": 224 + }, + "Hornbach": { + "count": 124 + }, + "Hubo": { + "count": 72 + }, + "Lagerhaus": { + "count": 71 + }, + "Leroy Merlin": { + "count": 197 + }, + "Lowes": { + "count": 1131 + }, + "Max Bahr": { + "count": 86 + }, + "Menards": { + "count": 62 + }, + "Mr Bricolage": { + "count": 87 + }, + "OBI": { + "count": 418 + }, + "Praktiker": { + "count": 187 + }, + "Rona": { + "count": 57 + }, + "Toom": { + "count": 69 + }, + "Toom Baumarkt": { + "count": 65 + }, + "Weldom": { + "count": 70 + }, + "Wickes": { + "count": 120 + }, + "Стройматериалы": { + "count": 165 + }, + "Хозтовары": { + "count": 68 + } + }, + "electronics": { + "Best Buy": { + "count": 297 + }, + "Comet": { + "count": 62 + }, + "Currys": { + "count": 80 + }, + "Darty": { + "count": 71 + }, + "Euronics": { + "count": 109 + }, + "Expert": { + "count": 117 + }, + "Future Shop": { + "count": 69 + }, + "Maplin": { + "count": 63 + }, + "Media Markt": { + "count": 273 + }, + "Radio Shack": { + "count": 226 + }, + "Saturn": { + "count": 147 + }, + "М.Видео": { + "count": 74 + }, + "Эльдорадо": { + "count": 171 + } + }, + "furniture": { + "But": { + "count": 58 + }, + "Conforama": { + "count": 90 + }, + "Dänisches Bettenlager": { + "count": 290 + }, + "IKEA": { + "count": 162 + }, + "Jysk": { + "count": 92 + }, + "Matratzen Concord": { + "count": 51 + }, + "Roller": { + "count": 77 + }, + "Мебель": { + "count": 190 + } + }, + "hairdresser": { + "Coiffeur": { + "count": 60 + }, + "Franck Provost": { + "count": 64 + }, + "Friseur": { + "count": 127 + }, + "Great Clips": { + "count": 155 + }, + "Klier": { + "count": 105 + }, + "Peluqueria": { + "count": 56 + }, + "Supercuts": { + "count": 89 + }, + "Парикмахерская": { + "count": 485 + }, + "Салон красоты": { + "count": 65 + } + }, + "hardware": { + "1000 мелочей": { + "count": 53 + }, + "Ace Hardware": { + "count": 82 + }, + "Home Depot": { + "count": 81 + }, + "Хозтовары": { + "count": 143 + } + }, + "hifi": { + "Best Buy": { + "count": 94 + }, + "Media Markt": { + "count": 57 + } + }, + "jewelry": { + "Bijou Brigitte": { + "count": 53 + }, + "Christ": { + "count": 55 + }, + "Swarovski": { + "count": 70 + } + }, + "mobile_phone": { + "AT&T": { + "count": 95 + }, + "Bell": { + "count": 191 + }, + "Bitė": { + "count": 73 + }, + "Carphone Warehouse": { + "count": 109 + }, + "Movistar": { + "count": 55 + }, + "O2": { + "count": 180 + }, + "Orange": { + "count": 220 + }, + "SFR": { + "count": 70 + }, + "Sprint": { + "count": 91 + }, + "T-Mobile": { + "count": 158 + }, + "The Phone House": { + "count": 81 + }, + "Verizon Wireless": { + "count": 97 + }, + "Vodafone": { + "count": 311 + }, + "au": { + "count": 56 + }, + "Билайн": { + "count": 113 + }, + "Евросеть": { + "count": 466 + }, + "МТС": { + "count": 311 + }, + "Мегафон": { + "count": 227 + }, + "Связной": { + "count": 396 + }, + "ソフトバンクショップ (SoftBank shop)": { + "count": 256 + }, + "ドコモショップ (docomo shop)": { + "count": 113 + } + }, + "motorcycle": { + "Honda": { + "count": 56 + }, + "Yamaha": { + "count": 58 + } + }, + "optician": { + "Alain Afflelou": { + "count": 68 + }, + "Apollo Optik": { + "count": 142 + }, + "Fielmann": { + "count": 219 + }, + "Krys": { + "count": 65 + }, + "Optic 2000": { + "count": 87 + }, + "Specsavers": { + "count": 109 + }, + "Vision Express": { + "count": 54 + }, + "Оптика": { + "count": 165 + } + }, + "pet": { + "Das Futterhaus": { + "count": 61 + }, + "Fressnapf": { + "count": 300 + }, + "PetSmart": { + "count": 150 + }, + "Petco": { + "count": 79 + }, + "Pets at Home": { + "count": 53 + }, + "Зоомагазин": { + "count": 95 + } + }, + "shoes": { + "Bata": { + "count": 88 + }, + "Brantano": { + "count": 67 + }, + "Clarks": { + "count": 97 + }, + "Deichmann": { + "count": 574 + }, + "Ecco": { + "count": 53 + }, + "Foot Locker": { + "count": 74 + }, + "La Halle aux Chaussures": { + "count": 63 + }, + "Payless Shoe Source": { + "count": 52 + }, + "Quick Schuh": { + "count": 69 + }, + "Reno": { + "count": 170 + }, + "Salamander": { + "count": 52 + }, + "Обувь": { + "count": 93 + } + }, + "sports": { + "Decathlon": { + "count": 286 + }, + "Dick's Sporting Goods": { + "count": 58 + }, + "Intersport": { + "count": 265 + }, + "Sport 2000": { + "count": 83 + }, + "Sports Authority": { + "count": 63 + }, + "Спортмастер": { + "count": 80 + } + }, + "stationery": { + "McPaper": { + "count": 79 + }, + "Office Depot": { + "count": 83 + }, + "Staples": { + "count": 262 + }, + "Канцтовары": { + "count": 57 + } + }, + "supermarket": { + "AD Delhaize": { + "count": 66 + }, + "ADEG": { + "count": 64 + }, + "ALDI": { + "count": 5182 + }, + "Aldi Süd": { + "count": 589 + }, + "ASDA": { + "count": 178 + }, + "Albert": { + "count": 185 + }, + "Albert Heijn": { + "count": 445 + }, + "Albertson's": { + "count": 96 + }, + "Albertsons": { + "count": 133 + }, + "Aldi Nord": { + "count": 194 + }, + "Alimerka": { + "count": 58 + }, + "Asda": { + "count": 221 + }, + "Auchan": { + "count": 144 + }, + "Billa": { + "count": 1417 + }, + "Biedronka": { + "count": 1227 + }, + "Bodega Aurrera": { + "count": 70 + }, + "Budgens": { + "count": 86 + }, + "C1000": { + "count": 332 + }, + "CBA": { + "count": 160 + }, + "COOP": { + "count": 187 + }, + "COOP Jednota": { + "count": 67 + }, + "Caprabo": { + "count": 96 + }, + "Carrefour": { + "count": 1575 + }, + "Carrefour City": { + "count": 109 + }, + "Carrefour Contact": { + "count": 73 + }, + "Carrefour Express": { + "count": 314 + }, + "Carrefour Market": { + "count": 79 + }, + "Casino": { + "count": 254 + }, + "Centra": { + "count": 51 + }, + "Champion": { + "count": 63 + }, + "Checkers": { + "count": 124 + }, + "Coop": { + "count": 1860 + }, + "Coles": { + "count": 381 + }, + "Colruyt": { + "count": 186 + }, + "Combi": { + "count": 56 + }, + "Conad": { + "count": 294 + }, + "Condis": { + "count": 65 + }, + "Consum": { + "count": 123 + }, + "Continente": { + "count": 66 + }, + "Coop Jednota": { + "count": 68 + }, + "Coop Konsum": { + "count": 78 + }, + "Costco": { + "count": 133 + }, + "Costcutter": { + "count": 62 + }, + "Countdown": { + "count": 90 + }, + "Dia": { + "count": 749 + }, + "dm": { + "count": 108 + }, + "Delhaize": { + "count": 219 + }, + "Delikatesy Centrum": { + "count": 56 + }, + "Denner": { + "count": 256 + }, + "Despar": { + "count": 143 + }, + "Diska": { + "count": 69 + }, + "Dunnes Stores": { + "count": 70 + }, + "E-Center": { + "count": 67 + }, + "E.Leclerc": { + "count": 341 + }, + "EDEKA": { + "count": 498 + }, + "Edeka": { + "count": 1811 + }, + "El Árbol": { + "count": 71 + }, + "Eroski": { + "count": 203 + }, + "Esselunga": { + "count": 82 + }, + "Eurospar": { + "count": 260 + }, + "Eurospin": { + "count": 153 + }, + "Extra": { + "count": 74 + }, + "Fakta": { + "count": 215 + }, + "Famiglia Cooperativa": { + "count": 62 + }, + "Famila": { + "count": 127 + }, + "Farmfoods": { + "count": 63 + }, + "Feneberg": { + "count": 61 + }, + "Food Basics": { + "count": 73 + }, + "Food Lion": { + "count": 175 + }, + "Foodland": { + "count": 92 + }, + "Foodworks": { + "count": 55 + }, + "Franprix": { + "count": 298 + }, + "Fred Meyer": { + "count": 63 + }, + "Fressnapf": { + "count": 66 + }, + "Føtex": { + "count": 67 + }, + "Game": { + "count": 53 + }, + "Giant": { + "count": 187 + }, + "Giant Eagle": { + "count": 69 + }, + "Géant Casino": { + "count": 53 + }, + "HEB": { + "count": 75 + }, + "HIT": { + "count": 62 + }, + "Hannaford": { + "count": 55 + }, + "Harris Teeter": { + "count": 84 + }, + "Hemköp": { + "count": 83 + }, + "Hofer": { + "count": 451 + }, + "Hoogvliet": { + "count": 52 + }, + "Hy-Vee": { + "count": 67 + }, + "ICA": { + "count": 195 + }, + "IGA": { + "count": 333 + }, + "Iceland": { + "count": 297 + }, + "Intermarche": { + "count": 107 + }, + "Intermarché": { + "count": 1155 + }, + "Interspar": { + "count": 142 + }, + "Irma": { + "count": 61 + }, + "Jumbo": { + "count": 175 + }, + "K+K": { + "count": 104 + }, + "Kaiser's": { + "count": 255 + }, + "Kaufland": { + "count": 996 + }, + "Kaufpark": { + "count": 100 + }, + "King Soopers": { + "count": 69 + }, + "Kiwi": { + "count": 164 + }, + "Konsum": { + "count": 139 + }, + "Konzum": { + "count": 225 + }, + "Kroger": { + "count": 280 + }, + "Kvickly": { + "count": 54 + }, + "LIDL": { + "count": 901 + }, + "Leader Price": { + "count": 242 + }, + "Leclerc": { + "count": 132 + }, + "Lewiatan": { + "count": 88 + }, + "Lider": { + "count": 65 + }, + "Lidl": { + "count": 6116 + }, + "M-Preis": { + "count": 81 + }, + "MPreis": { + "count": 54 + }, + "Makro": { + "count": 130 + }, + "Markant": { + "count": 91 + }, + "Marktkauf": { + "count": 133 + }, + "Match": { + "count": 146 + }, + "Maxi": { + "count": 100 + }, + "Maxima": { + "count": 107 + }, + "Maxima X": { + "count": 111 + }, + "Meijer": { + "count": 74 + }, + "Mercadona": { + "count": 707 + }, + "Mercator": { + "count": 119 + }, + "Merkur": { + "count": 113 + }, + "Metro": { + "count": 250 + }, + "Migros": { + "count": 433 + }, + "Minipreço": { + "count": 99 + }, + "Monoprix": { + "count": 194 + }, + "Morrisons": { + "count": 405 + }, + "Netto": { + "count": 4309 + }, + "NORMA": { + "count": 113 + }, + "NP": { + "count": 153 + }, + "Nah & Frisch": { + "count": 76 + }, + "Nahkauf": { + "count": 166 + }, + "Neukauf": { + "count": 81 + }, + "New World": { + "count": 67 + }, + "No Frills": { + "count": 101 + }, + "Norma": { + "count": 1054 + }, + "PENNY": { + "count": 78 + }, + "Pam": { + "count": 53 + }, + "Penny": { + "count": 1766 + }, + "Penny Market": { + "count": 397 + }, + "Penny Markt": { + "count": 464 + }, + "Petit Casino": { + "count": 106 + }, + "Pick n Pay": { + "count": 237 + }, + "Piggly Wiggly": { + "count": 53 + }, + "Pingo Doce": { + "count": 238 + }, + "Piotr i Paweł": { + "count": 52 + }, + "Plodine": { + "count": 52 + }, + "Plus": { + "count": 138 + }, + "Polo Market": { + "count": 81 + }, + "Price Chopper": { + "count": 96 + }, + "Profi": { + "count": 55 + }, + "Publix": { + "count": 312 + }, + "REWE": { + "count": 1440 + }, + "Real": { + "count": 337 + }, + "Reliance Fresh": { + "count": 63 + }, + "Rema 1000": { + "count": 360 + }, + "Rewe": { + "count": 1194 + }, + "Rimi": { + "count": 103 + }, + "Rossmann": { + "count": 88 + }, + "S-Market": { + "count": 107 + }, + "SPAR": { + "count": 275 + }, + "Safeway": { + "count": 436 + }, + "Sainsbury's": { + "count": 538 + }, + "Sainsbury's Local": { + "count": 101 + }, + "Sam's Club": { + "count": 125 + }, + "Santa Isabel": { + "count": 123 + }, + "Shopi": { + "count": 57 + }, + "Shoprite": { + "count": 235 + }, + "Simply Market": { + "count": 310 + }, + "Sobeys": { + "count": 117 + }, + "Soriana": { + "count": 91 + }, + "Spar": { + "count": 2028 + }, + "Społem": { + "count": 54 + }, + "Stokrotka": { + "count": 84 + }, + "Stop & Shop": { + "count": 55 + }, + "Super Brugsen": { + "count": 63 + }, + "Super U": { + "count": 462 + }, + "SuperBrugsen": { + "count": 68 + }, + "Tesco": { + "count": 1285 + }, + "Target": { + "count": 199 + }, + "tegut": { + "count": 220 + }, + "Tengelmann": { + "count": 191 + }, + "Tesco Express": { + "count": 373 + }, + "Tesco Extra": { + "count": 118 + }, + "Tesco Metro": { + "count": 125 + }, + "The Co-operative": { + "count": 60 + }, + "The Co-operative Food": { + "count": 113 + }, + "Trader Joe's": { + "count": 182 + }, + "Treff 3000": { + "count": 95 + }, + "Unimarc": { + "count": 169 + }, + "Unimarkt": { + "count": 80 + }, + "Volg": { + "count": 127 + }, + "Waitrose": { + "count": 252 + }, + "Walmart": { + "count": 600 + }, + "Walmart Supercenter": { + "count": 103 + }, + "Wasgau": { + "count": 60 + }, + "Whole Foods": { + "count": 191 + }, + "Willys": { + "count": 54 + }, + "Woolworths": { + "count": 519 + }, + "Zielpunkt": { + "count": 240 + }, + "coop": { + "count": 71 + }, + "nahkauf": { + "count": 79 + }, + "sky": { + "count": 100 + }, + "АТБ": { + "count": 289 + }, + "Десяточка": { + "count": 51 + }, + "Дикси": { + "count": 562 + }, + "Евроопт": { + "count": 57 + }, + "Карусель": { + "count": 55 + }, + "Квартал": { + "count": 93 + }, + "Копейка": { + "count": 96 + }, + "Магазин": { + "count": 113 + }, + "Магнит": { + "count": 1635 + }, + "Магнолия": { + "count": 70 + }, + "Мария-Ра": { + "count": 94 + }, + "Монетка": { + "count": 163 + }, + "Народная 7Я семьЯ": { + "count": 147 + }, + "Перекресток": { + "count": 310 + }, + "Полушка": { + "count": 133 + }, + "Продукты": { + "count": 96 + }, + "Пятёрочка": { + "count": 1232 + }, + "Седьмой континент": { + "count": 81 + }, + "Семья": { + "count": 61 + }, + "Сільпо": { + "count": 118 + }, + "Фора": { + "count": 52 + }, + "Фуршет": { + "count": 76 + }, + "マルエツ": { + "count": 52 + }, + "ヨークマート (YorkMart)": { + "count": 62 + }, + "西友 (SEIYU)": { + "count": 55 + } + }, + "toys": { + "La Grande Récré": { + "count": 55 + }, + "Toys R Us": { + "count": 135 + }, + "Детский мир": { + "count": 81 + } + }, + "travel_agency": { + "Flight Centre": { + "count": 85 + }, + "Thomas Cook": { + "count": 100 + } + }, + "variety_store": { + "Dollar General": { + "count": 53 + }, + "Dollar Tree": { + "count": 76 + }, + "Dollarama": { + "count": 90 + }, + "Tedi": { + "count": 138 + } + }, + "video": { + "Blockbuster": { + "count": 197 + }, + "World of Video": { + "count": 66 + } + } + } } }; \ No newline at end of file diff --git a/vendor/assets/iD/iD/img/maki-sprite.png b/vendor/assets/iD/iD/img/maki-sprite.png index cbcba82e2..af7b5322c 100644 Binary files a/vendor/assets/iD/iD/img/maki-sprite.png and b/vendor/assets/iD/iD/img/maki-sprite.png differ diff --git a/vendor/assets/iD/iD/img/sprite.svg b/vendor/assets/iD/iD/img/sprite.svg index e6a0aba9f..fc0bbdde5 100644 --- a/vendor/assets/iD/iD/img/sprite.svg +++ b/vendor/assets/iD/iD/img/sprite.svg @@ -13,7 +13,7 @@ width="800" height="560" id="svg12393" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.2 r9819" sodipodi:docname="sprite.svg"> + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:snap-bbox-midpoints="true" + inkscape:snap-nodes="false"> @@ -509,12 +512,12 @@ style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0" /> @@ -1635,9 +1638,19 @@ style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0" /> + + @@ -2149,5 +2161,61 @@ inkscape:connector-curvature="0" /> + + + + + + + + + + diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json index 416a8a21c..64a725844 100644 --- a/vendor/assets/iD/iD/locales/af.json +++ b/vendor/assets/iD/iD/locales/af.json @@ -185,7 +185,6 @@ "title": "Agtergrond", "description": "Agtergrond stellings", "percent_brightness": "{opacity}% helderheid", - "fix_misalignment": "Lyn op", "reset": "begin van voor" }, "restore": { @@ -235,14 +234,11 @@ }, "cannot_zoom": "Kan nie verder uitzoom in die huidige mode nie.", "gpx": { - "local_layer": "Plaaslike GPX leer", - "drag_drop": "Sleep en laat val 'n .gpx leer op die bladsy" + "local_layer": "Plaaslike GPX leer" }, "help": { "title": "Help", - "help": "# Help\n\nHierdie is 'n probram vir [OpenStreetMap](http://www.openstreetmap.org/), die gratis en veranderbarie kaart van die wêreld. Jy kan dit gebruik om nuwe data by te voeg of op te dateer waar jy bly en die \"open-source\" en \"open-data\" kaart beter te maak vir almal wat dit gebruik.\n\nVerandering wat jy aanbring op die kaart sal sigbaar wees vir almal at OpenStreetMap gebruik. Jy het nodig om 'n [nuwe gebruikersnaam](https://www.openstreetmap.org/user/new) vir jou self te skep voor jy data kan toevoeg by die kaart. \n\nDie [iD editor](http://ideditor.com/) is 'n gemeenskapsprojek met die [kode beskikbaar op GitHub](https://github.com/systemed/iD).\n", - "imagery": "# Lugfotos\n\nLugfotos is 'n belangrike bron vir kaartwerk. 'n Kombinasie van vliegtuie, satelliete en ander gratis bronne is beskikbaar in die program en soos wat jy rondbeweeg en in uit zoom na ander geografiese areas, gaan ander bronne beskikbaar word. \n\nLugfotos is partykeer uit fase uit met die kaart data en is gewoonlik as gevolg van 'n probleem an die lugfotoverskaffer se kant. As jy dus 'n gedeelte van die kaart sien wat lyk of dit als geskuif is moet dit nie dadelik reg skuif nie. Jy kan die lugfotos regskuif deur op 'Verbeter ligging' te klick aan die onderkant van Agtergrond Stellings.\n", - "inspector": "# Gebruik van die eienskapslys\n\nDie eienskapslys verskyn op die regterkant wanneer jy 'n item kies met die muis en laat jou toe om eienskappe te verander of by te voeg.\n\n### Kies 'n eienskap tipe\nWanneer jy punt, lyn of area bygevoeg het dan kan jy die eienskap tipe kies soos byvoorbeeld 'n snelweg, residentieele pad, supermark of 'n kafee. Die eienskapslys sal knoppies wys vir al die algmene eienskap tipes en jy kan meer vind deur in die soek boks te tik vir wat jy soek. \n\nOm meer van 'n eienskap te leer klick op die 'i' in die onder regterkantse hoek van die eienskapsknoppie. Klick om 'n eienskapsknoppie om dit aan die kaart item toe te ken.\n\n### Gebruik van vorms en verandering van eienskappe\n\nNa jy 'n eienskaptipe gekies het of wanneer jy 'n item gekies het wat reeds eienskappe het, dan sal die eienskaps lys die detail wys van die item soos die naam en adres. \n\nOnder die lys van eienskappe is 'n lys van ikone met meer detail soos die [Wikipedia](http://www.wikipedia.org/) bladsy, rolstoel toegang en meer.\n\nJy kan ook op Aditioneele Eienskappe klick aan die onderkant van die eienskapslys om meer eienskappe by te voeg wat relevant is. [Taginfo](http://taginfo.openstreetmap.org/) is 'n goeie bron in Engels om meer van die gewilde eienskapkombinasies te leer.\n\nVerandering wat jy in die eienskapslys maak word automaties deel van die kaart. Jy kan dit ongedaan maak deur op die 'Ongedaan' knoppie te klick. \n\n### Toemaak van die eienskapslys\n\nJy kan die eienskapslys toemaak deur op die teomaakknoppie regs bo te klick or deur die 'Esc' sleutel te druk, of om op die kaart te klick.\n\n\n" + "help": "# Help\n\nHierdie is 'n probram vir [OpenStreetMap](http://www.openstreetmap.org/), die gratis en veranderbarie kaart van die wêreld. Jy kan dit gebruik om nuwe data by te voeg of op te dateer waar jy bly en die \"open-source\" en \"open-data\" kaart beter te maak vir almal wat dit gebruik.\n\nVerandering wat jy aanbring op die kaart sal sigbaar wees vir almal at OpenStreetMap gebruik. Jy het nodig om 'n [nuwe gebruikersnaam](https://www.openstreetmap.org/user/new) vir jou self te skep voor jy data kan toevoeg by die kaart. \n\nDie [iD editor](http://ideditor.com/) is 'n gemeenskapsprojek met die [kode beskikbaar op GitHub](https://github.com/systemed/iD).\n" }, "intro": { "navigation": { @@ -292,9 +288,6 @@ }, "category-route": { "name": "Roete" - }, - "category-water": { - "name": "Water" } }, "fields": { @@ -688,10 +681,12 @@ "name": "Karwas" }, "amenity/cinema": { - "name": "Fliek" + "name": "Fliek", + "terms": "Fliek, Inry, Movie, Silverdoek" }, "amenity/college": { - "name": "Kollege" + "name": "Kollege", + "terms": "kollege, landboukollege, raad, genootskap" }, "amenity/courthouse": { "name": "Hof" @@ -729,9 +724,6 @@ "amenity/marketplace": { "name": "Markplein" }, - "amenity/parking": { - "name": "Parkering" - }, "amenity/pharmacy": { "name": "Apteek" }, @@ -982,130 +974,173 @@ "name": "Laagte" }, "landuse/cemetery": { - "name": "Begrafplaas" + "name": "Begrafplaas", + "terms": "begrafplaas, kerkhof, dodeakker, godsakker" }, "landuse/commercial": { - "name": "Kommersieel" + "name": "Kommersieel", + "terms": "kommersieel, handeldrywend, " }, "landuse/construction": { - "name": "Konstruksie" + "name": "Konstruksie", + "terms": "Konstruksie" }, "landuse/farm": { - "name": "Plaas" + "name": "Plaas", + "terms": "Plaas" }, "landuse/farmyard": { - "name": "Plaaswerf" + "name": "Plaaswerf", + "terms": "plaaswerf" }, "landuse/forest": { - "name": "Woud" + "name": "Woud", + "terms": "Woud, Oerwoud, Bos" }, "landuse/grass": { - "name": "Gras" + "name": "Gras", + "terms": "Gras, weiveld" }, "landuse/industrial": { - "name": "Industrieel" + "name": "Industrieel", + "terms": "industrieel, nyweraar" }, "landuse/meadow": { - "name": "Weiveld" + "name": "Weiveld", + "terms": "weiland, grasland, weiveld" }, "landuse/orchard": { - "name": "Boord" + "name": "Boord", + "terms": "boord, vrugteboord" }, "landuse/quarry": { - "name": "Kwarrie" + "name": "Kwarrie", + "terms": "steengroef, klipbreekgat, groef" }, "landuse/residential": { - "name": "Residensieel" + "name": "Residensieel", + "terms": "residensieel, huisadres, woonhuis" }, "landuse/retail": { - "name": "Kleinhandel" + "name": "Kleinhandel", + "terms": "kleinhandel, kleinhandelsaak" }, "landuse/vineyard": { - "name": "Druiweprieel" + "name": "Druiweprieel", + "terms": "wingerd" }, "leisure": { "name": "Gemak" }, + "leisure/dog_park": { + "name": "Hondepark", + "terms": "hondepark" + }, "leisure/garden": { - "name": "Tuin" + "name": "Tuin", + "terms": "Tuin, gedenktuin" }, "leisure/golf_course": { - "name": "Golfbaan" + "name": "Golfbaan", + "terms": "Golfbaan" }, "leisure/marina": { - "name": "Vasmeerplek" + "name": "Vasmeerplek", + "terms": "marina, jaghawe, waterdorp" }, "leisure/park": { - "name": "Park" + "name": "Park", + "terms": "Park" }, "leisure/pitch": { - "name": "Sport Veld" + "name": "Sport Veld", + "terms": "Sportveld" }, "leisure/pitch/american_football": { - "name": "Amerikaanse Voetbal Veld" + "name": "Amerikaanse Voetbal Veld", + "terms": "Amerikaanse voetbalveld" }, "leisure/pitch/baseball": { - "name": "Bofpalveld" + "name": "Bofpalveld", + "terms": "bofbaldiamant" }, "leisure/pitch/basketball": { - "name": "Basketbalbaan" + "name": "Basketbalbaan", + "terms": "Korfbalbaan" }, "leisure/pitch/soccer": { - "name": "Sokkerveld" + "name": "Sokkerveld", + "terms": "Sokkerveld" }, "leisure/pitch/tennis": { - "name": "Tennisbaan" + "name": "Tennisbaan", + "terms": "Tennisbaan" }, "leisure/pitch/volleyball": { - "name": "Vlugbalbaan" + "name": "Vlugbalbaan", + "terms": "Vlugbalbaan" }, "leisure/playground": { - "name": "Speelpark" + "name": "Speelpark", + "terms": "Speelgrond, speelplek, terein" }, "leisure/slipway": { - "name": "Inglipbaan" + "name": "Inglipbaan", + "terms": "inglipbaan,oprit,afrit" }, "leisure/stadium": { - "name": "Stadium" + "name": "Stadium", + "terms": "stadion" }, "leisure/swimming_pool": { - "name": "Swembad" + "name": "Swembad", + "terms": "swembad" }, "line": { - "name": "Lyn" + "name": "Lyn", + "terms": "Lyn" }, "man_made": { "name": "Mens gemaak" }, "man_made/breakwater": { - "name": "Breekwater" + "name": "Breekwater", + "terms": "breekwater,seebreker,golfbreker" }, "man_made/lighthouse": { - "name": "Ligtoring" + "name": "Ligtoring", + "terms": "Lugtoring" }, "man_made/pier": { - "name": "Landingsplek" + "name": "Landingsplek", + "terms": "pier,landingshoof,wandelhoof" }, "man_made/pipeline": { - "name": "Pyplyn" + "name": "Pyplyn", + "terms": "pyplyn" }, "man_made/survey_point": { "name": "Landmeterspunt" }, "man_made/tower": { - "name": "Toring" + "name": "Toring", + "terms": "Toring,paal" }, "man_made/wastewater_plant": { - "name": "Rioolplaas" + "name": "Rioolplaas", + "terms": "rioolplaas" }, "man_made/water_tower": { - "name": "Watertoring" + "name": "Watertoring", + "terms": "Watertoring" }, "man_made/water_well": { - "name": "Put" + "name": "Put", + "terms": "put" }, "man_made/water_works": { - "name": "Waterwerke" + "name": "Waterwerke", + "terms": "waterwerke" }, "natural": { "name": "Natuur" @@ -1114,16 +1149,20 @@ "name": "Baai" }, "natural/beach": { - "name": "Strand" + "name": "Strand", + "terms": "strand" }, "natural/cliff": { - "name": "Krans" + "name": "Krans", + "terms": "krans" }, "natural/coastline": { - "name": "Kuslyn" + "name": "Kuslyn", + "terms": "kuslyn" }, "natural/glacier": { - "name": "Gletser" + "name": "Gletser", + "terms": "gletser" }, "natural/grassland": { "name": "Grasvlakte" @@ -1141,40 +1180,49 @@ "name": "Fontein" }, "natural/tree": { - "name": "Boom" + "name": "Boom", + "terms": "Boom" }, "natural/water": { - "name": "Water" + "name": "Water", + "terms": "water" }, "natural/water/lake": { - "name": "Meer" + "name": "Meer", + "terms": "Meer" }, "natural/water/pond": { "name": "Dammetjie" }, "natural/water/reservoir": { - "name": "Reservoir" + "name": "Reservoir", + "terms": "Reservoir" }, "natural/wetland": { "name": "Vleiland" }, "natural/wood": { - "name": "Woud" + "name": "Woud", + "terms": "Woud" }, "office": { - "name": "Kantoor" + "name": "Kantoor", + "terms": "Kantoor" }, "place": { - "name": "Plek" + "name": "Plek", + "terms": "Plek" }, "place/city": { - "name": "Stad" + "name": "Stad", + "terms": "Stad" }, "place/hamlet": { "name": "Dorpie" }, "place/island": { - "name": "Eiland" + "name": "Eiland", + "terms": "Eiland" }, "place/isolated_dwelling": { "name": "Afgeleë blyplek" @@ -1183,34 +1231,43 @@ "name": "Ligging" }, "place/town": { - "name": "Dorp" + "name": "Dorp", + "terms": "Dorp" }, "place/village": { - "name": "Dorpie" + "name": "Dorpie", + "terms": "Dorpie" }, "point": { "name": "Punt" }, "power": { - "name": "Krag" + "name": "Krag", + "terms": "Krag" }, "power/line": { - "name": "Kraglyn" + "name": "Kraglyn", + "terms": "Kraglyn,kragdraad" }, "power/pole": { - "name": "Kragpaal" + "name": "Kragpaal", + "terms": "Kragpaal" }, "power/sub_station": { - "name": "Substasie" + "name": "Substasie", + "terms": "Substasie" }, "power/tower": { - "name": "Hoogspanningstoring" + "name": "Hoogspanningstoring", + "terms": "Hoogspanningstoring" }, "power/transformer": { - "name": "Transformator" + "name": "Transformator", + "terms": "transformator" }, "railway": { - "name": "Spoorlyn" + "name": "Spoorlyn", + "terms": "Spoorweg" }, "railway/abandoned": { "name": "Verlate spoorlyn" diff --git a/vendor/assets/iD/iD/locales/ar-AA.json b/vendor/assets/iD/iD/locales/ar-AA.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/vendor/assets/iD/iD/locales/ar-AA.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json index df71a97e9..6470d646f 100644 --- a/vendor/assets/iD/iD/locales/ar.json +++ b/vendor/assets/iD/iD/locales/ar.json @@ -1,77 +1,450 @@ { "modes": { "add_area": { - "title": "المساحة" + "title": "المساحة", + "description": "أضف مواقف أو مباني أو بحيرات أو مناطق أخرى إلى الخارطة.", + "tail": "إنقرعلى الخارطة للبدء ببتحديد منطقة، مثلاً حديقة، بجيرة، أو مبنى." }, "add_line": { - "title": "طريق" + "title": "خط", + "description": "أضف طرق سريعة، شوارع، معابر للمشاة، قنوات أو خطوط أخرى للخارطة.", + "tail": "إنقر على الخارطة " }, "add_point": { - "title": "نقطة" + "title": "نقطة", + "description": "أضف مطاعم، نُصب تذكارية، مكاتب بريد أو نقاط اخرى إلى الخارطة.", + "tail": "إنقر على الخارطة ﻹضافة نقطة. " }, "browse": { - "title": "عرض" + "title": "عرض", + "description": "حرك و حجّم الخريطة" + }, + "draw_area": { + "tail": "انقر لإضافة عقد إلى منطقتك. انقر على العقدة الأولى لإنهاء تحديد المنطقة." + }, + "draw_line": { + "tail": "انقر لإضافة المزيد من العقد إلى الخط. انقر على الخطوط الأخرى لوصلها مع بعضها البعض، وانقر بشكل مزدوج لإنهاء الخط." } }, "operations": { + "add": { + "annotation": { + "point": "أضف نقطة", + "vertex": "أضف عقدة إلى طريق", + "relation": "أضف علاقة" + } + }, + "start": { + "annotation": { + "line": "ابدأ خطا", + "area": "ابدأ مساحة" + } + }, + "continue": { + "title": "اﻹستمرار", + "description": "أكمل هذا الخط.", + "not_eligible": "لا يوجد خط يمكن تكملته هنا.", + "multiple": "يمكن استمرارية عدة خطوط هنا. لاختيار خط، اضغط على مفتاح Shift وانقر عليه لتحديده.", + "annotation": { + "line": "استمر في الخط", + "area": "استمر في مساحة" + } + }, + "cancel_draw": { + "annotation": "إلغاء الرسم" + }, + "change_tags": { + "annotation": "غير الوسوم" + }, + "circularize": { + "title": "تدوير", + "description": { + "line": "اجعل هذا الخط دائري.", + "area": "إجعل هذه المنطقة دائرية." + }, + "key": "O", + "annotation": { + "line": "دوّر خطاً.", + "area": "دوّر منطقة." + }, + "not_closed": "هذه لا يمكن جعلها دائرية لأنها ليست حلقة." + }, + "orthogonalize": { + "title": "مربع", + "description": { + "line": "ربّع زوايا هذا الخط.", + "area": "ربّع زوايا هذه المنطقة." + }, + "key": "S", + "annotation": { + "line": "ربّع زوايا الخط.", + "area": "ربّع زوايا المنطقة." + } + }, + "straighten": { + "title": "مستقيم", + "description": "اجعل هذا الخط مستقيماً.", + "annotation": "قوُم خطاً." + }, "delete": { "title": "حذف", "description": "احذف هذه من الخريطة", "annotation": { "point": "احذف نقطة", - "line": "احذف طريق", + "vertex": "احذف عقدة من طريق", + "line": "احذف خطا", "area": "احذف مساحة", + "relation": "احذف علاقة", "multiple": "احذف {n} اشياء" + }, + "incomplete_relation": "لا يمكن حذف هذه الميزة لأنه لم يتم تحميلها بالكامل." + }, + "add_member": { + "annotation": "أضاف عضو إلى علاقة." + }, + "delete_member": { + "annotation": "حذف عضو من علاقة." + }, + "connect": { + "annotation": { + "point": "أوصل طريقا إلى نقطة", + "vertex": "أوصل طريقا إلى الآخر", + "line": "أوصل طريقا بخط", + "area": "أوصل طريقا بمنطقة." } }, + "disconnect": { + "title": "إقطع اﻹتصال", + "description": "افصل هذه الخطوط و المناطق عن بعضها البعض", + "key": "D", + "annotation": "افصل الخطوط/ المناطق", + "not_connected": "لا توجد خطوط/مناطق كافية هنا لفصلها." + }, "merge": { "title": "دمج", - "description": "ادمج هذه الطرق" + "description": "ادمج هذه الخطوط", + "key": "C", + "annotation": "ادمج {n} خطوط", + "not_adjacent": "لا يمكن دمج هذه الخطوط لأنها غير متصلة.", + "restriction": "لا يمكن دمج هذه الخطوط بسبب أن أحدها على الأقل لديه علاقة بـ \"{relation}\"" }, "move": { - "title": "تحريك" + "title": "تحريك", + "description": "إنقل هذه إلى مكان مختلف.", + "key": "M", + "annotation": { + "point": "نقل نقطة", + "vertex": "حرك عقدة إلى طريق", + "line": "حرك خطا", + "area": "حرك منطقة", + "multiple": "حرك عدة كائنات" + } }, "rotate": { - "title": "تدوير" + "title": "تدوير", + "description": "دوّر هذا الكائن حول نقطة مركزه.", + "key": "R", + "annotation": { + "line": "تدوير خطا", + "area": "تدوير منطقة" + } + }, + "reverse": { + "title": "اعكس الاتجاه", + "description": "اجعل هذا الخط يذهب في الجهة المعاكسة", + "key": "V", + "annotation": "اعكس خطا" }, "split": { - "title": "فصل" + "title": "فصل", + "description": { + "line": "افصل هذا الخط الى قسمين في هذه العقدة.", + "multiple": "افصل الخطوط / حدود المنطقة في هذه العقدة إلى قسمين." + }, + "key": "X", + "annotation": { + "line": "افصل الخط.", + "multiple": "افصل حدود {n} خطوط/منطقة" + }, + "not_eligible": "لا يمكن فصل الخطوط عند البداية أو النهاية.", + "multiple_ways": "توجد الكثير من الخطوط هنا لفصلها." } }, + "undo": { + "tooltip": "تراجع: {action}", + "nothing": "لا يوجد شيء للتراجع" + }, + "redo": { + "tooltip": "إعادة: {action}", + "nothing": "لا يوجد شيء للإعادة" + }, + "tooltip_keyhint": "اﻹختصار:", + "browser_notice": "هذا المحرر يدعم Firefox و Chrome وSafari وOpera و Internet Explorer 9 وما فوق. الرجاء ترقية متصفحك أو استخدم Potlatch 2 لتحرير الخريطة. ", + "translate": { + "translate": "ترّجم", + "localized_translation_label": "اسم متعدد اللغات", + "localized_translation_language": "إختر اللغة", + "localized_translation_name": "اﻷسم" + }, + "zoom_in_edit": "كبّر للتحرير", "logout": "تسجيل خروج", + "loading_auth": "اﻹتصال ب OpenStreetMap جاري ....", + "report_a_bug": "بلّغ عن علة", + "status": { + "error": "تعذر اﻹتصال مع واجهة التطبيق البرمجية.", + "offline": "حالة API غير متصلة. الرجاء محاولة التحرير لاحقا." + }, "commit": { + "title": "إحفظ التغييرات", + "description_placeholder": "وصف مختصر لمساهماتك", + "message_label": "شرح التغيير ", "save": "حفظ", "cancel": "إلغاء", - "deleted": "محذوف" + "warnings": "تنبيه", + "modified": "عُدل", + "deleted": "محذوف", + "created": "اٌنشى" + }, + "contributors": { + "list": "حرر بواسطة{users}", + "truncated_list": "حرر بواسطة{users} و {count} آخرون" + }, + "geocoder": { + "search": "إبحث في جميع أنحاء العالم ...", + "no_results_visible": "لا نتائج في منطقة الخارطة الظاهرة", + "no_results_worldwide": "لم يتم العثور على نتائج" + }, + "geolocate": { + "title": "إعرض مكاني " + }, + "inspector": { + "no_documentation_combination": "لا يوجد توثيقا لهذا الجمع من الوسوم", + "no_documentation_key": "لا يوجد توثيقا لهذا المفتاح", + "show_more": "مشاهدة المزيد", + "view_on_osm": "العرض على openstreetmap.org", + "all_tags": "كل البطاقات", + "all_members": "كل اﻷعضاء", + "all_relations": "كل العلاقات", + "new_relation": "علاقة جديدة....", + "role": "الدور", + "choose": "اختر نوع الميزة", + "results": "{n} نتيجة لـ {search}", + "reference": "العرض على ويكي openstreetmap.org", + "back_tooltip": "غيّر ميزة", + "remove": "إزالة", + "search": "البحث", + "multiselect": "العناصر المحددة", + "unknown": "غير معروف", + "feature_list": "إبحث عن الميزات", + "edit": "حرر ميزة", + "none": "None" + }, + "background": { + "title": "الخلفية", + "description": "ضبط الخلفية", + "percent_brightness": "{opacity}% وضوح", + "none": "لا شيء", + "custom": "الجمارك", + "fix_misalignment": "إصلح المحاذاة", + "reset": "إعادة الضبط" }, "restore": { - "restore": "إستعادة" + "heading": "لديك تعديلات غير محفوظة", + "description": "هل ترغب بإستعادة التغييرات الغير محفوظة من جلسة التعديل السابقة؟", + "restore": "إستعادة", + "reset": "إعادة الضبط" }, "save": { - "title": "حفظ" + "title": "حفظ", + "help": "احفظ التغييرات في OpenStreetMap لجعلها ظاهرة لبقية المستخدمين.", + "no_changes": "لا يوجد تعديلات للحفظ.", + "error": "حدث خطاء أثناء محاولة الحفظ", + "uploading": "يجري رفع التغييرات إلى OpenStreetMap.", + "unsaved_changes": "لديك تغييرات غير محفوظة" + }, + "success": { + "just_edited": "لقد قمت بتحرير OpenStreetMap !", + "view_on_osm": "عرض على OSM", + "facebook": "شارك على فيس بوك", + "twitter": "شارك على تويتر", + "google": "شارك على قوقل +" + }, + "confirm": { + "okay": "حسناً" + }, + "splash": { + "welcome": "مرحبا بك محرر iD لخرائط OpenStreetMap.", + "walkthrough": "إبداء التجول", + "start": "التحرير اﻷن" + }, + "source_switch": { + "live": "حي", + "lose_changes": "لديك تغييرات غير محفوظة. عملية تغيير مخدم الخريطة سيلغيها. هل أنت متأكد من تغيير المخدم؟", + "dev": "تطوير" + }, + "tag_reference": { + "description": "الوصف", + "on_wiki": "{tag} في wiki.osm.org", + "used_with": "يستخدم مع {type}" + }, + "validations": { + "untagged_point": "ألغ وسم النقطة", + "untagged_line": "ألغ وسم الخط", + "untagged_area": "ألغ وسم المنطقة", + "many_deletions": "ستحذف {n} من الكائنات. هل أنت متأكد من ذلك؟ ستنحذف تلك البيانات من الخريطة التي يراها الآخرين على openstreetmap.org.", + "tag_suggests_area": "الوسم {tag} يقترح بأن الخط يجب أن يكون منطقة، ولكنها حاليا ليست منطقة", + "deprecated_tags": "وسوم مهجورة: {tags}" + }, + "zoom": { + "in": "التكبير ", + "out": "التصغير" + }, + "cannot_zoom": "لايمكن تصغير أكثر في الوضع الحالي.", + "gpx": { + "local_layer": "ملف GPX محلي" + }, + "help": { + "title": "المساعدة" + }, + "intro": { + "navigation": { + "title": "التجوال", + "drag": "منطقة الخريطة الرئيسية تظهر بيانات OpenStreetMap فوق الخريطة. يمكنك استكشافها عن طريق السحب و التمرير، كأي خريطة وب. ** اسحب الخريطة!**", + "select": "تظهر مميزات الخريطة ثلاثة طرق: استخدام النقاط، والخطوط و المناطق. يمكن تحديد كل المميزات عن طريق النقر عليهم. **انقر على النقطة لتحديدها.**", + "header": "تظهر لنا الترويسة نوع الميزة." + }, + "points": { + "title": "النقاط", + "choose": "**إختر الكافتريا من القائمة.**", + "fixname": "**غيّر الاسم وأغلق محرر الميزة.**", + "delete": "القائمة حول النقطة تحتوي على العمليات التي يمكن القيام بها عليها، بما في ذلك الحذف. ** حذف نقطة. **" + }, + "areas": { + "title": "المناطق", + "choose": "**إختر ساحة اللعب من القائمة.**" + }, + "lines": { + "title": "الخطوط", + "add": "تستخدم الخطوط لتمثيل مميزات من مثل الطرق، و سكك الحديد، و الأنهار. ** انقر على زر الخط لإضافة خط جديد.**", + "start": "**أبدأ الخط من خلال النقر على نهاية الطريق.**", + "finish": "يمكن أن تنهي الخطوط عن طريق النقر على آخر العقدة مجددا. ** أنهي رسم الشارع.**", + "road": "**إختر الطريق من القائمة.**", + "describe": "**قم بتسمية الشارع و أغلق محرر الميزة.**" + }, + "startediting": { + "title": "ابدأ التعديل", + "save": "لا تنس حفظ تغييراتك بشكل دوري!", + "start": "إبداء رسم الخرائط!" + } }, "presets": { + "categories": { + "category-building": { + "name": "مبنى" + }, + "category-landuse": { + "name": "استخدام الأرض" + }, + "category-path": { + "name": "طريق" + }, + "category-rail": { + "name": "قطار" + }, + "category-road": { + "name": "طريق" + }, + "category-route": { + "name": "مسار" + }, + "category-water-area": { + "name": "مياه" + }, + "category-water-line": { + "name": "مياه" + } + }, "fields": { + "access": { + "label": "الدخول", + "placeholder": "غير معروف", + "types": { + "access": "عام", + "foot": "بالقدم", + "motor_vehicle": "مركبات", + "bicycle": "درجات هوائية", + "horse": "أحصنة" + }, + "options": { + "yes": { + "title": "مسموح", + "description": "الدخول مسموح به بنص القانون، حق الطريق" + }, + "no": { + "title": "محظور", + "description": "الدخول ليس مسموحا به للعامة" + }, + "permissive": { + "title": "مرخص", + "description": "الدخول مسموح به حتى يلغى المالك هذا الترخيص." + }, + "private": { + "title": "خاص", + "description": "الدخول مسموح به فقط بإذن من المالك على أساس فردي." + }, + "designated": { + "title": "مخصص", + "description": "الدخول مصرح به وفقا للعلامات أو قوانين محلية مخصصة." + }, + "destination": { + "title": "الوجهة", + "description": "الدخول مسموح به فقط للوصل إلى وجهة معينة" + } + } + }, + "access_toilets": { + "label": "الدخول" + }, "address": { "label": "العنوان", "placeholders": { + "housename": "اسم المنزل", "number": "١٢٣", "street": "الشارع", - "city": "المدينة" + "city": "المدينة", + "postcode": "الرمز البريدي" } }, + "admin_level": { + "label": "مستوى الإدارة" + }, "aeroway": { "label": "النوع" }, "amenity": { "label": "النوع" }, + "artist": { + "label": "فنان" + }, + "artwork_type": { + "label": "النوع" + }, "atm": { "label": "صراف آلي" }, + "backrest": { + "label": "ظهر الكرسي" + }, + "barrier": { + "label": "نوع" + }, "bicycle_parking": { "label": "النوع" }, + "boundary": { + "label": "النوع" + }, "building": { "label": "المبنى" }, @@ -82,30 +455,104 @@ "label": "المبنى" }, "capacity": { - "label": "السعة" + "label": "السعة", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "اتجاه" + }, + "clock_direction": { + "label": "الاتجاه", + "options": { + "clockwise": "باتجاه عقارب الساعة", + "anticlockwise": "عكس عقارب الساعة" + } + }, + "collection_times": { + "label": "وقت الاستلام" }, "construction": { "label": "النوع" }, + "country": { + "label": "دولة" + }, "crossing": { "label": "النوع" }, + "cuisine": { + "label": "طعام" + }, + "denomination": { + "label": "الطائفة" + }, + "denotation": { + "label": "علامة" + }, + "description": { + "label": "الوصف" + }, + "elevation": { + "label": "الارتفاع" + }, + "emergency": { + "label": "طوارئ" + }, "entrance": { "label": "النوع" }, "fax": { - "label": "الناسوخ (الفاكس)" + "label": "الناسوخ (الفاكس)", + "placeholder": "+31 42 123 4567" + }, + "fee": { + "label": "رسوم" + }, + "fire_hydrant/type": { + "label": "النوع" + }, + "fixme": { + "label": "أصلحني" + }, + "generator/method": { + "label": "الطريقة" + }, + "generator/source": { + "label": "المصدر" + }, + "generator/type": { + "label": "النوع" + }, + "highway": { + "label": "النوع" + }, + "historic": { + "label": "النوع" + }, + "iata": { + "label": "IATA" + }, + "icao": { + "label": "ICAO" + }, + "incline": { + "label": "انحدار" }, "internet_access": { "label": "إنترنت", "options": { "wlan": "واي فاي", - "wired": "سلكي" + "wired": "سلكي", + "terminal": "بوابة" } }, "landuse": { "label": "النوع" }, + "lanes": { + "label": "زقاق", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "طبقة" }, @@ -113,13 +560,25 @@ "label": "النوع" }, "levels": { - "label": "مستوى" + "label": "مستوى", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "مضاء" + }, + "location": { + "label": "المكان" }, "man_made": { "label": "النوع" }, "maxspeed": { - "label": "السرعة القصوى" + "label": "السرعة القصوى", + "placeholder": "40, 50, 60..." + }, + "name": { + "label": "اسم", + "placeholder": "اسم شائع (إذا وجد)" }, "natural": { "label": "طبيعه" @@ -136,18 +595,40 @@ "oneway": { "label": "مسار واحد" }, + "oneway_yes": { + "label": "مسار واحد" + }, "opening_hours": { "label": "ساعات" }, + "operator": { + "label": "مشغل" + }, + "park_ride": { + "label": "اوقف واركب" + }, + "parking": { + "label": "النوع" + }, "phone": { - "label": "هاتف" + "label": "هاتف", + "placeholder": "+31 42 123 4567" }, "place": { "label": "النوع" }, + "power": { + "label": "نوع" + }, "railway": { "label": "النوع" }, + "ref": { + "label": "مرجع" + }, + "relation": { + "label": "النوع" + }, "religion": { "label": "الديانة", "options": { @@ -155,12 +636,32 @@ "muslim": "الإسلام", "buddhist": "البوذية", "jewish": "اليهودية", - "hindu": "الهيندوسية" + "hindu": "الهيندوسية", + "shinto": "الشينتو", + "taoist": "التاو" } }, + "restriction": { + "label": "النوع" + }, + "route": { + "label": "النوع" + }, + "route_master": { + "label": "النوع" + }, + "sac_scale": { + "label": "صعوبة الطريق" + }, "service": { "label": "النوع" }, + "shelter": { + "label": "ملجأ" + }, + "shelter_type": { + "label": "النوع" + }, "shop": { "label": "النوع" }, @@ -170,12 +671,43 @@ "sport": { "label": "رياضة" }, + "structure": { + "label": "بنية", + "placeholder": "غير معروف", + "options": { + "bridge": "جسر", + "tunnel": "نفق", + "embankment": "طريق مرتفع", + "cutting": "طريق منخفض" + } + }, + "supervised": { + "label": "مراقب" + }, "surface": { "label": "سطح" }, + "toilets/disposal": { + "label": "مردم نفايات" + }, "tourism": { "label": "النوع" }, + "towertype": { + "label": "نوع البرج" + }, + "tracktype": { + "label": "نوع" + }, + "trail_visibility": { + "label": "وضوحية الطريق" + }, + "tree_type": { + "label": "النوع" + }, + "vending": { + "label": "أنواع البضائع" + }, "water": { "label": "النوع" }, @@ -183,11 +715,15 @@ "label": "النوع" }, "website": { - "label": "صفحة الويب" + "label": "صفحة الويب", + "placeholder": "http://example.com/" }, "wetland": { "label": "النوع" }, + "wheelchair": { + "label": "وصول كرسي المعوّقين" + }, "wikipedia": { "label": "ويكيبيديا" }, @@ -196,110 +732,1457 @@ } }, "presets": { + "address": { + "name": "العنوان", + "terms": "عنوان" + }, + "aeroway": { + "name": "جوي", + "terms": "مطار , ميناء جوّي" + }, "aeroway/aerodrome": { - "name": "مطار" + "name": "مطار", + "terms": "مطار" + }, + "aeroway/apron": { + "name": "ساحة المطار", + "terms": "ساحة المطار" + }, + "aeroway/gate": { + "name": "بوابة الطائرات", + "terms": "بوابة الطائرات, بوابة, مدخل" + }, + "aeroway/hangar": { + "name": "حظيرة الطائرات", + "terms": "حظائر الطائرات" + }, + "aeroway/helipad": { + "name": "مهبط الهليكوبتر", + "terms": "مهبط للطائرات العمودية" + }, + "aeroway/runway": { + "name": "مدرج الطائر", + "terms": "مدرج إقلاع وهبوط,مدرج المطار" + }, + "aeroway/taxiway": { + "name": "طريق للمدرج", + "terms": "طريق للمدرج,طريق تدريج الطائرات" + }, + "aeroway/terminal": { + "name": "بوابة مطار", + "terms": "بوابة المطار, مدخل المطار" + }, + "amenity": { + "name": "مرفق", + "terms": "مرفق,بناء خدمي" + }, + "amenity/arts_centre": { + "name": "مركز فنون", + "terms": "مركز الفنون، معرض الفن، ساحة عرض، ملتقى فني" + }, + "amenity/atm": { + "name": "صراف آلي", + "terms": "صراف آلي,ماكينة سحب" }, "amenity/bank": { - "name": "بنك" + "name": "بنك", + "terms": "بنك,مصرف" + }, + "amenity/bar": { + "name": "حانة", + "terms": "بار , حانة , خمَّارَة ,مَشْرَب" + }, + "amenity/bench": { + "name": "مقعد", + "terms": "مقعد, مقعد طويل" }, "amenity/bicycle_parking": { - "name": "موقف درجات" + "name": "موقف درجات", + "terms": "موقف دراجات هوائية" + }, + "amenity/bicycle_rental": { + "name": "تأجير دراجات", + "terms": "محل استئجار دراجات هوائية" + }, + "amenity/boat_rental": { + "name": "محل استئجار قوارب", + "terms": "تأجير القوارب، ساحة الزوارق، تأجير زوارق" }, "amenity/cafe": { - "name": "مقهى" + "name": "مقهى", + "terms": "مقهى, مطعم, ناد ليلي" + }, + "amenity/car_rental": { + "name": "محل إيجار سيارات", + "terms": "محل استئجار السيارات" + }, + "amenity/car_sharing": { + "name": "محل مشاركة سيارة", + "terms": "محل مشاركة السيارات" + }, + "amenity/car_wash": { + "name": "غسيل سيارات", + "terms": "غسيل السيارات" + }, + "amenity/childcare": { + "name": "رعاية الأطفال", + "terms": "رعاية الأطفال, حماية الطفولة" }, "amenity/cinema": { - "name": "سينما" + "name": "سينما", + "terms": "سينما,صالة سينما, دار السينما " + }, + "amenity/college": { + "name": "كلية", + "terms": "كلية, مبنى الكلية, حشد, مجمع" + }, + "amenity/courthouse": { + "name": "دار العدل", + "terms": "مجمع المحاكم, دار العدل, دار القضاء" + }, + "amenity/drinking_water": { + "name": "مياه شرب", + "terms": "ماء الشرب" + }, + "amenity/embassy": { + "name": "سفارة", + "terms": "سفارة" }, "amenity/fast_food": { - "name": "وجبات سريعة" + "name": "وجبات سريعة", + "terms": "مأكولات السريعة" }, "amenity/fire_station": { - "name": "محطة إطفاء" + "name": "محطة إطفاء", + "terms": "محطة إطفاء" + }, + "amenity/fountain": { + "name": "نافورة", + "terms": "نافورة" + }, + "amenity/fuel": { + "name": "محطة غاز", + "terms": "محطة بترول" + }, + "amenity/grave_yard": { + "name": "مقبرة", + "terms": "مقبرة, مدفن" }, "amenity/hospital": { - "name": "مستشفى" + "name": "مستشفى", + "terms": "مستشفى, مستوصف" + }, + "amenity/kindergarten": { + "name": "روضة أطفال", + "terms": "روضة أطفال" }, "amenity/library": { - "name": "مكتبة" + "name": "مكتبة", + "terms": "مكتبة" + }, + "amenity/marketplace": { + "name": "سوق", + "terms": "سوق ,سوق تجارية, ساحة السوق" }, "amenity/parking": { - "name": "موقف" + "name": "مواقف السيارات", + "terms": "مواقف سيارات عامة ، مصف للسيارات، مواقف مركبات عمومية " }, "amenity/pharmacy": { - "name": "صيدلية" + "name": "صيدلية", + "terms": "صيدلية" + }, + "amenity/place_of_worship": { + "name": "مكان عبادة", + "terms": "محل عبادة" + }, + "amenity/place_of_worship/buddhist": { + "name": "معبد بوذي", + "terms": "معبد بوذي" }, "amenity/place_of_worship/christian": { - "name": "كنيسة" + "name": "كنيسة", + "terms": "كنيسة" + }, + "amenity/place_of_worship/jewish": { + "name": "كنيس يهودي", + "terms": "كنيس, معبد اليهود, " }, "amenity/place_of_worship/muslim": { - "name": "مسجد" + "name": "مسجد", + "terms": "مسجد, جامع" + }, + "amenity/police": { + "name": "شرطة", + "terms": "مركز الشرطة, الشرطة " + }, + "amenity/post_box": { + "name": "صندوق البريد", + "terms": "صندوق البريد" + }, + "amenity/post_office": { + "name": "مكتب البريد", + "terms": "دائرة البريد, مكتب البريد, مكتب بريد" + }, + "amenity/pub": { + "name": "حانة", + "terms": "مشرب, حانة, خمارة" + }, + "amenity/ranger_station": { + "name": "محطة الحراسة", + "terms": "محطة الحراسة" }, "amenity/restaurant": { - "name": "مطعم" + "name": "مطعم", + "terms": "مطعم" }, "amenity/school": { - "name": "مدرسة" + "name": "مدرسة", + "terms": "مدرسة" + }, + "amenity/shelter": { + "name": "مأوى", + "terms": "مأوى, ملجأ, ملاذ, سقيفة, وقاء" + }, + "amenity/swimming_pool": { + "name": "حوض سباحة", + "terms": "حوض سباحة" + }, + "amenity/taxi": { + "name": "موقف تاكسي", + "terms": "موقف أجرة" + }, + "amenity/telephone": { + "name": "هاتف", + "terms": "هاتف" + }, + "amenity/theatre": { + "name": "مسرح", + "terms": "مسرح" }, "amenity/toilets": { - "name": "دورات مياه" + "name": "دورات مياه", + "terms": "دورات مياه, مراحيض" + }, + "amenity/townhall": { + "name": "قاعة البلدة", + "terms": "قاعة البلدة" }, "amenity/university": { - "name": "جامعة" + "name": "جامعة", + "terms": "جامعة" + }, + "amenity/vending_machine": { + "name": "آلة بيع", + "terms": "آلة بيع، نقطة بيع" + }, + "amenity/waste_basket": { + "name": "سلة مهملات", + "terms": "سلة المهملات,سلة القمامة" + }, + "area": { + "name": "مساحة", + "terms": "المساحة" + }, + "barrier": { + "name": "حاجز", + "terms": "حاجز, عائق, تخم, قلعة محصنة, مدينة محصنة, مزلقان" + }, + "barrier/block": { + "name": "كتلة", + "terms": "كتلة, كتلة حجرية, عائق" + }, + "barrier/bollard": { + "name": "عمود صلب", + "terms": "عمود صلب" + }, + "barrier/cattle_grid": { + "name": "شبكة الماشية", + "terms": "شبكة الماشية,شبكة لمنع الماشية" + }, + "barrier/city_wall": { + "name": "جدار المدينة", + "terms": "جدار المدينة" + }, + "barrier/cycle_barrier": { + "name": "حاجز الدرجات الهوائية", + "terms": "حاجز دراجات هوائية" + }, + "barrier/ditch": { + "name": "خندق", + "terms": "خندق, مصرف, منخر" + }, + "barrier/entrance": { + "name": "مدخل", + "terms": "مدخل" + }, + "barrier/fence": { + "name": "سياج", + "terms": "سياج" + }, + "barrier/gate": { + "name": "بوابة", + "terms": "بوابة" + }, + "barrier/hedge": { + "name": "سياج نباتي", + "terms": "سياج نباتي" + }, + "barrier/kissing_gate": { + "name": "بوابة منع الماشية", + "terms": "بوابة منع الماشية" + }, + "barrier/lift_gate": { + "name": "بوابة الرافعة", + "terms": "بوابة الرافعة" + }, + "barrier/retaining_wall": { + "name": "جدار تثبيت", + "terms": "جدار تثبيت" + }, + "barrier/stile": { + "name": "مرقى عبور", + "terms": "مرقى عبور, عضادة" + }, + "barrier/toll_booth": { + "name": "كشك التحصيل", + "terms": "كشك التحصيل , مكتب رسوم العبور" + }, + "barrier/wall": { + "name": "جدار", + "terms": "جدار" + }, + "boundary/administrative": { + "name": "حدود إدارية", + "terms": "حدود إدارية" }, "building": { - "name": "مبنى" + "name": "مبنى", + "terms": "مبنى" + }, + "building/apartments": { + "name": "شقق", + "terms": "شقق" + }, + "building/commercial": { + "name": "مبني تجاري", + "terms": "مبنى تجاري" + }, + "building/entrance": { + "name": "مدخل", + "terms": "مدخل" + }, + "building/garage": { + "name": "جراج", + "terms": "مَرْأب , كراج, تصليح سيارات" + }, + "building/house": { + "name": "منزل", + "terms": "منزل, بيت" + }, + "building/hut": { + "name": "كوخ", + "terms": "كوخ" + }, + "building/industrial": { + "name": "مبنى صناعي", + "terms": "مبنى صناعي" + }, + "building/residential": { + "name": "مبنى سكني", + "terms": "مبنى سكني" + }, + "emergency/ambulance_station": { + "name": "محطة إسعاف", + "terms": "محطة إسعاف" + }, + "emergency/fire_hydrant": { + "name": "خرطوم مطافئ", + "terms": "خرطوم مطافئ" + }, + "emergency/phone": { + "name": "هاتف طوارئ", + "terms": "هاتف طوارئ" + }, + "entrance": { + "name": "مدخل", + "terms": "مدخل" + }, + "footway/crossing": { + "name": "تقاطع", + "terms": "تقاطع, معبر" + }, + "footway/sidewalk": { + "name": "رصيف المشاة", + "terms": "رصيف, رصيف المشاة" }, "highway": { - "name": "طريق سريع" + "name": "طريق سريع", + "terms": "طريق سريع" + }, + "highway/bridleway": { + "name": "طريق الخيول", + "terms": "طريق الخيول, ممر للخيول" }, "highway/bus_stop": { - "name": "محطة باص" + "name": "محطة باص", + "terms": "موقف باصات, محطة باصات" }, "highway/crossing": { - "name": "تقاطع" + "name": "تقاطع", + "terms": "تقاطع" + }, + "highway/cycleway": { + "name": "طريق دراجة هوائية", + "terms": "طريق دراجات هوائية" + }, + "highway/footway": { + "name": "طريق مشي بالأقدام", + "terms": "ممشى بالأقدام" + }, + "highway/living_street": { + "name": "شارع سكني", + "terms": "شارع سكني" + }, + "highway/mini_roundabout": { + "name": "دوار صغير", + "terms": "دوار صغير" + }, + "highway/motorway": { + "name": "طريق سريع", + "terms": "طريق سريع" + }, + "highway/motorway_junction": { + "name": "مفرق طريق سريع", + "terms": "مفرق طريق سريع" + }, + "highway/motorway_link": { + "name": "رابط لطريق سريع", + "terms": "رابط لطريق سريع" + }, + "highway/path": { + "name": "طريق", + "terms": "طريق , ممر , مسلك , درب" + }, + "highway/pedestrian": { + "name": "مشاة", + "terms": "مشاة" }, "highway/primary": { - "name": "طريق رئيسي" + "name": "طريق رئيسي", + "terms": "شارع رئيسي" + }, + "highway/primary_link": { + "name": "رابط لطريق رئيسي", + "terms": "رابط لطريق رئيسي" }, "highway/residential": { - "name": "طريق سكني" + "name": "طريق سكني", + "terms": "شارع سكني" + }, + "highway/road": { + "name": "طريق غير معروف", + "terms": "طريق غير معروف" }, "highway/secondary": { - "name": "طريق ثانوي" + "name": "طريق ثانوي", + "terms": "شارع ثانوي" + }, + "highway/secondary_link": { + "name": "رابط لطريق ثانوي", + "terms": "رابط لشارع ثانوي" }, "highway/service": { - "name": "طريق خدمة" + "name": "طريق خدمة", + "terms": "شارع خدمي" + }, + "highway/service/alley": { + "name": "زقاق", + "terms": "زقاق" + }, + "highway/service/drive-through": { + "name": "ممر الطلب بالسيارة", + "terms": "ممر الطلب بالسيارة" + }, + "highway/service/driveway": { + "name": "ممر السكن", + "terms": "ممر السكن" + }, + "highway/service/emergency_access": { + "name": "ممر الطوارئ", + "terms": "ممر الطوارئ" + }, + "highway/service/parking_aisle": { + "name": "ممر وقوف السيارات", + "terms": "ممر وقوف السيارات" + }, + "highway/steps": { + "name": "درج", + "terms": "درج" + }, + "highway/stop": { + "name": "إشارة توقف", + "terms": "إشارة توقف، ممنوع الوقوف، قف" + }, + "highway/tertiary": { + "name": "طريق ثالثي", + "terms": "شارع ثالثي" + }, + "highway/tertiary_link": { + "name": "رابط لطريق ثالثي", + "terms": "رابط لشارع ثالثي" + }, + "highway/track": { + "name": "شاحنات", + "terms": "شاحنات" }, "highway/traffic_signals": { - "name": "إشارات مرور" + "name": "إشارات مرور", + "terms": "إشارات المرور" + }, + "highway/trunk": { + "name": "طريق أساسي", + "terms": "شارع أساسي" + }, + "highway/trunk_link": { + "name": "رابط لطريق أساسي", + "terms": "رابط لشارع أساسي" + }, + "highway/turning_circle": { + "name": "دائرة رجوع", + "terms": "دائرة رجوع" }, "highway/unclassified": { - "name": "طريق غير مصنف" + "name": "طريق غير مصنف", + "terms": "شارع غير مصنف" + }, + "historic": { + "name": "موقع تاريخي", + "terms": "موقع تأريخي" + }, + "historic/archaeological_site": { + "name": "موقع أثري", + "terms": "موقع أثري" + }, + "historic/boundary_stone": { + "name": "صخرة حدودية", + "terms": "صخرة حدودية" + }, + "historic/castle": { + "name": "حصن", + "terms": "حصن" + }, + "historic/memorial": { + "name": "نصب تذكاري", + "terms": "نصب تذكاري" + }, + "historic/monument": { + "name": "نصب تذكاري", + "terms": "نصب تذكاري, مبنى تذكاري" + }, + "historic/ruins": { + "name": "آثار", + "terms": "أطلال" + }, + "historic/wayside_cross": { + "name": "صليب على الطريق", + "terms": "صليب على الطريق" + }, + "historic/wayside_shrine": { + "name": "مقام نصراني على الطريق", + "terms": "مقام نصراني على الطريق" + }, + "landuse": { + "name": "استخدام الارض", + "terms": "استخدام الأراضي, استخدام الأرض" + }, + "landuse/allotments": { + "name": "مزارع مخصصة", + "terms": "مزارع مخصصة" + }, + "landuse/basin": { + "name": "حوض", + "terms": "حوض, حوض نهري" + }, + "landuse/cemetery": { + "name": "مقبرة", + "terms": "مقبرة, مدفن, جبانة" + }, + "landuse/commercial": { + "name": "تجاري", + "terms": "تجاري" + }, + "landuse/construction": { + "name": "إنشاءات", + "terms": "إنشاءات, تشييد, تعمير" }, "landuse/farm": { - "name": "مزرعة" + "name": "مزرعة", + "terms": "مزرعة" + }, + "landuse/farmyard": { + "name": "فناء المزرعة", + "terms": "فناء المزرعة" + }, + "landuse/forest": { + "name": "غابة", + "terms": "غابة" + }, + "landuse/grass": { + "name": "عشب", + "terms": "عشب, غطاء أخضر" + }, + "landuse/industrial": { + "name": "صناعي", + "terms": "صناعي" + }, + "landuse/meadow": { + "name": "مرج", + "terms": " مرج, روضة, مخضرة" + }, + "landuse/orchard": { + "name": "بستان", + "terms": " بستان, بيارة, أشجار البستان" + }, + "landuse/quarry": { + "name": "محجر", + "terms": "محجر" + }, + "landuse/residential": { + "name": "سكني", + "terms": "سكتي" + }, + "landuse/retail": { + "name": "بيع بالتجزئة", + "terms": "بيع بالتجزئة ، بالقطاعي ، بالمفرق" + }, + "landuse/vineyard": { + "name": "مزرعة العنب", + "terms": "مزرعة عنب" + }, + "leisure": { + "name": "الترفيه", + "terms": "الترفيه" + }, + "leisure/common": { + "name": "عام", + "terms": "مشّاع، متعارف عليه، شعبي، شائع" + }, + "leisure/dog_park": { + "name": "حديقة كلاب", + "terms": "حديقة كلاب" }, "leisure/garden": { - "name": "حديقة" + "name": "حديقة", + "terms": "حديقة" + }, + "leisure/golf_course": { + "name": "معلب جولف", + "terms": "معلب جولف" + }, + "leisure/marina": { + "name": "حوض السفن", + "terms": "حوض السفن" + }, + "leisure/park": { + "name": "حديقة", + "terms": "منتزه" + }, + "leisure/pitch": { + "name": "ملعب رياضي", + "terms": "ملعب رياضي" + }, + "leisure/pitch/american_football": { + "name": "ملعب كرة قدم أمريكية", + "terms": "ملعب كرة قدم أمريكية" + }, + "leisure/pitch/baseball": { + "name": "ملعب بيسبول", + "terms": "ملعب بيسبول" + }, + "leisure/pitch/basketball": { + "name": "ملعب كرة السلة", + "terms": "ملعب كرة السلة" + }, + "leisure/pitch/skateboard": { + "name": "حديقة تزلج", + "terms": "حديقة تزلج، ساحة تزلج" + }, + "leisure/pitch/soccer": { + "name": "ملعب كرة القدم", + "terms": "ملعب كرة القدم" + }, + "leisure/pitch/tennis": { + "name": "ملعب تنس", + "terms": "معلب كرة التنس" + }, + "leisure/pitch/volleyball": { + "name": "ملعب كرة الطائرة", + "terms": "ملعب " + }, + "leisure/playground": { + "name": "ساحة ألعاب للأطفال", + "terms": "ساحة ألعاب للأطفال" + }, + "leisure/slipway": { + "name": "مزلقة سفن", + "terms": "مزلقة سفن" + }, + "leisure/sports_center": { + "name": "مركز رياضة", + "terms": "مركز رياضي، مركز للتسلية والترفيه" + }, + "leisure/stadium": { + "name": "مدرج رياضي", + "terms": "مدرج, مدرج للألعاب الرياضية, أستاذ رياضي" + }, + "leisure/swimming_pool": { + "name": "حوض سباحة", + "terms": "حوض سباحة" + }, + "leisure/track": { + "name": "ميدان سباق", + "terms": "ميدان سباق" + }, + "line": { + "name": "طريق", + "terms": "طريق" + }, + "man_made": { + "name": "مباني صناعية", + "terms": "مباني صناعية" + }, + "man_made/breakwater": { + "name": "كاسر الأمواج", + "terms": "كاسر الأمواج" + }, + "man_made/cutline": { + "name": "خط الفصل", + "terms": "خط الفصل" + }, + "man_made/lighthouse": { + "name": "منارة", + "terms": "منارة , فنارة" + }, + "man_made/observation": { + "name": "برج مراقبة", + "terms": "برمج المراقبة، أبراج المراقبة، أبراج المشاهدة، " + }, + "man_made/pier": { + "name": "رصيف بحري", + "terms": "رصيف بحري" + }, + "man_made/pipeline": { + "name": "خط أنابيب", + "terms": "خط أنابيب" + }, + "man_made/survey_point": { + "name": "نقطة مسح", + "terms": "نقطة مسح" + }, + "man_made/tower": { + "name": "برج", + "terms": "برج" + }, + "man_made/wastewater_plant": { + "name": "محطة صرف صحي", + "terms": "محطة صرف صحي" + }, + "man_made/water_tower": { + "name": "خزان مائي", + "terms": "خزان مائي" + }, + "man_made/water_well": { + "name": "بئر مياه", + "terms": "بئر ماء" + }, + "man_made/water_works": { + "name": "محطة مياه", + "terms": "محطة مياه" + }, + "natural": { + "name": "طبيعي", + "terms": "طبيعي" + }, + "natural/bay": { + "name": "خليج", + "terms": "خليج" + }, + "natural/beach": { + "name": "شاطئ", + "terms": "شاطئ" + }, + "natural/cliff": { + "name": "جرف صخري", + "terms": "جرف صخري" + }, + "natural/coastline": { + "name": "ساحل", + "terms": "ساحل" + }, + "natural/fell": { + "name": "هضبة", + "terms": "هضبة، تلة، مرتفع" + }, + "natural/glacier": { + "name": "كتلة جليدية", + "terms": "كتلة جليدية" + }, + "natural/grassland": { + "name": "أرض عشبية", + "terms": " مرعى, مرج, أرض معشوشبة" + }, + "natural/heath": { + "name": "مرج", + "terms": "مرج" + }, + "natural/peak": { + "name": "قمة", + "terms": "قمة, ذروة" + }, + "natural/scree": { + "name": "ركام حجارة", + "terms": "ركام حجارة، تلة، مجموعة صخور، تلة حصاة" + }, + "natural/scrub": { + "name": "أراضي الأشجار القمئية", + "terms": "أراضي الأشجار القمئية" + }, + "natural/spring": { + "name": "نبع", + "terms": "نبع" + }, + "natural/tree": { + "name": "شجرة", + "terms": "شجرة" + }, + "natural/water": { + "name": "مياه", + "terms": "ماء" + }, + "natural/water/lake": { + "name": "بحيرة", + "terms": "بحيرة" + }, + "natural/water/pond": { + "name": "بركة", + "terms": "بركة" + }, + "natural/water/reservoir": { + "name": "خزان", + "terms": "خزان" + }, + "natural/wetland": { + "name": "أرض رطبة", + "terms": "أرض رطبة" + }, + "natural/wood": { + "name": "غابة أخشاب", + "terms": "غابة أخشاب" + }, + "office": { + "name": "مكتب", + "terms": "مكتب" + }, + "office/accountant": { + "name": "المحاسب", + "terms": "المحاسب القانوني، المدقق، الحسابات " + }, + "office/administrative": { + "name": "المكتب الإداري ", + "terms": "اﻹدارة، اﻹدارة العامة، المكتب التنظيمي، " + }, + "office/architect": { + "name": "مهندس معماري ", + "terms": "بناء، مباني، مدينة، تعمير" + }, + "office/company": { + "name": "مكتب الشركة", + "terms": "إدارة الشركة، إدارة المؤسسة، اﻹدارة العامة" + }, + "office/educational_institution": { + "name": "مؤسسة تعليمية ", + "terms": "مؤسسة تعليمية، جامعة، كلية، مدرسة" + }, + "office/employment_agency": { + "name": "مكتب التوظيف ", + "terms": "إدارة شؤون الموظفين، مكتب العمل" + }, + "office/estate_agent": { + "name": "مكتب عقاري", + "terms": "الطابو، دائرة السجل العقاري، إدارة تسجيل الممتلكات" + }, + "office/financial": { + "name": "مكتب المالية", + "terms": "وزارة المالية، المكتب المالي والضريبي، " + }, + "office/government": { + "name": "الدائرة الحكومية", + "terms": "رئاسة الوزراء، إدارة الدولة، المكتب العام، " + }, + "office/insurance": { + "name": "مكتب التأمينات", + "terms": "مديرية المعاشات، دائرة التأمينات اﻹجتماعية، إدارة التأمين" + }, + "office/it": { + "name": "مكتب تقنية المعلومات", + "terms": "المكتب التقني، إدارة المعلوماتية، إدارة المعلومات ، هيئة التقانة" + }, + "office/lawyer": { + "name": "المكتب القانوني ", + "terms": "مكتب محاماة، اﻹدارة القانونية، المحكمة،" + }, + "office/newspaper": { + "name": "صحيفة", + "terms": "جريدة، صفحة أخبار، يومية" + }, + "office/ngo": { + "name": "مكتب المنظمات الغير حكومية", + "terms": "مكتب الجمعيات الخيرية، هيئات العمل اﻹغائي، " + }, + "office/physician": { + "name": "طبيب", + "terms": "طبيب، معالج فيزيائي، ممرض " + }, + "office/political_party": { + "name": "الحزب السياسي ", + "terms": "حزب سياسي، الحزب السياسي، المكتب السياسي، مكتب سياسي" + }, + "office/research": { + "name": "مكتب البحوث", + "terms": "مكتب البحوث، مكتب اﻷبحاث، هيئة اﻷبحاث" + }, + "office/telecommunication": { + "name": "مكتب الاتصالات", + "terms": "مكتب اﻹتصالات، إدارة الاتصال، هيئة اﻹتصالات العامة" + }, + "office/therapist": { + "name": "المعالج", + "terms": "معالج، معالج فيزيائي، طبيب، مُمرض" + }, + "office/travel_agent": { + "name": "وكالة السفر", + "terms": "وكالة السفر، مكتب سفريات، وكيل سفريات، مكتب تنظيم الرحلات" + }, + "place": { + "name": "قصر", + "terms": "قصر" + }, + "place/city": { + "name": "مدينة", + "terms": "مدينة" + }, + "place/hamlet": { + "name": "قرية صغيرة", + "terms": "قرية صغيرة" + }, + "place/island": { + "name": "جزيرة", + "terms": "جزيرة" + }, + "place/isolated_dwelling": { + "name": "مساكن متفرقة", + "terms": "مساكن متفرقة" + }, + "place/locality": { + "name": "موقع", + "terms": "موقع" + }, + "place/town": { + "name": "بلدة", + "terms": "بلدة" + }, + "place/village": { + "name": "قرية", + "terms": "قرية" + }, + "point": { + "name": "نقطة", + "terms": "نقطة" + }, + "power": { + "name": "الطاقة", + "terms": "الطاقة, كهرباء" + }, + "power/generator": { + "name": "مولد طاقة", + "terms": "مولد الطاقة" + }, + "power/line": { + "name": "خط الطاقة", + "terms": "خط الكهرباء , خط الطاقة" + }, + "power/minor_line": { + "name": "خط كهربائي ثانوي", + "terms": "خط كهربائي صغير، خط طاقة صغير" + }, + "power/pole": { + "name": "برج كهربائي", + "terms": "برج كهربائي" + }, + "power/sub_station": { + "name": "محطة فرعية", + "terms": "محطة فرعية" + }, + "power/tower": { + "name": "برج عالي الجهد", + "terms": "برج عالي الجهد" + }, + "power/transformer": { + "name": "محول كهربائي", + "terms": "محول الكهربائي" + }, + "railway": { + "name": "سكة حديد", + "terms": "سكة الحديد" + }, + "railway/abandoned": { + "name": "سكة حديدية مهجورة", + "terms": "سكة حديد مهجورة" + }, + "railway/disused": { + "name": "سكة حديدة مهجورة", + "terms": "سكة حديد غير مستعملة" + }, + "railway/halt": { + "name": "موقف سكة حديد", + "terms": "موقف إجباري خاص بسكك الحديد، موقف السكة الحديدية" + }, + "railway/level_crossing": { + "name": "معبر سكة حديدية", + "terms": "معبر سكة حديدية, تقاطع سكة حديد" + }, + "railway/monorail": { + "name": "سكة حديدة مفردة", + "terms": "سكة حديدة مفردة" + }, + "railway/platform": { + "name": "رصيف سكة حديد", + "terms": "رصيف سكة حديد" + }, + "railway/rail": { + "name": "قطار", + "terms": "قطار" + }, + "railway/station": { + "name": "محطة سكة حديد", + "terms": "محطة سكة حديد" + }, + "railway/subway": { + "name": "مترو الأنفاق", + "terms": "مترو الأنفاق" + }, + "railway/subway_entrance": { + "name": "مدخل مترو الأنفاق", + "terms": "مدخل مترو الأنفاق" + }, + "railway/tram": { + "name": "ترام", + "terms": "ترام" + }, + "relation": { + "name": "علاقة", + "terms": "علاقة" + }, + "route/ferry": { + "name": "مسار عبّارة", + "terms": "مسار عبّارة, مسار سفن" + }, + "shop": { + "name": "محل", + "terms": "محل" + }, + "shop/alcohol": { + "name": "محل خمور", + "terms": "محل خمور" + }, + "shop/bakery": { + "name": "مخبز", + "terms": "مخبز" + }, + "shop/beauty": { + "name": "محل تجميل", + "terms": "محل تجميل" + }, + "shop/beverages": { + "name": "محل مشروبات", + "terms": "محل مشروبات" + }, + "shop/bicycle": { + "name": "محل دراجات هوائية", + "terms": "محل دراجات هوائية" + }, + "shop/books": { + "name": "محل بيع كتب", + "terms": "محل بيع كتب" + }, + "shop/boutique": { + "name": "بوتيك", + "terms": "بوتيك" + }, + "shop/butcher": { + "name": "ملحمة", + "terms": "جزار, محل بيع لحوم" + }, + "shop/car": { + "name": "وكالة سيارات", + "terms": "وكالة سيارات" + }, + "shop/car_parts": { + "name": "محل بيع أجزاء السيارة", + "terms": "محل بيع قطع السيارات" + }, + "shop/car_repair": { + "name": "محل تصليح السيارات جراج", + "terms": "محل تصليح سيارات" + }, + "shop/chemist": { + "name": "محل أدوية", + "terms": "محل أدوية" + }, + "shop/clothes": { + "name": "محل ملابس", + "terms": "محل بيع ملابس" + }, + "shop/computer": { + "name": "محل حاسوب", + "terms": "محل حاسوب" + }, + "shop/confectionery": { + "name": "محل حلويات", + "terms": "محل حلويات" + }, + "shop/convenience": { + "name": "بقالة", + "terms": "بقالة" + }, + "shop/deli": { + "name": "محل أطعمة لذيذة", + "terms": "محل أطعمة لذيذة, ديلي" + }, + "shop/department_store": { + "name": "محل متعدد الأقسام", + "terms": "محل متعدد الأقسام" + }, + "shop/doityourself": { + "name": "محل افعلها بنفسك", + "terms": "محل افعلها بنفسك" + }, + "shop/dry_cleaning": { + "name": "محل غسيل جاف", + "terms": "محل غسيل الجاف" + }, + "shop/electronics": { + "name": "محل إلكترونيات", + "terms": "محل إلكترونيات" + }, + "shop/farm": { + "name": "المنتج", + "terms": "المنتج" + }, + "shop/fishmonger": { + "name": "محل بيع أسماك", + "terms": "محل بيع أسماك" + }, + "shop/florist": { + "name": "محل بيع الورود", + "terms": "محل بيع زهور, محل بيع ورود" + }, + "shop/furniture": { + "name": "محل أثاث", + "terms": "محل أثاث" + }, + "shop/garden_centre": { + "name": "مشتل", + "terms": "مشتل" + }, + "shop/gift": { + "name": "محل الهدايا", + "terms": "محل بيع هدايا" + }, + "shop/greengrocer": { + "name": "بقالة", + "terms": "بقالة" + }, + "shop/hairdresser": { + "name": "حلاق", + "terms": "حلاق, مصفف الشعر" + }, + "shop/hardware": { + "name": "محل أجهزة", + "terms": "محل بيع عتاد" + }, + "shop/hifi": { + "name": "محل بيع أجهزة عالية الدقة", + "terms": "محل بيع أجهزة عالية الدقة" + }, + "shop/jewelry": { + "name": "محل بيع مجوهرات", + "terms": "محل بيع المجوهرات, محل بيع الذهب" + }, + "shop/kiosk": { + "name": "كشك", + "terms": "كشك" + }, + "shop/laundry": { + "name": "محل غسيل ملابس", + "terms": "غسيل ملابس" + }, + "shop/locksmith": { + "name": "محل أقفال", + "terms": "صانع اﻷقفال، أقفال، حداد، " + }, + "shop/mall": { + "name": "مركز تسوق مول", + "terms": "مركز تسوق, مول" + }, + "shop/mobile_phone": { + "name": "محل بيع هواتف", + "terms": "محل بيع هواتف" + }, + "shop/motorcycle": { + "name": "وكالة دراجات نارية", + "terms": "وكالة دراجات هوائية" + }, + "shop/music": { + "name": "محل بيع موسيقى", + "terms": "محل بيع الموسيقى" + }, + "shop/newsagent": { + "name": "محل بيع صحف", + "terms": "محل بيع صحف" + }, + "shop/optician": { + "name": "محل بيع نظارات", + "terms": "محل بيع نظارات" + }, + "shop/outdoor": { + "name": "محل بيع مستلزمات التخييم", + "terms": "محل بيع مستلزمات التخييم" + }, + "shop/pet": { + "name": "محل حيوانات أليفة", + "terms": "محل حيوانات أليفة" + }, + "shop/photo": { + "name": "محل تصوير", + "terms": "متجر تظّهير الصور، محل تصوير، مصور" + }, + "shop/shoes": { + "name": "محل بيع أحذية", + "terms": "محل بيع أحذية" + }, + "shop/sports": { + "name": "محل بيع أدوات رياضية", + "terms": "محل بيع أدوات رياضية" + }, + "shop/stationery": { + "name": "محل بيع أدوات مكتبية", + "terms": "محل بيع أدوات مكتبية" + }, + "shop/supermarket": { + "name": "سوبر ماركت", + "terms": "سوبرماركت, متجر كبير" + }, + "shop/toys": { + "name": "محل ألعاب", + "terms": "محل ألعاب" + }, + "shop/travel_agency": { + "name": "وكالة سفر", + "terms": "وكالة سفر" + }, + "shop/tyres": { + "name": "محل بيع إطارات", + "terms": "محل بيع إطارات" + }, + "shop/vacant": { + "name": "محل شاغر", + "terms": "محل شاغر, محل فاضي" + }, + "shop/variety_store": { + "name": "محل كل شيء ", + "terms": "محل كل شيء, محل بالجملة" + }, + "shop/video": { + "name": "محل بيع وتأجير الأفلام", + "terms": "محل بيع وتأجير الأفلام" + }, + "tourism": { + "name": "سياحي", + "terms": "سياحة" }, "tourism/alpine_hut": { - "name": "داراستراحة" + "name": "داراستراحة", + "terms": "دار استراحة" }, "tourism/artwork": { - "name": "رسم فنّي" + "name": "رسم فنّي", + "terms": "رسم فنّي" }, "tourism/attraction": { - "name": "معلم سياحي" + "name": "معلم سياحي", + "terms": "معلم سياحي, مكان سياحي" + }, + "tourism/camp_site": { + "name": "موقع مخيم", + "terms": "موقع تخييم" + }, + "tourism/caravan_site": { + "name": "موقف عربات كبيرة", + "terms": "موقف عربات كبيرة" }, "tourism/chalet": { - "name": "شاليه" + "name": "شاليه", + "terms": "شاليه" }, "tourism/guest_house": { - "name": "استراحة" + "name": "استراحة", + "terms": "استراحة" + }, + "tourism/hostel": { + "name": "نزل", + "terms": "نزل" + }, + "tourism/hotel": { + "name": "فندق", + "terms": "فندق" + }, + "tourism/information": { + "name": "معلومات", + "terms": "معلومات" + }, + "tourism/motel": { + "name": "فندق رخيص", + "terms": "فندق رخيص" + }, + "tourism/museum": { + "name": "متحف", + "terms": "متحف, معرض" + }, + "tourism/picnic_site": { + "name": "موقع نزهة", + "terms": "موقع نزهة" + }, + "tourism/theme_park": { + "name": "حديقة ترفيه", + "terms": "حديقة ترفيه" + }, + "tourism/viewpoint": { + "name": "منظر سياحي", + "terms": "منظر سياحي" }, "tourism/zoo": { - "name": "حديقة حيوانات" + "name": "حديقة حيوانات", + "terms": "حديقة الحيوانات" + }, + "type/boundary": { + "name": "حدود", + "terms": "حدود" + }, + "type/boundary/administrative": { + "name": "حدود إدارية", + "terms": "حدود إدارية, تقسيمات إدارية" + }, + "type/multipolygon": { + "name": "متعدد الأضلاع", + "terms": "متعدد الأضلاع" + }, + "type/restriction": { + "name": "قيود", + "terms": "قيود" + }, + "type/route": { + "name": "مسار", + "terms": "مسار" + }, + "type/route/bicycle": { + "name": "مسار دراجات الهوائية", + "terms": "مسار دراجات هوائية" + }, + "type/route/bus": { + "name": "مسار الباصات", + "terms": "مسار باصات" + }, + "type/route/detour": { + "name": "مسار طريق جانبي", + "terms": "مسار طريق جانبي" + }, + "type/route/ferry": { + "name": "مسار عبارة", + "terms": "مسار سفن, مسار عبارات" + }, + "type/route/foot": { + "name": "مسار المشي بالأقدام", + "terms": "مسار مشي بالأقدام" + }, + "type/route/hiking": { + "name": "ممشى ", + "terms": "مسار المشاة، طريق للمشي، " + }, + "type/route/pipeline": { + "name": "مسار خط أنابيب", + "terms": "مسار خط أنابيب" + }, + "type/route/power": { + "name": "مسار خط كهربائي", + "terms": "مسار الطاقة, مسار الكهرباء" + }, + "type/route/road": { + "name": "مسار طريق", + "terms": "مسار الطريق" + }, + "type/route/train": { + "name": "مسار قطار", + "terms": "مسار القطار" + }, + "type/route/tram": { + "name": "مسار ترام", + "terms": "مسار ترام" + }, + "type/route_master": { + "name": "مسار رئيسي", + "terms": "مسار رئيسي" + }, + "vertex": { + "name": "أخرى", + "terms": "أخرى" + }, + "waterway": { + "name": "مجرى مائي", + "terms": "مجرى مائي, مسار مائي" + }, + "waterway/canal": { + "name": "قناة", + "terms": "قناة" + }, + "waterway/dam": { + "name": "سد", + "terms": "سد" + }, + "waterway/ditch": { + "name": "خندق", + "terms": "خندق" + }, + "waterway/drain": { + "name": "مصرف مياه", + "terms": "مصرف مياه" + }, + "waterway/river": { + "name": "نهر", + "terms": "نهر" + }, + "waterway/riverbank": { + "name": "ضفة نهر", + "terms": "شاطيء نهر" + }, + "waterway/stream": { + "name": "مجرى", + "terms": "مجرى" + }, + "waterway/weir": { + "name": "هدار سد صغير", + "terms": "هدار سد صغير" } } } diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json index f70c6ea92..9250cde23 100644 --- a/vendor/assets/iD/iD/locales/ast.json +++ b/vendor/assets/iD/iD/locales/ast.json @@ -161,7 +161,6 @@ "title": "Fondu", "description": "Configuración del fondu", "percent_brightness": "{opacity}% brillu", - "fix_misalignment": "Iguar mal alliniamientu", "reset": "reaniciar" }, "restore": { @@ -213,13 +212,11 @@ "out": "Alloñar" }, "gpx": { - "local_layer": "Ficheru GPX llocal", - "drag_drop": "Arrastrar y soltar un ficheru .gpx na páxina" + "local_layer": "Ficheru GPX llocal" }, "help": { "title": "Ayuda", - "help": "# Ayuda\n\nEsti ye un editor pa [OpenStreetMap](http://www.openstreetmap.org/), el\nmapa del mundu llibre y editable. Pue usalu p'amestar y anovar los\ndatos nel to área, faciendo un mapa del mundu de códigu y datos\nabiertos meyor pa tol mundu.\n\nLes ediciones que faiga nesti mapa sedrán visibles pa cualquiera qu'use\nOpenStreetMap. Pa poder editar, necesitará una\n[cuenta de baldre n'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nEl [editor iD](http://ideditor.com/) ye un proyeutu collaborativu col [códigu\nfonte disponible en GitHub](https://github.com/systemed/iD).\n", - "imagery": "# Imaxes\n\nLes imaxes aérees son un recursu importante pa facer mapes. Ta disponible\nnel editor una combinación de vuelos d'aviones, vistes de satélite, y fontes compilaes\nde mou llibre baxo'l menú 'Preferencies del fondu' a la izquierda.\n\nDe mou predetermináu, nel editor apaez una capa de satélite de\n [Bing Maps](http://www.bing.com/maps/), pero cuando mueva y faiga zoom nel mapa a\nnueves árees xeográfiques, apaecerán fontes nueves. Dalgunos países, como los Estaos\nXuníos, Francia y Dinamarca tienen imaxes de calidá mui alta pa delles árees.\n\nLes imaxes, dacuando, tan desplazaes del mapa por aciu d'un fallu del fornidor\nde les imaxes. Si ve munches carreteres que nun casen col fondu, nun\nmueva nel intre toes elles p'axustales al fondu. Al aviesu, axuste la\nimaxe pa que case colos datos esistentes calcando 'Iguar alliniamientu' abaxo\nde la interfaz de les Preferencies del fondu.\n" + "help": "# Ayuda\n\nEsti ye un editor pa [OpenStreetMap](http://www.openstreetmap.org/), el\nmapa del mundu llibre y editable. Pue usalu p'amestar y anovar los\ndatos nel to área, faciendo un mapa del mundu de códigu y datos\nabiertos meyor pa tol mundu.\n\nLes ediciones que faiga nesti mapa sedrán visibles pa cualquiera qu'use\nOpenStreetMap. Pa poder editar, necesitará una\n[cuenta de baldre n'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nEl [editor iD](http://ideditor.com/) ye un proyeutu collaborativu col [códigu\nfonte disponible en GitHub](https://github.com/systemed/iD).\n" }, "intro": { "navigation": { @@ -519,9 +516,6 @@ "amenity/marketplace": { "name": "Mercáu" }, - "amenity/parking": { - "name": "Aparcaderu" - }, "amenity/pharmacy": { "name": "Farmacia" }, diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json index 49b2aa7de..c5a144feb 100644 --- a/vendor/assets/iD/iD/locales/bg-BG.json +++ b/vendor/assets/iD/iD/locales/bg-BG.json @@ -226,7 +226,6 @@ "title": "Изображения", "description": "Изображения настройки", "percent_brightness": "{opacity}% яркост", - "fix_misalignment": "Подравняване", "reset": "презареждане" }, "restore": { @@ -282,16 +281,13 @@ }, "cannot_zoom": "Не можете да намалявате повече в текущия режим.", "gpx": { - "local_layer": "Локален GPX файл", - "drag_drop": "Влачете и пуснете .gpx файл върху страницата" + "local_layer": "Локален GPX файл" }, "help": { "title": "Помощ", "help": "# Помощ⏎\n⏎\nТова е редактор за [OpenStreetMap](http://www.openstreetmap.org/), ⏎\nсвободната и редактируема карта на света. Може да го използате да⏎\nдобавяте и обновявате информацията за вашия регион, създавайки⏎\nкарта на света с отворен код и данни, по-добра за всеки.⏎\n⏎\nРедакциите, които правите на тази карта ще са видими за всеки, който⏎\nползва OpenStreetMap. За да направите редакция ви трябва⏎\n[безплатен OpenStreetMap акаунт](https://www.openstreetmap.org/user/new).⏎\n⏎\n[iD редакторът](http://ideditor.com/) е съвместен проект, с [изходен код⏎\nналичен в GitHub](https://github.com/systemed/iD).⏎\n", "roads": "# Пътища\n\nМожете да създавате, поправяте и изтривате пътища с този редактор.\nПътищата могат да бъдат най-различни видове: пътеки, автомагистрали,\nтуристически пътеки, велосипедни алеи и много други - всеки често \nпрекосяван обект трябва да може да се картографира.\n\n### Избиране\n\nЩракнете върху път за да го изберете. Край него трябва да се появи контур, \nзаедно с малко меню с инструменти върху картата и странична лента, \nпоказваща повече информация за пътя.\n\n### Модифициране\n\nЧесто ще виждате пътища, които не са подравнени към изображението \nпод тях или към GPS трак. Можете да оправите тези пътища така, че\nда бъдат на правилното си място.\n\nПърво щракнете върху пътя, който искате да промените. Това ще го\nосвети и ще покаже контролни точки по продължението му, които\nможете да завлачите на по-добри места. Ако искате да добавите\nнови контролни точки за повече детайл, щракнете два пъти върху\nчастта от пътя без възел и такъв ще бъде създаден.\n\nАко пътят се свързва с друг път, но не се свързва коректно на картата,\nможете да завлачите една от контролните точки върху другия път с цел\nда ги съедините. Свързването на пътищата е важно за картата и \nнеобходимо при даването на упътвания за шофьори.\n\nМожете също да щракнете бутонът 'Преместване' или бързия \nклавиш `M`, за да преместите целия път наведнъж, а след това\nщракнете отново, за да запазите преместването.\n\n### Изтриване\n\nАко пътят е изцяло грешен - можете да видите, че не съществува\nна сателитното изображение или в най-добрия случай сте се убедили\nна място, че не съществува - можете да го изтриете, което го премахва\nот картата. Бъдете внимателни, когато изтривате елементи - като \nвсяка друга редакция, резултатите се виждат от всички, а сателитните \nизображения често са неактуални, така че пътят може просто да е\nновопостроен.\n\nМожете да изтриете път като щракнете върху нея за да го изберете, \nа след това щракнете върху иконата кошче или да натиснете бутона\n'Delete'.\n\n### Създаване\n\nОткрили сте, че някъде трябва да има път, но такъв няма? Щракнете\nна иконата 'Линия' в горния ляв край на редактора или натиснете\nбързия клавиш `2` за да започнете чертането на линия.\n\nЩракнете върху началото на пътя на картата за да започнете чертането.\nАко пътят се разклонява от съществуващ такъв, започнете като щракнете\nвърху мястото, където те се свързват.\n\nСлед това щракайте точки по продължението на пътя така, че той да\nследва правилния маршрут, според сателитното изображение или GPS.\nАко пътят, който чертаете, пресича друг път, свържете го като щракнете\nвърху точката на пресичане. Когато сте готови с чертането, щракнете \nдва пъти или натиснете 'Return' или 'Enter' от клавиатурата.\n", - "imagery": "# Изображения\n\nВъздушните снимки са важен източник на информация за картографията. Комбинация от аерофотограметрични снимки, сателитни изображения и свободно разпространявани източници на данни са на разположение в редактора в менюто 'Подложка настройки' от ляво.\n\nСателитният слой [Bing Maps](http://www.bing.com/maps/) е зареден по подразбиране в редактора, но при движение и увеличаване на картата към нови географски области се появяват нови източници на информация. Някои страни, като САЩ, Франция и Дания, имат много висококачествени изображения за някои области.\n\nИзображенията понякога са отместени от елементите на картата, поради грешка на доставчика на изображения. Ако забележите много отместени от фоновото изображение пътища, не бързайте да ги премествате, за да съвпаднат с фоновото изображение. Вместо това можете да нагласите изображението така, че да съвпада със съществуващите данни като натиснете 'Подравняване' в долния край на таблото 'Подложка настройки'.\n", "addresses": "# Адреси\n\nАдресите са една от най-полезните информации на картата.\n\nВъпреки че, адресите често са представяни като части от улици, в\nOpenStreetMap те се записват като атрибути на сгради и места \nпокрай улици.\n\nМожете да добавяте адресна информация към места изобразени като\nконтури на сграда, също и към тези изобразени като кочка. Оптималния\nизточник на адресна информация е от измерване на терен или \nлични познания - както и с всички останали обекти, копирането от \nкомерсиални източници като Google Maps е стриктно забранено.\n", - "inspector": "# Използване на инспектора\n\nИнспекторът е частта от потребителския интерфейс в дясно на \nстраницата, която се появява, когато е избран елемент и ви позволява \nда редактирате неговите атрибути.\n\n### Избиране на вид елемент\n\nСлед като сте добавили точка, линия или площ, можете да изберете \nкакъв вид обект е тя, дали е автомагистрала или улица, супермаркет\n или кафене. Инспекторът ще показва бутони за често използваните \nобекти, а можете да откриете други, като напишете какво ви трябва \nв полето за търсене.\n\nНатиснете 'i' в долния десен ъгъл на бутона елемент вид, за да разберете \nповече за него. Натиснете бутон, за да изберете този вид.\n\n### Използване на формулярите и редактиране на таговете\n\nСлед като изберете вид елемент или когато изберете елемент, който \nвече има определен вид, инспекторът ще изведе полета с атрибутите \nна елемента, като неговото име и адрес.\n\nПод полетата, които виждате можете да щракнете върху иконите,\n за да добавяте други атрибути като информация от \n[Wikipedia](http://www.wikipedia.org/), достъп за инвалидни колички \nи други.\n\nВ долния край на инспектора, натиснете 'Други тагове', за да \nдобавите произволни тагове към елемента. \n[Taginfo](http://taginfo.openstreetmap.org/) е чудесен източник на \nинформация за научаване на повече за популярните \nкомбинации от тагове.\n\nПромените, които правите в инспектора се прилагат автоматично \nкъм картата. Можете да ги отхвърлите по всяко време, като натиснете \nбутона 'Отхвърляне'.\n\n### Затваряне на инспектора\n\nМожете да затворите инспектора, като натиснете бутона за затваряне \nв горния десен ъгъл, като натиснете бутона 'Escape' или като \nщракнете върху картата.\n", "buildings": "# Сгради\n\nOpenStreetMap е най-голямата в света база данни за сгради. Можете да \nсъздавате и подобрявате тази база данни.\n\n### Избиране\n\nМожете да изберете сграда като щракнете върху нейния контур. Това ще \nосвети сградата и ще отвори малко меню с инструменти, както и \nстранична лента с повече информация за сградата.\n\n### Модифициране\n\nПонякога сградите са неправилно поставени или имат грешни тагове.\n\nЗа да преместите цяла сграда, изберете я и след това натиснете \nинструмента 'Преместване'. Движете мишката за да преместите \nсградата и щракнете, когато е на точното си място.\n\nЗа да оправите формата на сградата, щракнете и завлачете възлите, \nкоито оформят контура и ги поставете на по-добри позиции.\n\n### Създаване\n\nЕдин от основните въпроси около добавянето на сгради в картата \nе, че OpenStreetMap може да записва сградите и като контур, и като \nточка. Практическо правило е сграда да се картографира като контур \nвинаги, когато това е възможно, а отделните компании, жилища, услуги и \nдруги обекти, които оперират в сгради - като точки поставени в \nконтура на сградата.\n\nЗапочнете чертането на контура на сградата като натиснете бутонът \n'Площи' в горния ляв край на интерфейса и завършете като натиснете\n'Enter' от клавиатурата или като щракнете върху първия начертан възел,\nза да затворите контура.\n\n### Изтриване\n\nАко сградата е изцяло грешна - можете да видите, че не съществува\nна сателитното изображение или в най-добрия случай сте се убедили\nна място, че не съществува - можете да я изтриете, което я премахва\nот картата. Бъдете внимателни, когато изтривате елементи - като \nвсяка друга редакция, резултатите се виждат от всички, а сателитните \nизображения често са неактуални, така че сградата може просто да е\nновопостроена.\n\nМожете да изтриете сграда като щракнете върху нея за да я изберете, \nа след това щракнете върху иконата кошче или да натиснете бутона\n'Delete'.\n" }, "intro": { @@ -357,9 +353,6 @@ }, "category-route": { "name": "Маршрути" - }, - "category-water": { - "name": "Води" } }, "fields": { @@ -796,9 +789,6 @@ "amenity/marketplace": { "name": "Пазар" }, - "amenity/parking": { - "name": "Паркинг" - }, "amenity/pharmacy": { "name": "Аптека" }, diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json index f211b9b83..b16690951 100644 --- a/vendor/assets/iD/iD/locales/bn.json +++ b/vendor/assets/iD/iD/locales/bn.json @@ -16,7 +16,8 @@ "tail": "বিন্দু সংযোজন করার জন্য ম্যাপে ক্লিক করুন।" }, "browse": { - "title": "ঘুরে ফিরে দেখুন" + "title": "ঘুরে ফিরে দেখুন", + "description": "মানচিত্র প্যান এবং জুম করুন " }, "draw_area": { "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।" @@ -39,6 +40,16 @@ "area": "একটি এলাকা শুরু করা হয়েছে।" } }, + "continue": { + "key": "এ", + "title": "\t\nচালিয়ে যান", + "description": "এই রেখাকে প্রলম্বিত করুন.", + "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.", + "annotation": { + "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে", + "area": "একটি ক্ষেত্রকে বড় করা হয়েছে" + } + }, "cancel_draw": { "annotation": "অাঁকা বাতিল করা হয়েছে।" }, @@ -46,21 +57,35 @@ "annotation": "কিছু ট্যাগ পরিবর্তন করা হয়েছে।" }, "circularize": { + "title": "বৃত্তাকার করুন", "description": { "line": "এই রেখাটিকে গোল করুন।", "area": "এই এলাকাটিকে গোল করুন।" }, + "key": "ও", "annotation": { "line": "একটি রেখাকে গোল করা হয়েছে।", "area": "একটি এলাকাকে গোল করা হয়েছে।" } }, "orthogonalize": { + "title": "বর্গাকৃতি", + "description": { + "line": "এই লাইন এর কোনসমূহ বর্গাকৃতি করুন.", + "area": "এই ক্ষেত্রটির কোনসমূহ বর্গাকৃতি করুন." + }, + "key": "এস", "annotation": { "line": "একটি রেখার কোনাগুলিকে চৌকো করা হয়েছে।", "area": "একটি এলাকার কোনাগুলিকে চৌকো করা হয়েছে।" } }, + "straighten": { + "title": "সোজা করুন", + "description": "এই রেখাটিকে সোজা করুন", + "key": "এস", + "annotation": "একটি রেখাকে সোজা করা হয়েছে।" + }, "delete": { "title": "মুছে ফেলুন", "description": "ম্যাপ থেকে এটিকে মুছে ফেলুন।", @@ -90,16 +115,21 @@ "disconnect": { "title": "বিচ্ছিন্ন করুন", "description": "এই রেখা/এলাকাগুলিকে একে অপরের থেকে বিচ্ছিন্ন করুন।", + "key": "ডি", "annotation": "এই রেখা/এলাকাগুলিকে বিচ্ছিন্ন করা হয়েছে।" }, "merge": { "title": "এদের এক করুন", "description": "এই রেখাগুলিকে এক করুন।", - "annotation": "এই {n}টি রেখাকে এক করুন।" + "key": "সি", + "annotation": "এই {n}টি রেখাকে এক করুন।", + "not_eligible": "এই বৈশিষ্ট্যগুলি একত্রীকরণ করা যাবে না", + "not_adjacent": "এই লাইনগুলো একত্রীকরণ করা যাবে না কারণ এগুলো সংযুক্ত নয়." }, "move": { "title": "সরান", "description": "এটিকে একটি অন্য অবস্থানে সরান।", + "key": "এম", "annotation": { "point": "একটি বিন্দুকে সরানো হয়েছে।", "vertex": "একটি গমনপথে একটি নোডকে সরানো হয়েছে।", @@ -111,6 +141,7 @@ "rotate": { "title": "ঘোরান", "description": "এই বস্তুটিকে এর কেন্দ্রের চারপাশে ঘোরান।", + "key": "আর", "annotation": { "line": "একটি রেখাকে ঘোরানো হয়েছে।", "area": "একটি এলাকাকে ঘোরানো হয়েছে।" @@ -119,6 +150,7 @@ "reverse": { "title": "উল্টো করুন", "description": "এই রেখাটিকে উল্টোদিকে পাঠান।", + "key": "ভি", "annotation": "একটি রেখাকে উল্টো করা হয়েছে।" }, "split": { @@ -128,6 +160,7 @@ "area": "এই এলাকাটির সীমানাকে দুই ভাগে ভাগ করুন।", "multiple": "রেখাগুলিকে/এলাকার সীমানাকে এই নোড-এ দুইভাগে ভাগ করুন।" }, + "key": "এক্স", "annotation": { "line": "একটি রেখাকে ভাগ করুন।", "area": "একটি এলাকার সীমানাকে ভাগ করুন।", @@ -137,12 +170,23 @@ "multiple_ways": "এখানে ভাগ করার জন্য খুব বেশী রেখা রয়েছে।" } }, + "undo": { + "tooltip": "পূর্বাবস্থায় ফিরিয়ে আনুন: {action}", + "nothing": "পূর্বাবস্থায় ফিরিয়ে নেয়ার কিছু নেই." + }, + "redo": { + "tooltip": "পুনরায় করুন: {action}", + "nothing": "পুনরায় করার কিছুই নেই." + }, + "tooltip_keyhint": "শর্টকাট:", "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।", "translate": { "translate": "অনুবাদ করুন", + "localized_translation_label": "বহুভাষিক নাম", "localized_translation_language": "ভাষা বেছে নিন", "localized_translation_name": "নাম" }, + "zoom_in_edit": "সম্পাদনার জন্য জুম ইন করুন", "logout": "বেরিয়ে যান", "loading_auth": "ওপেনস্ট্রীটম্যাপ-এর সাথে যোগাযোগ করা হচ্ছে ...", "report_a_bug": "একটি বাগ রিপোর্ট করুন", @@ -182,16 +226,33 @@ "all_members": "সকল সদস্যগন", "all_relations": "সকল সম্পর্কসমুহ", "new_relation": "নতুন সম্পর্ক...", + "role": "ভূমিকা", + "choose": "বৈশিষ্ট্যএর প্রকার নির্বাচন করুন", "results": "{search}-এর জন্য {n}-টি ফলাফল ", "reference": "openstreetmap.org-এর উইকি-তে দেখুন", + "back_tooltip": "বৈশিষ্ট্য পরিবর্তন করুন", + "remove": "অপসারণ", "search": "কিছু খুঁজুন", - "unknown": "অজানা" + "multiselect": "নির্বাচিত আইটেমসমূহ", + "unknown": "অজানা", + "incomplete": "<ডাউনলোড করা হয়নি>", + "feature_list": "বৈশিষ্ট্যসমূহ খুজুন", + "edit": "বৈশিষ্ট্য সম্পাদনা করুন", + "none": "কিছুনা" }, "background": { - "percent_brightness": "{opacity}% উজ্জ্বলতা" + "title": "পটভূমি", + "description": "পটভূমি নির্ধারণ", + "percent_brightness": "{opacity}% উজ্জ্বলতা", + "none": "কিছুনা", + "fix_misalignment": "এলাইনমেন্ট ঠিক করুন", + "reset": "রিসেট" }, "restore": { - "heading": "অাপনার কিছু পরিবর্তন সেভ করা বাকি অাছে" + "heading": "অাপনার কিছু পরিবর্তন সেভ করা বাকি অাছে", + "description": "আপনি কি আগের সম্পাদনা সময়কালের অসংরক্ষিত পরিবর্তনসমূহ পুনরূদ্ধার করতে চান?", + "restore": "পুনরূদ্ধার", + "reset": "রিসেট" }, "save": { "title": "সেভ করুন", @@ -214,11 +275,13 @@ }, "splash": { "welcome": "iD ওপেনস্ট্রীটম্যাপ এডিটর-এ অাপনাকে স্বাগতম", + "walkthrough": "ওয়াকথ্রু শুরু করুন", "start": "এখুনি পরিবর্তন করুন" }, "source_switch": { "live": "সরাসরি", - "lose_changes": "অাপনার কিছু পরিবর্তন সেভ করা বাকি অাছে। ম্যাপ সার্ভার পরিবর্তন করলে সেই পরিবর্তনগুলি হারিয়ে যাবে। অাপনি কি ম্যাপ সার্ভার পরিবর্তন করার ব্যপারে নিঃসঙ্কোচ?" + "lose_changes": "অাপনার কিছু পরিবর্তন সেভ করা বাকি অাছে। ম্যাপ সার্ভার পরিবর্তন করলে সেই পরিবর্তনগুলি হারিয়ে যাবে। অাপনি কি ম্যাপ সার্ভার পরিবর্তন করার ব্যপারে নিঃসঙ্কোচ?", + "dev": "ডেভ" }, "tag_reference": { "description": "বিবরন", @@ -233,8 +296,14 @@ "tag_suggests_area": "{tag} ট্যাগটি অনুসারে রেখাটি এলাকা হবে, কিন্তু নয়।", "deprecated_tags": "পুরোন ও অব্যবহৃত ট্যাগ: {tags}" }, + "zoom": { + "in": "জুম্ ইন", + "out": "জুম্ আউট" + }, + "cannot_zoom": "বর্তমান মোডে আরও জুম আউট করা যাবে না.", "gpx": { - "drag_drop": "একটি .gpx ফাইল টেনে এনে পেজটিতে ফেলুন" + "local_layer": "স্থানীয় জিপিএক্স ফাইল", + "browse": ".জিপিখুজুন" }, "help": { "title": "সাহায্য", @@ -242,7 +311,8 @@ }, "intro": { "navigation": { - "title": "ঘুরে বেরানো" + "title": "ঘুরে বেরানো", + "header": "হেডারটি আমাদেরকে বৈশিষ্ট্য প্রকার প্রদর্শন করে." }, "points": { "title": "বিন্দুসমুহ", @@ -281,9 +351,6 @@ }, "category-road": { "name": "রাস্তা" - }, - "category-water": { - "name": "জল" } }, "fields": { @@ -379,6 +446,9 @@ "anticlockwise": "ঘড়ির কাটার উল্টো দিকে" } }, + "collection_times": { + "label": "সংগ্রহের সময়" + }, "construction": { "label": "টাইপ" }, @@ -413,6 +483,9 @@ "fixme": { "label": "অামাকে ঠিক করুন" }, + "generator/method": { + "label": "পদ্ধতি" + }, "generator/type": { "label": "টাইপ" }, @@ -429,7 +502,8 @@ "label": "ইন্টারনেট সুবিধা", "options": { "wlan": "তারবিহীন", - "wired": "তারযুক্ত" + "wired": "তারযুক্ত", + "terminal": "টার্মিনাল" } }, "landuse": { @@ -469,6 +543,9 @@ "network": { "label": "নেটওয়ার্ক" }, + "note": { + "label": "নোট" + }, "office": { "label": "টাইপ" }, @@ -481,6 +558,9 @@ "opening_hours": { "label": "ঘন্টা" }, + "operator": { + "label": "অপারেটর" + }, "parking": { "label": "টাইপ" }, @@ -497,6 +577,9 @@ "railway": { "label": "টাইপ" }, + "ref": { + "label": "রেফারেন্স" + }, "relation": { "label": "টাইপ" }, @@ -587,6 +670,9 @@ "aeroway/helipad": { "name": "হেলিপ্যাড" }, + "amenity": { + "name": "আমেনিটি" + }, "amenity/arts_centre": { "name": "শিল্প কেন্দ্র" }, @@ -626,6 +712,12 @@ "amenity/drinking_water": { "name": "পানীয় জল" }, + "amenity/embassy": { + "name": "দুতাবাস" + }, + "amenity/fast_food": { + "name": "ফাস্টফুড" + }, "amenity/fire_station": { "name": "দমকল" }, @@ -648,7 +740,7 @@ "name": "বাজার" }, "amenity/parking": { - "name": "গাড়ি রাখার জায়গা" + "name": "গাড়ি পার্কিং" }, "amenity/pharmacy": { "name": "দাওয়াইখানা" @@ -674,6 +766,9 @@ "amenity/post_office": { "name": "ডাকঘর" }, + "amenity/pub": { + "name": "সরাইখানা" + }, "amenity/restaurant": { "name": "রেস্তোরাঁ" }, @@ -692,6 +787,9 @@ "amenity/toilets": { "name": "শৌচাগার" }, + "amenity/townhall": { + "name": "টাউন হল" + }, "amenity/university": { "name": "বিশ্ববিদ্যালয়" }, @@ -716,6 +814,9 @@ "building": { "name": "দালান" }, + "building/apartments": { + "name": "এপার্টমেন্ট" + }, "building/commercial": { "name": "বানিজ্যিক ভবন" }, @@ -743,6 +844,9 @@ "entrance": { "name": "প্রবেশপথ" }, + "footway/crossing": { + "name": "ক্রসিং" + }, "highway": { "name": "রাজপথ" }, @@ -758,6 +862,9 @@ "highway/footway": { "name": "ফুটপাত" }, + "highway/motorway": { + "name": "মোটরওয়ে" + }, "highway/path": { "name": "পথ" }, @@ -773,12 +880,21 @@ "highway/road": { "name": "অজানা রাস্তা" }, + "highway/secondary": { + "name": "সেকেন্ডারি রোড" + }, + "highway/service": { + "name": "সার্ভিস রোড" + }, "highway/service/alley": { "name": "গলি" }, "highway/steps": { "name": "সিঁড়ি" }, + "highway/tertiary": { + "name": "টারশিয়ারি রোড" + }, "highway/traffic_signals": { "name": "ট্রাফিক সিগনাল" }, @@ -803,6 +919,9 @@ "historic/ruins": { "name": "ধ্বংসাবশেষ" }, + "landuse": { + "name": "ভূমি ব্যবহার" + }, "landuse/allotments": { "name": "আবন্টন" }, @@ -866,6 +985,9 @@ "leisure/pitch/basketball": { "name": "বাস্কেটবল কোর্ট" }, + "leisure/pitch/soccer": { + "name": "ফুটবল মাঠ" + }, "leisure/pitch/tennis": { "name": "টেনিস কোর্ট" }, @@ -956,6 +1078,24 @@ "office": { "name": "কার্যালয়" }, + "office/newspaper": { + "name": "সংবাদপত্র" + }, + "office/ngo": { + "name": "এনজিও অফিস" + }, + "office/physician": { + "name": "চিকিত্সক" + }, + "office/political_party": { + "name": "রাজনৈতিক দল" + }, + "office/telecommunication": { + "name": "টেলিকম অফিস" + }, + "office/therapist": { + "name": "থেরাপিস্ট" + }, "place": { "name": "জায়গা" }, @@ -989,6 +1129,9 @@ "railway/level_crossing": { "name": "রেল ক্রসি" }, + "railway/monorail": { + "name": "মনোরেল" + }, "railway/platform": { "name": "রেল প্লাটফর্ম" }, @@ -1013,6 +1156,9 @@ "shop": { "name": "দোকান" }, + "shop/bakery": { + "name": "বেকারি" + }, "shop/bicycle": { "name": "সাইকেল-এর দোকান" }, @@ -1034,6 +1180,9 @@ "shop/car_repair": { "name": "গাড়ি মেরামত-এর দোকান" }, + "shop/chemist": { + "name": "কেমিস্ট" + }, "shop/clothes": { "name": "জামাকাপড়-এর দোকান" }, @@ -1043,6 +1192,12 @@ "shop/confectionery": { "name": "কনফেকশনারি" }, + "shop/department_store": { + "name": "ডিপার্টমেন্ট স্টোর" + }, + "shop/doityourself": { + "name": "নিজে করুন স্টোর" + }, "shop/electronics": { "name": "ইলেকট্রনিক্স-এর দোকান" }, @@ -1058,12 +1213,18 @@ "shop/gift": { "name": "উপহার-এর দোকান" }, + "shop/mall": { + "name": "মল" + }, "shop/mobile_phone": { "name": "মোবাইল ফোন-এর দোকান" }, "shop/music": { "name": "সগীত-এর দোকান" }, + "shop/optician": { + "name": "চক্ষুরোগের চিকিত্সক" + }, "shop/shoes": { "name": "জুতোর দোকান" }, @@ -1103,6 +1264,9 @@ "tourism/picnic_site": { "name": "পিকনিক-এর জায়গা" }, + "tourism/theme_park": { + "name": "থিম পার্ক" + }, "tourism/zoo": { "name": "চিড়িয়াখানা" }, @@ -1118,6 +1282,9 @@ "vertex": { "name": "অন্যান্য" }, + "waterway": { + "name": "পানিপথ" + }, "waterway/canal": { "name": "খাল" }, diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json index 5ad6c8d48..82c026c53 100644 --- a/vendor/assets/iD/iD/locales/bs.json +++ b/vendor/assets/iD/iD/locales/bs.json @@ -83,7 +83,8 @@ "annotation": { "line": "Ispravljeni uglovi linije.", "area": "Ispravljeni uglovi područja." - } + }, + "not_squarish": "Ovo se ne može napraviti kvadratom jer nema kvadratnu formu." }, "straighten": { "title": "Ispraviti", @@ -246,18 +247,20 @@ "back_tooltip": "Promijeniti značajku", "remove": "Uklonite", "search": "Pretraga", + "multiselect": "Odabrane stavke", "unknown": "Nepoznato", "incomplete": "", "feature_list": "Značajke pretrage", - "edit": "Urediti značajku" + "edit": "Urediti značajku", + "none": "NiÅ¡ta" }, "background": { "title": "Pozadina", "description": "PodeÅ¡avanja pozadine", "percent_brightness": "prozirnost {opacity}% ", + "none": "NiÅ¡ta", "custom": "Prilagođena pozadina", "custom_prompt": "Unesite Å¡ablon pločica. Validni simboli su {z}, {x}, {y} za Z/X/Y Å¡emu i {u} za \"QuadTile\" Å¡emu.", - "fix_misalignment": "Popravite poravnanje", "reset": "ponovo postavite" }, "restore": { @@ -317,7 +320,9 @@ "cannot_zoom": "Ne može se umanjiti viÅ¡e u trenutnom načinu.", "gpx": { "local_layer": "Lokalna GPX datoteka", - "drag_drop": "Povući i spustiti .gpx datoteku na stranicu" + "drag_drop": "Povući i spustiti .gpx datoteku na stranicu, ili kliknuti na dugme na desnoj strani za pregled", + "zoom": "Zumirati na GPX trasu", + "browse": "Tražiti .gpx datoteku" }, "help": { "title": "Pomoć", @@ -325,9 +330,9 @@ "editing_saving": "# Uređivanje i spremanje\n\nOvaj editor je dizajniran da primarno radi online, i pristupate mu\nkroz web stranicu upravo sada.\n\n### Odabir značajki\n\nDa odaberete značajku na karti, kao npr. cestu ili tačku od interesa, kliknite\nna istu na karti. Ovo će osvijetliti odabranu značajku, otvoriti panel sa\ndetaljima o istoj, i pokazati izbor stvari koje možete uraditi sa značajkom.\n\nDa odaberete viÅ¡e značajki odjednom, držite tipku 'Shift'. Onda ili kliknite\nna značajke koje želite odabrati, ili povucite na karti da nacrtate pravougaonik.\nOvo će nacrtati kutiju i odabrati sve tačke unutar iste.\n\n### Spremanje uređivanja\n\nKada uradite promjene kao Å¡to su uređivanje cesta, zgrada i mjesta, isti se\npohranjuju lokalno sve dok ih ne spremite na server. Ne brinite ako napravite\ngreÅ¡ku - možete poniÅ¡titi promjene klikom na dugme \"PoniÅ¡titi\", i vratiti\npromjene klikom na dugme \"Vratiti\".\n\nKliknite na 'Spremiti' da zavrÅ¡ite grupu uređivanja - npr, ako ste zavrÅ¡ili\ndio grada i želite započeti uređivanje na novom području. Imaćete priliku\nda pregledate Å¡ta ste uradili, a editor daje prijedloge od pomoći\ni upozorenja ako se neÅ¡to ne čini uredu sa promjenama.\n\nAko sve izgleda uredno, možete unijeti kratak komentar kojim objaÅ¡njavate promjene\nkoje ste napravili, i kliknite na 'Spremiti' opet kako bi postavili promjene\nna [OpenStreetMap.org](http://www.openstreetmap.org/), gdje su one vidljive\nsvim drugim korisnicima i dostupne za druge da ih dalje uređuju i poboljÅ¡avaju.\n\nAko ne možete zavrÅ¡iti vaÅ¡a uređivanja u jednom sjedenju, možete napustiti prozor\neditora i vratiti se (na istom pregledniku i računaru), i\naplikacija editora će ponuditi da vratite vaÅ¡ rad.\n", "roads": "# Putevi\n\nMožete crtati, popravljati, i brisati puteve sa ovim uređivačem. Putevi mogu biti svih\nvrsta: staze, ceste, tragovi, biciklističke staze, i viÅ¡e - bilo koji često prelaženi\nsegment bi trebao biti moguć za ucrtavanje.\n\n### Odabir\n\nKliknite na put da ga odaberete. vanjska linija bi trebala postati vidljiva, zajedno\nsa malim menijem alata na karti i bočnom trakom koja pokazuje viÅ¡e informacija\no putu.\n\n### Izmjena\n\nČesto ćete vidjeti puteve koji nisu poravnati da satelistskim slikama iza njih\nili sa GPS trasom. Možete podesiti ove puteve tako da su na pravom\nmjestu.\n\nPrvi klik na put koji želite mijenjati. Ovo će ga označiti i pokazati\nkontrolne tačke uz njega koje možete pomjerati na bolje lokacije. Ukoliko\nželite dodati nove kontrolne tačke za viÅ¡e detalja, dva puta kliknite na dio\nputa bez čvora, i jedan će biti dodan.\n\nUkoliko se put povezuje na drugi put, ali se neprikladno povezuje na\nkartu, možete povući jednu od njegovih kontnrolnih tačaka na drugi put u\nnamjeri da ih spojite. Održavanje puteva povezanim je važno za kartu\ni od vitalnoj je značaja za obezbjeđivanje uputa za vožnju.\n\nMožete takođe kliknuti na alat 'Pomjeriti' ili pritisnuti 'M' tipku koja je prečica da pomičete cijeli put\nistovremeno, i onda kliknete opet da spasite to pomicanje. \n\n### Brisanje\n\nUkoliko je put u potpunosti netačan - možete vidjeti da ne postoji na satelitskoj\nslici i idealno bi bilo da potvrdite da nije prisutan lokalno - možete ga izbrisati,\nÅ¡to ga uklanja sa karte. Budite pažljivi kada briÅ¡ete značajke -\nkao i svako drugo uređivanje, rezultati su vidljivi svima i satelitske slike\nsu često stare, tako da bi put mogao ustvari biti novoizgrađeni.\n\nMožete izbrisati put klikom na njega da ga odaberete, i onda klikajući na\nikonu kante za smeće ili pritiskom na tipku 'Delete'.\n\n### Pravljenje\n\nNaÅ¡li ste negdje da bi tu trebao biti put ali ga nema? Kliknite ikonu 'Linija'\nu donjem lijevom uglu uređivača ili pritisnite tipku`2` da bi započeli crtanje\nlinije.\n\nKliknite na početak puta na kartu da započnete crtanje. Ukoliko se put\ngranan sa postojećeg puta, započnite sa mjesta gdje se povezuju.\n\nOnda kliknite na tačke uzduž puta tako da slijedi pravu putanju, prema\nsatelitskim slikama ili prema GPS-u. Ukoliko se put koji crtate križa sa drugim putem, povežite\nga klikom na tačku križanja. Kada zavrÅ¡ite crtanje, dva puta kliknite\nili pritisnite 'Backspace' ili 'Enter' na VaÅ¡oj tastaturi.\n", "gps": "# GPS\n\nGPS podaci su napouzdaniji izvor podataka za OpenStreetMap. Ovaj uređivač\npodržava lokalne trase - `.gpx` datoteke na VaÅ¡em lokalnom računaru. Možete sakupiti\novu vrstu GPS trasa sa brojnim \"smartphone\" aplikacijama kao i sa\nličnim GPS hardverom.\n\nZa informacije kako izbrÅ¡iti GPS istraživanje, pročitajte\n[Istraživanje sa GPS-om](http://learnosm.org/en/beginner/using-gps/).\n\nDa bi koristili GPX trase za mapiranje, povucite i spustite GPX datoteku na uređivač\nkarte. Ukoliko je prepoznat, biće dodan karti kao svjetlo zelena\nlinija. Kliknite na meni 'PodeÅ¡avanja pozadine' na lijevoj strani da omogućite,\nonemogućite, ili uvećate ovaj novi sloj pokretan GPX-om.\n\nGPX trasa ne biva direktno postavljena na OpenStreetMap - najbolji način\nda se ona koristi je crtanje na karti, koristeći je kao vodilju za nove značajke koje\nVi dodajete, i takođe možete [da je postavite na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nza druge korisnike da je koriste.\n", - "imagery": "# Satelitske slike\n\nSatelitske slike su važan resurs za mapiranje. Kombinacija\npreleta avionom, satelitski pogledi i slobodno sastavljeni izvori su dostupni\nu uređivaču pod menijem 'PodeÅ¡avanja pozadine' na lijevoj strani.\n\nU početnik postavkama satelitski sloj [Bing Maps] (http://www.bing.com/maps/) je\nprezentiran u uređivaču, ali kako pomičete i uvećavate kartu na nova geografska\npodručja, novi će izvori postati dostupni. Neke zemlje, poput Sjedinjenih\nDržava, Francuske i Danske imaju slike vrlo visoke kvalitete na raspolaganju za neka područja.\n\nSatelitske slike ponekad odstupaju od podataka karte, zbog greÅ¡ke na\nstrani davatelja satelitskih slika. Ako vidite puno cesta pomjerenih u pozadini.\nnemojte ih odmah sve premjeÅ¡tati kako bi se slagale sa pozadinom. Umjesto toga možete podesiti\nsatelitske slike tako da odgovaraju postojećim podacima klikom na 'Popravljanje poravnanja', na\ndnu interfejsa Postavki pozadine.\n", + "imagery": "# Satelitske slike\n\nSatelitske slike su važan resurs za mapiranje. Kombinacija\npreleta avionom, satelitski pogledi i slobodno sastavljeni izvorisu dostupni\nu uređivaču pod menijem 'PodeÅ¡avanja pozadine' na desnoj strani.\n\nU početnik postavkama satelitski sloj [Bing Maps] (http://www.bing.com/maps/) je\nprezentiran u uređivaču, ali kako pomičete i uvećavate kartu na nova geografska\npodručja, novi će izvori postati dostupni. Neke zemlje, poput Sjedinjenih\nDržava, Francuske i Danske imaju slike vrlo visoke kvalitete na raspolaganju za neka područja.\n\nSatelitske slike ponekad odstupaju od podataka karte, zbog greÅ¡ke na\nstrani davatelja satelitskih slika. Ako vidite puno cesta pomjerenih u pozadini.\nnemojte ih odmah sve premjeÅ¡tati kako bi se slagale sa pozadinom. Umjesto toga možete podesiti\nsatelitske slike tako da odgovaraju postojećim podacima klikom na 'Popravljanje poravnanja', na\ndnu interfejsa PodeÅ¡avanja pozadine.\n", "addresses": "# Addrese\n\nAddrese su neke od najkorisnijih informacija na karti.\n\nIako su adrese često predstavljene kao dijelovi ulica, na karti OpenStreetMap\nsu one spremljene kao atributi građevina i mjesta uz ulice.\n\nMožete dodati informaciju o adresama mjesta koja su ucrtana kao i vanjske linije građevina takođe\nkao i onih koja su ucrtana kao obične tačke. Optimalni izvor podataka adresa\nse dobija iz istraživanja na licu mjesta ili ličnim znanjem- kao Å¡to je slučaj sam bilo kojom drugom značajkom,\nkopiranje iz komercijalnih izvora kao Å¡to je Google Maps je striktno\nzabranjeno.\n", - "inspector": "# KoriÅ¡tenje inspektora\n\nInspektor je element korisničkog interfejsa na desnoj strani\nstranice koji se pojavljuje kada je značajka odabrana i dozvoljava Vam da uređujete njene detalje.\n\n### Odabir vrste značajke\n\nNakon Å¡to dodate tačku, liniju ili područje, možete birati koja je to vrsta značajke,\nkao npr. da li je to cesta ili rezidencijalna cesta, supermarket ili kafe.\nInspector će prikazati dugmad za vrste općih značajki, i možete\nnaći druge unoÅ¡enjem onoga Å¡to tražite u polje za pretragu.\n\nKliknite na 'i' u donjem desnom uglu dugmeta vrste značajke da\nsaznate viÅ¡e o istoj. Kliknite na dugme da odaberete tu vrstu.\n\n### KoriÅ¡tenje obrazaca i oznaka za uređivanje\n\nNakon Å¡to odaberete vrstu značajke, ili kada odaberete značajku koja već\nima pripisanu vrstu, inspektor će prikazati polja sa detaljima o\nznačajki kao Å¡to je njen naziv i adresa.\n\nIspod polja koje vidite, možete kliknuti na ikone da dodate druge detalje,\nkao Å¡to su informacije sa stranice [Wikipedia](http://www.wikipedia.org/), prustup\nza invalidska kolica, i drugo.\n\nNa dnu inspektora, kliknite 'Dodatne oznake' da dodate joÅ¡ neke\ndruge oznake elementu. [Taginfo](http://taginfo.openstreetmap.org/) je\nodličan izvor za viÅ¡e informacija o popularnim kombinacijama oznaka.\n\nPromjene koje napravite u inspektoru bivaju automatski primijenjene na karti.\nMožete ih poniÅ¡titi bilo kad klikom na dugme za poniÅ¡tavanje.\n\n### Zatvaranje inspektora\n\nMožete zatvoriti inspektor klikom na dugme za zatvaranje u gornjem desnom uglu,\npritiskom na tipku 'Esc', ili klikom na kartu.\n", + "inspector": "# KoriÅ¡tenje inspektora\n\nInspektor je element korisničkog interfejsa na lijevoj strani\nstranice koji vam dozvoljava da uređujete odabranu značajku.\n\n### Odabir vrste značajke\n\nNakon Å¡to dodate tačku, liniju ili područje, možete birati koja je to vrsta značajke,\nkao npr. da li je to cesta ili rezidencijalna cesta, supermarket ili kafe.\nInspector će prikazati dugmad za vrste općih značajki, i možete\nnaći druge unoÅ¡enjem onoga Å¡to tražite u polje za pretragu.\n\nKliknite na 'i' u donjem desnom uglu dugmeta vrste značajke da\nsaznate viÅ¡e o istoj. Kliknite na dugme da odaberete tu vrstu.\n\n### KoriÅ¡tenje obrazaca i oznaka za uređivanje\n\nNakon Å¡to odaberete vrstu značajke, ili kada odaberete značajku koja već\nima pripisanu vrstu, inspektor će prikazati polja sa detaljima o\nznačajki kao Å¡to je njen naziv i adresa.\n\nIspod polja koje vidite, možete kliknuti na ikone da dodate druge detalje,\nkao Å¡to su informacije sa stranice [Wikipedia](http://www.wikipedia.org/), pristup\nza invalidska kolica, i viÅ¡e.\n\nNa dnu inspektora, kliknite 'Dodatne oznake' da dodate joÅ¡ neke\ndruge oznake elementu. [Taginfo](http://taginfo.openstreetmap.org/) je\nodličan izvor za viÅ¡e informacija o popularnim kombinacijama oznaka.\n\nPromjene koje napravite u inspektoru bivaju automatski primijenjene na karti.\nMožete ih poniÅ¡titi bilo kad klikom na dugme za poniÅ¡tavanje.\n", "buildings": "# Građevine\n\nOpenStreetMap karta je najveća svjetska baza građevina. Možete napraviti\ni proÅ¡iriti ovu bazu podataka.\n\n### Odabir\n\nMožete odabrati građevinu odnosno zgradu klikom na njene granice. Ovo će označiti\ngrađevinu i otvoriti mali meni alata i bočnu traku koja pokazuje viÅ¡e informacija\no građevinama.\n\n### Izmjena\n\nPonekad su građevine nepravilno postavljene ili imaju nepravilne oznake.\n\nDa bi pomjerili cijelu građevinu, odaberite je, i onda kliknite na alat 'Pomicanje'. Pomaknite VaÅ¡\nmiÅ¡ da pomjerite građevinu, i kliknite kada je ona pravilno postavljena.\n\nDa bi popravili specifičan oblik građevine, kliknite i povucite čvorove koji formiraju\nnjenu granicu na bolje mjesto.\n\n### Pravljenje\n\nJedno od glavnih pitanja oko dodavanja zgrada karti je to da\nOpenStreetMap snima građevine i kao oblike i kao tačke. Pravilo palca\nje _ucrtavati građevinu kao oblik gdje god je moguće_, kao i ucrtavati kompanije, domove,\ni druge značajne građevine, a i druge stvari koje operiraju van građevina kao tačke smjeÅ¡tene\nunutar oblika građevine.\n\nZapočnite crtati građevinu kao oblik klikom na dugme 'Područje' u gornjem\nlijevom dijelu interfejsa, i zavrÅ¡ite je pritiskom na 'Backspace' na VaÅ¡oj tastaturi\nili klikom na prvi čvor koji je ucrtan kako bi zatvorili oblik.\n\n### Brisanje\n\nUkoliko je građevina u potpunosti netačna - možete vidjeti da ne postoji u satelitskim\nslikama i idealno dobro bi bilo da potvrdite da lokalno nije prisutna - možete je obrisati,\nÅ¡to je uklanja sa karte. Budite pažljivi kada briÅ¡ete značajke -\nkao i svako drugo uređivanje, rezultate vide svi i satelitske slike\nsu često stare, tako da bi građevina mogla biti novoizgrađena.\n\nMožete izbrisati građevinu klikom na nju da bi ste je odabrali, i onda kliknuti na\nikonu kante za smeće ili pritiskom na tipku 'Delete'.\n", "relations": "# Relacije\n\nRelacija je posebna vrsta značajke OpenStreetMap projektu koja grupira\ndruge značajke. Na primjer, dvije uobičajene vrste relacija su *relacije ruta*,\nkoje zajedno grupiraju dijelove puta koji pripadaju posebnom putu ili\nautoputu, i *multipoligoni*, koji zajedno grupiraju nekoliko linija koje definiraju\nsloženo područje (jedno sa viÅ¡e dijelova ili rupa u sebi kao krofna).\n\nGrupa značajki u relaciji se naziva *članovi*. Na Bočnoj traic, možete\nvidjeti kojoj relaciji pripada član, i kliknuti na relaciju\nda je odaberete. Kada je relacija odabrana možete vidjeti sve njene\nčlanove izlistane na bočnoj traci i osvijetljene na karti.\n\nU većini slučajeva, iD editor će voditi računa o održavanju relacija automatski\ndok uređujete. Glavna stvar koje trebate biti svjesni jeste da ako izbriÅ¡ete\ndio puta u namjeri da ga nacrtate tačnije, morate biti sigurni da je\nnovi dio član istih relacija kao i original.\n\n## Uređivanje relacija\n\nAko želite uređivati relacije, ovo su osnove.\n\nDa dodate značajku relaciji, odaberite značajku, kliknite na dugme \"+\" u\ndijelu \"Sve relacije\" na bočnoj traci, i izaberite ili ukucajte naziv relacije.\n\nDa napravite novu relaciju, prvo odaberite značajku koja treba biti član,\nkliknite na dugme \"+\" u dijelu \"Sve relacije\", i izaberite \"Nova relacija...\".\n\nDa uklonite značajku iz relacije, odaberite značajku i kliknite na dugme smeće\nkoje se pojavljuje uy relaciju iz koje je želite ukloniti.\n\nMožete praviti multipoligone sa rupama koristeći alat \"Spojiti\". Nacrtajte dva područja (unutraÅ¡nje i\nvanjsko), držite tipku Shift i kliknite na svaku od njih da ih izaberete, a potom\nkliknite na dugme \"Spojiti\" (+).\n" }, @@ -396,9 +401,6 @@ }, "category-route": { "name": "Ruta" - }, - "category-water": { - "name": "Voda" } }, "fields": { @@ -915,10 +917,6 @@ "name": "Tržnica", "terms": "tržnica,pijaca" }, - "amenity/parking": { - "name": "Parking", - "terms": "parking,parkiraliÅ¡te,parking za automobile" - }, "amenity/pharmacy": { "name": "Apoteka", "terms": "apoteka,ljekarna" @@ -1383,6 +1381,10 @@ "name": "Rekreacija", "terms": "rekreacija,razonoda" }, + "leisure/common": { + "name": "Uobičajeno", + "terms": "uobičajeno,uobičajeno ime,uobičajeni naziv" + }, "leisure/dog_park": { "name": "IgraliÅ¡te za pse", "terms": "igraliÅ¡te za pse,park za pse" @@ -1479,6 +1481,10 @@ "name": "Svjetionik", "terms": "svjetionik,toranj za svjetlosnu navigaciju" }, + "man_made/observation": { + "name": "Osmatračnica", + "terms": "osmatračnica,toranj za osmatranje,platforma za osmatranje,toranj za turiste,protupožarni toranj" + }, "man_made/pier": { "name": "PristaniÅ¡te", "terms": "pristaniÅ¡te,mol" @@ -1855,6 +1861,10 @@ "name": "Praonica", "terms": "praonica,servis za pranje rublja" }, + "shop/locksmith": { + "name": "Bravar", + "terms": "bravar,kopiranje ključeva,bravarija" + }, "shop/mall": { "name": "Tržni centar", "terms": "tržni centar,supermarket,hipermarket" diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json index 1f9c727fc..b8f51a822 100644 --- a/vendor/assets/iD/iD/locales/ca.json +++ b/vendor/assets/iD/iD/locales/ca.json @@ -83,7 +83,8 @@ "annotation": { "line": "Heu quadrat les cantonades d'una línia.", "area": "Heu quadrat les cantonades d'una àrea." - } + }, + "not_squarish": "Això no es pot quadrar perquè no té forma quadrada" }, "straighten": { "title": "Fer recta", @@ -246,18 +247,21 @@ "back_tooltip": "Canvia la característica", "remove": "Elimina", "search": "Cerca", + "multiselect": "Els ítems seleccionats", "unknown": "Desconegut", "incomplete": "", "feature_list": "Cerca característiques", - "edit": "Editar la característica" + "edit": "Editar la característica", + "none": "Cap" }, "background": { "title": "Fons", "description": "Paràmetres de configuració del fons", "percent_brightness": "{opacity}% brillantor", + "none": "Cap", "custom": "Personalitza", "custom_prompt": "Introdueix una plantilla de casella. Els paràmetres vàlids són {z}, {x}, {y} per a l'esquema Z/X/Y i {u} per a l'esquema quadtile.", - "fix_misalignment": "Corregeix la desalineació", + "fix_misalignment": "Corregir la alineació", "reset": "reinicia" }, "restore": { @@ -280,7 +284,7 @@ "view_on_osm": "Mostra-ho a OSM", "facebook": "Comparteix a Facebook", "twitter": "Comparteix al Twitter", - "google": "Comparteix al Google+", + "google": "Comparteix a Google+", "help_html": "Els canvis haurien d'aparèxier a la capa \"Estàndard\" en pocs minuts. Altres capes i algunes característiques, poden trigar més temps.\n(detalls).\n" }, "confirm": { @@ -317,7 +321,9 @@ "cannot_zoom": "No es pot allunyar més la vista al mode actual.", "gpx": { "local_layer": "Fitxer GPX local", - "drag_drop": "Arrossega i deixa un fitxer .gpx a la pàgina" + "drag_drop": "Arrosegueu i deixeu un fitxer .gpx a la pàgina, o bé cliqueu el botó que es troba a la dreta per navegar pel vostre sistema.", + "zoom": "Ajusteu la vista a la traça GPX", + "browse": "Buscar el fitxer .gpx" }, "help": { "title": "Ajuda", @@ -325,9 +331,9 @@ "editing_saving": "# Edició i desat\n\nAquest editor està dissenyat per treballar principalment en línia, i hi has accedit mitjançant una pàgina web.\n\n### Selecció de característiques\n\nPer selecionar una característica del mapa, com ara una carretera o un punt d'interès, clica-hi a sobre. Això ressaltarà la característica, obrirà un panell amb els detalls sobre aquesta, i un menú amb les coses que hi pots fer .\n\nPots seleccionar múltiples característiques, prement la tecla 'Shift' i clicant-les per separat, o bé clicant i arrossegant el cursor. Això seleccionarà totes les característiques que englobi el requadre que es dibuixarà i permetrà modificar totes les característiques seleccionades en un sol cop.\n\n### Desant les edicions\n\nQuan facis canvis com ara editar carreteres, edificis, o llocs, aquests canvis es guarden localment fins que els desis al servidor. No et preocupis si comets algun error- pots desfer els canvis clicant el botó de desfer, i pots refer els canvis clicant el botó de refer.\n\nClica 'Desa' per acabar un grup d'edicions - per exemple, si has acabat de delimitar l'àrea d'una ciutat i vols començar a fer-ne una altra. Tindràs la oportunitat de revisar la feina feta,\ni l'editor proporcionarà suggeriments que et podràn ajudar\ni també mostrarà alertes si alguna cosa no està del tot bé als teus canvis.\n\nSi tot sembla correcte, pots escriure un breu comentari explicant el canvis\nque has fet, i clicar desa un altre cop per publicar els canvis\na [OpenStreetMap.org](http://www.openstreetmap.org/), on seràn visibles\nper a tots els altres usuaris i disponibles per a altres editors per refer-los o bé millorar-los.\n\nSi no pots acabar les teves edicions en una sessió, pots sortir de la finestra d'edició i tornar més tard (al mateix navegador i ordinador), i l'aplicació d'edició\npreguntarà si vols restaurar els canvis anteriors.\n", "roads": "# Carreteres\n\nPots crear, ajustar i eliminar carreteres amb aquest editor. Les carreteres poden ser\nde molts tipus: pistes, autovies, camins, carrils bici, i molts més - tots els segments\nmés comuns han de ser cartografiables.\n\n### Selecció\n\nClica a la carretera per seleccionar-la. Al fer això els seus contorns es faran visibles, \ncom també un petit menú d'eines i una barra lateral que mostrarà més informació\nsobre la carretera.\n\n### Modificació\n\nDe vegades veuràs carreteres que no estan alineades amb la imatge del darrere \no amb una traça de GPS. Podeu ajustar aquestes carreteres per tal que estiguin al lloc\ncorrecte.\n\nPrimer clica a la carretera que vols canviar. Això la ressaltarà i mostrarà els punts de control\nque pots arrossegar a les ubicacions desitjades. Si el que\nvols és afegir nous punts per obtenir un grau de detall més alt, fes doble clic en una part de la carretera sense cap punt, i se'n afegirà un.\n\nSi la carretera es connecta amb una altra, però no ho reflecteix al mapa, \npots arrossegar un dels punts de control cap a l'altre carretera \nper tal d'unir-les. Fer que les carreteres es connectin és molt important \nper al mapa i essencial per proveir direccions per a la conducció.\n\nTambé pots clicar l'eina «Moure» o prémer la tecla «M» per moure la carretera sencera, tota de cop, i llavors clicar altra vegada per guardar aquest moviment.\n\n### Eliminació\n\nSi una carretera està totalment malament -pots apreciar que no existeix a la imatge per satèl·lit\ni a més a més, els veïns ens han confirmat que no existeix - la pots eliminar, cosa que la treurà del mapa. Vés amb molt de compte a l'hora d'eliminar característiques -\ncom ara altres edicions; els resultats podran ser vistos per tothom i moltes vegades la imatgeria per satèl·lit no està actualitzada, per tant la carretera es pot haver estat construida recentment.\n\nPots eliminar una carretera clicant-la, i llavors clicant la icona de la paperera o bé prement la tecla «Suprimir».\n\n### Creació\n\nHas trobat que en algun lloc hi hauria d'haver una carretera però no hi és? Clica la icona «Línia»\nal marge superior esquerre de la zona del mapa o bé prem la tecla «2» per començar a dibuixar\nuna línia.\n\nClica a l'inici de la carretera al mapa per començar a dibuixar. Si la carretera comença amb una bifurcació en una carretera existent, cliqueu al lloc a on connecten.\n\nA continuació clica a diferents punts al llarg de la carretera per tal que segueixi el traçat correcte, d'acord amb la imatge del satèl·lit o la traça del GPS. Si la carretera que estàs dibuixant s'encreua amb una altra carretera, connecta-les clicant al punt d'intersecció. Quan acabis el dibuix, fes doble clic o prem «Retorn» del teclat.\n", "gps": "# GPS\n\nLes dades de GPS són la font més fiable de dades per a l'OpenStreetMap. Aquest editor és compatible amb les taces locals - fitxers`.gpx`al teu ordinador local. Pots recollir \naquest tipus de traça GPS amb algunes aplicacions per a smartphones com també \ndispositius personals de GPS.\n\nPer a més informació sobre com recollir dades amb GPS, llegeix\n[Recollir dades amb GPS](http://learnosm.org/en/beginner/using-gps/).\n\nper fer servir una traça GPX per editar el mapa, arrossega i deixa el fitxer GPX a l'editor. \nSi es detecta, s'afegirà el mapa com una línia verda llampant. \nClica a 'Paràmetres de configuració del fons' al cantó esquerre per activar,\ndesactivar, o per ajustar la vista a aquesta capa GPX.\n\nLa traça GPX no és pujada directament a OpenStreetMap - la millor manera de \nfer-la servir és dibuixar tu el mapa, fent-la servir com a guia per a les noves característiques que afegiràs. també les pots [pujar a l'OpenStreetMap] \n(http://www.openstreetmap.org/trace/create)\nperquè d'altres persones les utilitzin.\n", - "imagery": "# Imatgeria\n\nLa imatgeria aèria és un recurs important per a l'edició de mapes. Una combinació de\nvols d'aeronaus, fotografies de satèl·lit, i d'altres fonts compilades gratuïtament \nestan disponibles a l'editor dins del menú de l'esquerre 'Paràmetres de configuració del fons'.\n\nPer defecte, l'editor mostra la capa de satèl·lit de [Bing Maps](http://www.bing.com/maps/), però a mesura que et mous i ajustes la vista del mapa a noves àrees geogràfiques, noves fonts estaran disponibles. En alguns països, com ara els Estats Units, França, i Dinamarca tenen\n una imatgeria d'alta qualitat disponible per a determinades àrees.\n\nLa imatgeria de vegades no es correspon amb les dades del mapa, això és degut a un error\nper part del proveïdor de la imatge. Si veieu moltes carreteres mogudes del seu lloc a la imatge,\nno les mogueu per tal que encaixin amb aquesta. Ja que pots ajustar la imatgeria per tal de que quadri amb les dades existents clicant a 'Corregeix la desalineació' a sota de la pestanya dels\n'Paràmetres de configuració del fons'.\n", + "imagery": "# Imatgeria\n\nLa imatgeria aèria és un recurs important per a l'edició de mapes. Una combinació de\nvols d'aeronaus, fotografies de satèl·lit, i d'altres fonts compilades gratuïtament \nestan disponibles a l'editor dins del menú de l'esquerra 'Paràmetres de configuració del fons'.\n\nPer defecte, l'editor mostra la capa de satèl·lit de [Bing Maps](http://www.bing.com/maps/), però a mesura que et mous i ajustes la vista del mapa a noves àrees geogràfiques, noves fonts estaran disponibles. En alguns països, com ara els Estats Units, França, i Dinamarca tenen\n una imatgeria d'alta qualitat disponible per a determinades àrees.\n\nLa imatgeria a vegades no es correspon amb les dades del mapa, això és degut a un error\nper part del proveïdor de la imatge. Si veus moltes carreteres mogudes del seu lloc a la imatge,\nno les moguis per tal que encaixin amb aquesta. Ja que pots ajustar la imatgeria per tal de que quadri amb les dades existents clicant a 'Corregeix la desalineació' al capdevall de la pestanya dels\n'Paràmetres de configuració del fons'.\n", "addresses": "# Adreçes\n\nLes adreçes són una de les informacions més útils per al mapa.\n\nTot i que les adreces sovint es representen com a part del carrer, a l'OpenStreetMap\nes desen com a atributs dels edificis i llocs al llarg dels carrers\n\nPodeu afegir la informació de l'adreça a llocs cartografiats com a edificis com també\na aquells llocs cartografiats com a simples punts. La forma òptima d'obtenir dades \nde les adreces és a partir d'un estudi al carrer o bé el coneixement propi - com a qualsevol altra característica, la còpia de fonts comercials com ara el Google Maps és estrictament prohibida.\n", - "inspector": "# Ús de l'inspector\n\nL'Inspector és l'element de la interfície d'usuari que es troba al cantó esquerre de la pàgina i que \napareix quan una característica és seleccionada i permet editar-ne els detalls.\n\n### Selecció del tipus de característica\n\nDesprés d'afegir un punt, línia, o àrea, pots escollir quin tipus de característica és.\nTant si és una autopista com un carrer residencial, un supermercat o un cafè.\nL'inspector mostrarà botons per als tipus de característica més comuns, i en pots trobar d'altres escrivint el que estàs cercant al quadre de cerca.\n\nFes clic a la «i» al cantó inferior dret del botó del tipus de característica per saber-ne més. Fes clic al botó per seleccionar-la.\n\n### Utilització dels camps i les etiquetes d'edició\n\nDesprés d'escollir la característica, o quan seleccionis una característica que ja té\nun tipus assignat, l'inspector mostrarà uns camps amb detalls de la característica \ncom ara el seu nom o la seva adreça .\n\nA sota dels camps que veus, pots clicar algunes icones per afegir altres detalls,\ncom ara informació de la [Viquipèdia](http://ca.wikipedia.org/), l'accés per a cadires de rodes,\ni alguna cosa més.\n\nAl capdavall de l'inspector, clica «Etiquetes addicionals» per afegir altres etiquetes arbitràries a l'element. [Taginfo](http://taginfo.openstreetmap.org/) és una gran eina per aprendre'n més sobre les combinacions d'etiquetes més populars.\n\nEls canvis que facis a l'inspector s'aplicaran automàticament al mapa.\nEls pots desfer en qualsevol moment clicant al botó de «Desfés».\n\n##Tancament de l'inspector\n\nPots tancar l'inspector clicant el botó de tancament al cantó superior dret,\nprement la tecla «Esc», o bé clicant al mapa.\n", + "inspector": "# Utilitzant l'inspector\n\nL'Inspector és l'element de l'interfície d'usuari que es troba al cantó dret de la pàgina i que+\napareix quan una característica és seleccionada i permet editar-ne els detalls.\n\n### Selecció del tipus de característica\n\nDesprés d'afegir un punt, línia, o àrea, pots escollir quin tipus de característica és,\nTant si és una autopista com un carrer residencial, un supermercat o un cafè.\nL'inspector mostrarà botons per els tipus de característica més comuns, i en pots trobar d'altres escrivint el que estàs buscant al quadre de cerca.\n\nClica la 'i' al cantó inferior dret del botó del tipus de característica per saber-ne més. Clica el botó per seleccionar-la.\n\n### Utilització dels camps i les etiquetes d'edició\n\nDesprés d'escollir la característica, o quan selecciones una característica que ja té\nun tipus assignat, l'inspector mostrarà uns camps amb detalls de la característica \ncom ara el seu nom o la seva adreça .\n\nA sota dels camps que veus, pots clicar algunes icones per afegir altres detalls,\ncom ara infrmació de la [Viquipèdia](http://www.wikipedia.org/), l'accés per a cadires de rodes,\ni alguna cosa més.\n\nAl capdavall de l'inspector, clica 'Etiquetes adicionals' per afegir altres etiquetes arbitràries a l'element. [Taginfo](http://taginfo.openstreetmap.org/) és una gran eina per aprendre'n més sobre les combinacions d'etiquetes més populars.\n\nEls canvis que facis a l'inspector s'aplicaran automàticament al mapa.\nEls pots desfer en qualsevol moment clicant al botó de 'Desfer' .\n\n", "buildings": "# Edificis\n\nL'OpenStreetMap és la base de dades d'edificis més gran del món. Podeu ampliar \ni millorar aquesta base de dades.\n\n### Selecció\n\nPots seleccionar un edifici clicant al seu marge. Això farà ressaltar\nl'edifici i obrirà un petit menú d'eines i una barra lateral mostrant més informació\nsobre l'edifici.\n\n### Modificació\n\nA vegades els edificis estan mal col·locats o tenen etiquetes incorrectes.\n\nPer moure l'edifici sencer, selecciona'l, tot seguit clica l'eina 'Mou'. Desplaça el\ncursor per desplaçar l'edifici, i torna a clicar quan estigui posicionat correctament.\n\nPer ajustar la forma específica d'un edifici, clica i arrossega els nodes que componen \nel seu marge als llocs desitjats.\n\n### Creació\n\nUn dels principals temes sobre l'addició d'edificis al mapa és que\nl'OpenStreetMap pot desar edificis com a punts però també com a figures. La norma general\nper a cartografiar un edifici diu que _aquest s'ha d'expressar, sempre que sigui possible, com a una figura_, i les companyies, empreses,\nequipaments, i d'altres coses que operen als edificis, s'han de cartografiar com a punts \ncol·locats dins de la figura de l'edifici.\n\n\nComença a dibuixar un edifici com a figura clicant el botó 'Àrea' a la zona superior esquerra de la interfície, i finalitzeu-lo o bé prement la tecla 'Retorn' del teclat\no clicant al primer node que heu col·locat per tancar la figura.\n\n### Eliminació\n\nSi un edifici està totalment malament - pots apreciar que no existeix a la imatge per satèl·lit\ni a més a més, els veïns ens han confirmat que no existeix - el pots eliminar, cosa que el traurà del mapa. S'ha d'anar amb molt de compte a l'hora d'eliminar característiques -\ncom totes les altres edicions, els resultats podran ser vistos per tothom i moltes vegades la imatgeria per satèl·lit no està actualitzada, per tant l'edifici pot haver estat construït recentment.\n\nPots eliminar un edifici clicant-lo, i llavors clicant la icona de la paperera o bé prement la tecla 'Suprimir'.\n", "relations": "# Relacions\n\nUna relació és un tipus especial de característica a l'OpenStreetMap que reuneix altres característiques. Per exemple, dos tipus comuns de relacions són les *relacions de ruta*,\nque reuneixen seccions de carreteres que pertanyen a una autovia o autopista en concret, i els *multipolígons*, que reuneixen diferents línies que defineixen una àrea complexa (amb vàris segments o amb forats, com un donut).\n\nEl grup de característiques en una relació s'anomena *els membres*. A la barra lateral, pots veure a quines relacions n'és membre una característica, i clicar una relació des d'un membre per seleccionar-la i entrar-hi. Quan selecciones i entres a la relació, pots veure tots els seus membres llistats a la barra lateral i subratllats al mapa .\n\nLa majoria de vegades, l'iD s'encarregarà de mantenir les relacions automàticament\nmentre tu edites. L'única cosa que has de procurar és de reconnectar la relació si esborres algun tram de l'original, és a dir si esborres un tram d'una relació per refer-lo amb més precisió, has de incloure el nou tram a la relació, igual que ho era el tram original.\n\n## Edició de les relacions\n\nSi el que vols és editar relacions, aquí hi han les pautes bàsiques.\n\nPer afegir una característica a una relació, selecciona la característica, clica el botó \"+\" a la secció \"Totes les relacions\" de la barra lateral, i selecciona o escriu el nom de la relació.\n\nPer crear una nova relació, selecciona la primera característica que n'hauria de ser membre, clica el botó \"+\" a la secció \"Totes les relacions\", i selecciona \"Nova relació...\".\n\nPer eliminar una característica d'una relació, selecciona la característica i clica el botó de la paperera que es troba al costat de la relació que vols eliminar.\n\nPots crear multipolígons amb forats utilitzant l'eina \"Fusionar\". Dibuixa dues àrees (la interior i la exterior), mantén premuda la tecla Shift i clica a les dues àrees per seleccionar-les alhora, llavors clica el botó \"Fusiona\" (+).\n" }, @@ -382,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Edifici" + }, "category-landuse": { "name": "Aprofitament del terreny" }, @@ -397,7 +406,10 @@ "category-route": { "name": "Ruta" }, - "category-water": { + "category-water-area": { + "name": "Aigua" + }, + "category-water-line": { "name": "Aigua" } }, @@ -696,6 +708,9 @@ "shelter": { "label": "Coberta" }, + "shelter_type": { + "label": "Tipus" + }, "shop": { "label": "Tipus" }, @@ -736,6 +751,9 @@ "trail_visibility": { "label": "Visibilitat del camí" }, + "tree_type": { + "label": "Tipus" + }, "vending": { "label": "Tipus de mercaderies" }, @@ -914,8 +932,7 @@ "terms": "Mercat, Mercat veïnal, Mercat de carrer" }, "amenity/parking": { - "name": "Aparcament", - "terms": "Aparcament, Lloc per a estacionar, Lloc d'estacionament limitat, cotxera, cotxeria, garatge, parking, pàrquing, Lloc per aparcar, Parada" + "name": "Aparcament" }, "amenity/pharmacy": { "name": "Farmàcia", @@ -968,6 +985,9 @@ "name": "Escola", "terms": "Escola, CEIP, IES, Guarderia, Institut" }, + "amenity/shelter": { + "name": "Refugi" + }, "amenity/swimming_pool": { "name": "Piscina", "terms": "Piscina, Instal·lació aquàtica" @@ -1118,6 +1138,12 @@ "entrance": { "name": "Entrada" }, + "footway/crossing": { + "name": "Cruïlla" + }, + "footway/sidewalk": { + "name": "Vorera" + }, "highway": { "name": "Via" }, @@ -1306,6 +1332,9 @@ "leisure": { "name": "Esbarjo" }, + "leisure/common": { + "name": "Àrea comuna" + }, "leisure/dog_park": { "name": "Parc Caní" }, @@ -1378,6 +1407,9 @@ "man_made/lighthouse": { "name": "Far" }, + "man_made/observation": { + "name": "Torre de vigilància" + }, "man_made/pier": { "name": "Moll de pilons" }, @@ -1465,6 +1497,66 @@ "office": { "name": "Oficines" }, + "office/accountant": { + "name": "Contable" + }, + "office/administrative": { + "name": "Oficina de tràmits locals" + }, + "office/architect": { + "name": "Arquitecte" + }, + "office/company": { + "name": "Oficines de companyia" + }, + "office/educational_institution": { + "name": "Institució Educativa" + }, + "office/employment_agency": { + "name": "Oficina de treball" + }, + "office/estate_agent": { + "name": "Oficina d'agència immobiliària" + }, + "office/financial": { + "name": "Oficina financera" + }, + "office/government": { + "name": "Oficina governamental" + }, + "office/insurance": { + "name": "Oficina de companyia asseguradora" + }, + "office/it": { + "name": "Oficina d'informàtic/a" + }, + "office/lawyer": { + "name": "Bufet d'advocats" + }, + "office/newspaper": { + "name": "Diari" + }, + "office/ngo": { + "name": "Oficina d'ONG" + }, + "office/physician": { + "name": "Fisioterapeuta" + }, + "office/political_party": { + "name": "Local de partit polític" + }, + "office/research": { + "name": "Oficines d'R+D" + }, + "office/telecommunication": { + "name": "Oficina de telecomunicacions" + }, + "office/therapist": { + "name": "Terapeuta" + }, + "office/travel_agent": { + "name": "Agència de viatges" + }, "place": { "name": "Lloc" }, @@ -1501,6 +1593,9 @@ "power/line": { "name": "Línia elèctrica" }, + "power/minor_line": { + "name": "Línia elèctrica de baixa tensió" + }, "power/pole": { "name": "Piló de línia elèctrica" }, @@ -1660,6 +1755,9 @@ "shop/laundry": { "name": "Bugaderia" }, + "shop/locksmith": { + "name": "Copisteria de claus" + }, "shop/mall": { "name": "Centre comercial" }, @@ -1684,6 +1782,9 @@ "shop/pet": { "name": "Botiga d'animals" }, + "shop/photo": { + "name": "Botiga de fotografia" + }, "shop/shoes": { "name": "Sabateria" }, diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json index f8dabd36b..06ddeff01 100644 --- a/vendor/assets/iD/iD/locales/cs.json +++ b/vendor/assets/iD/iD/locales/cs.json @@ -83,7 +83,8 @@ "annotation": { "line": "Úhly cesty do pravého úhle.", "area": "Rohy plochy do pravého úhle." - } + }, + "not_squarish": "Z objektu není možné udělat čtverec, protože se čtverci vůbec nepodobá." }, "straighten": { "title": "Narovnat", @@ -246,18 +247,21 @@ "back_tooltip": "Změnit objekt", "remove": "Odstranit", "search": "Hledat", + "multiselect": "Zvolené objekty", "unknown": "Není známo", "incomplete": "", "feature_list": "Hledat objekty", - "edit": "Editovat objekt" + "edit": "Editovat objekt", + "none": "Žádné" }, "background": { "title": "Pozadí", "description": "Nastavení pozadí", "percent_brightness": "{opacity}% viditelnost", + "none": "Žádné", "custom": "Vlastní", "custom_prompt": "Vložte Å¡ablonu adres dlaždic. Lze použít tokeny {z}, {x}, {y} pro schéma Z/X/Y a {u} pro hierarchické schéma quadtile.", - "fix_misalignment": "Zarovnat pozadí", + "fix_misalignment": "Vyrovnat posunutí pozadí", "reset": "vrátit na začátek" }, "restore": { @@ -317,7 +321,9 @@ "cannot_zoom": "Aktuální nastavení nedovoluje větší zvětÅ¡ení.", "gpx": { "local_layer": "Vlastní GPX soubor", - "drag_drop": "Přetáhněte do editoru soubor .gpx" + "drag_drop": "Přetáhněte do editoru soubor .gpx nebo klikněte na tlačítko vpravo a zvolte soubor pomocí dialogu.", + "zoom": "ZvětÅ¡it na stopu GPX", + "browse": "Zvolit .gpx soubor v dialogu" }, "help": { "title": "Pomoc", @@ -325,9 +331,9 @@ "editing_saving": "# Editace a publikace\n\nTento editor pracuje primárně online - právě teď k němu přistupujete prostřednictvím webové stránky.\n\n### Výběr objektů\n\nChcete-li vybrat objekt, jako třeba silnici nebo obchod, klikněte na něj v mapě. Objekt se tím označí, otevře se boční panel s vlastnostmi objektu a zobrazí se nabídka akcemi, které lze s objektem provést.\n\nMůžete označit a pracovat s několika objekty najednou: podržte klávesu 'Shift', a pak buď postupně označte dotyčné objekty, anebo klikněte na mapu a táhněte myší či prstem - editor označí vÅ¡echny objekty uvnitř přísluÅ¡ného obdélníku.\n\n### Publikace změn\n\nKdyž provedete nějaké úpravy objektů v mapě, úpravy jsou uloženy lokálně ve vaÅ¡em prohlížeči. Nelekejte se, když uděláte chybu - úpravy lze vrátit zpět tlačítkem Zpět, a naopak je znovu provést tlačítkem Znovu.\n\nPo dokončení bloku úprav klikněte na 'Uložit' - například když jste upravili jednu část města, a chcete začít úpravy někde jinde. Zobrazí se přehled úprav, které jste provedli, editor tyto úpravy zkontroluje, a když se mu něco nebude zdát, zobrazí varování a návrhy.\n\nKdyž bude vÅ¡echno v pořádku, můžete přidat krátký komentář s vysvětlením vaÅ¡ich úprav a kliknout znovu 'Uložit'. Úpravy se tímto publikují na [OpenStreetMap.org](http://www.openstreetmap.org/), kde za chvíli budou viditelné pro vÅ¡echny uživatele a bude na nich možné provádět další úpravy.\n\nPokud nechcete nebo nemůžete pravy dokončit teď, stačí prostě odejít ze stránky pryč. Až příště navÅ¡tívíte stránku (na stejném počítači, ve stejném prohlížeči), editor vám nabídne možnost znovu načíst neuložené úpravy.\n", "roads": "# Cesty\n\nEditor umožňuje vytvářet, opravovat a mazat silnice, pěšiny, cyklostezky, železnice atd. Zmapovat by mělo jít jakýkoli druh komunikace.\n\n### Výběr\n\nKdyž na cestu kliknete, zbarví se její obrys, otevře se u ní malá nabídka s nástroji a dále boční panel s informacemi o cestě.\n\n### Úpravy\n\nČasto narazíte na cesty, které jen nepřesně sledují pozadí či trasu GPS. Takové cesty můžete zarovnat na správné místo.\n\nNapřed klikněte na cestu, kterou chcete upravit. Cesta se rozsvítí a podél ní se objeví kontrolní uzly, které můžete posunout na správné místo. Pokud chcete přidat další kontrolní body a zpřesnit tak průběh cesty, stačí dvakrát kliknout na kus cesty mezi dvěma uzly - na zvolené místo přibude nový uzel.\n\nKdyž je reálná cesta napojena na jinou, ale v mapě spojeny nejsou, posuňte myší kontrolní uzel jedné cesty nad druhou - cesty se pak spojí. Propojení cest je velmi důležité pro správnou funkci navigací.\n\nTaké můžete posunout najednou celou cestu: buď klikněte na ikonu posunu v menu zobrazeném u cesty nebo stiskněte klávesu `M` a potom klikněte myší pro ukončení posunu. Jen pozor - pokud jsou vůči pozadí či GPS stopě vÅ¡echny objekty v okolí, pravděpodobně to bude chybným pozadím a ne chybnou polohou objektů.\n\n### Mazání\n\nPokud je cesta úplně Å¡patně, můžete ji zcela odstranit z mapy. Neměli byste se spoléhat pouze na satelitní snímky - mohou být zastaralé nebo zavádějící -, ideální je se přesvědčit na místě, že cesta opravdu neexistuje. Zvlášť při mazání objektů buďte opatrní - výsledek vaší úpravy se projeví v mapě pro vÅ¡echny její uživatele.\n\nCestu smažete tak, že na ni kliknete a zvolíte ikonu odpadkového koÅ¡e nebo stisknete klávesu Delete.\n\n### Vytváření\n\nNarazili jste na cestu, která by v mapě měla být, ale není? Klikněte na tlačítko 'Cesta' vlevo nahoře nebo stiskněte klávesu `2` - to vám umožní nakreslit novou cestu.\n\nKlikněte na místo, kde cesta začíná. Pokud cesta vychází z jiné, existující cesty, klikněte na místo, kde se cesty oddělují.\n\nPotom postupně klikejte na body, kudy cesta vede, podle satelitních snímků nebo trasy z GPS. Pokud vaÅ¡e cesta protíná jinou, je třeba je propojit tak, že kliknete na bod křížení. Nakonec dvakrát klikněte na stejné místo nebo stiskněte klávesu 'Return' nebo 'Enter', cesta se tak ukončí.\n", "gps": "# GPS\n\nData z GPS jsou nejdůvěryhodnějším zdrojem informací pro OpenStreetMap. Tento editor podporuje zobrazení tras ve formátu `.gpx` nahraných z vaÅ¡eho počítače. Takovou trasu můžete nasbírat s pomocí nejrůznějších aplikací pro mobily nebo s pomocí specializované navigace.\n\nPro více informací, jak provést takový sběr dat z GPS, viz např. návod anglicky:\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nPokud už máte záznam ve formátu GPX, přetáhněte soubor myší či prstem nad editor. Rozpozná-li editor formát souboru, zobrazí se trasa v mapě jako světle zelená čára. Pokud chcete tuto novou vrstvu zapnout, vypnout nebo zvětÅ¡it na velikost pracovní plochy, klikněte na menu 'Nastavení pozadí' na pravé straně.\n\nTrasa GPX nebude přímo nahrána na OpenStreetMap - pouze slouží jako vodítko, podle kterého se můžete orientovat, a podle kterého můžete kreslit nové objekty do mapy. Pokud chcete přímo trasu GPX poskytnout i ostatním, můžete ji [nahrát do samostatné databáze OpenStreetMap](http://www.openstreetmap.org/trace/create).⏎\n", - "imagery": "# Podkladové snímky\n\nSatelitní a letecké snímky jsou důležitým zdrojem mapových dat. V menu 'Nastavení pozadí' na levé straně editoru je k dispozici kombinace leteckých snímků, satelitních snímků a dalších volně dostupných podkladů.\n\nImplicitní vrstvou jsou satelitní snímky [Bing](http://www.bing.com/maps/), ale jakmile se přesunete do konkrétní geografické oblasti a nastavíte dostatečné zvětÅ¡ení, nabídnou se vám nové mapové podklady. V některých státech, jako jsou Spojené státy, Francie či Dánskou, jsou k dispozici snímky ve vysoké kvalitě. Pro velkou část České republiky jsou také dostupné velmi detailní satelitní snímky (data z katastru nemovitostí zatím editor nepodporuje).\n\nPodklady jsou někdy posunuté vůči mapě, kvůli chybám na straně poskytovatele snímů. Pokud uvidíte, že je mnoho cest v mapě posunuto vůči pozadí, nesnažte se je přesunout - posun obvykle znamená chybu v podkladu a ne chybu v mapě. V menu 'Nastavení pozadí' klikněte na 'Zarovnat pozadí' - to vám dovolí posunout podklad, aby lícoval s mapou.\n", + "imagery": "# Podkladové snímky\n\nSatelitní a letecké snímky jsou důležitým zdrojem mapových dat. V menu 'Nastavení pozadí' na levé straně editoru je k dispozici kombinace leteckých snímků, satelitních snímků a dalších volně dostupných podkladů.\n\nImplicitní vrstvou jsou satelitní snímky [Bing](http://www.bing.com/maps/), ale jakmile se přesunete do konkrétní geografické oblasti a nastavíte dostatečné zvětÅ¡ení, nabídnou se vám další mapové podklady. V některých státech, jako jsou Spojené státy, Francie či Dánskou, jsou k dispozici snímky ve vysoké kvalitě. Pro velkou část České republiky jsou také dostupné velmi detailní satelitní snímky a navíc data z katastru nemovitostí.\n\nPodklady jsou někdy posunuté vůči mapě, kvůli chybám na straně poskytovatele snímů. Pokud uvidíte, že je mnoho cest v mapě posunuto vůči pozadí, nesnažte se je hned přesunout - posun obvykle znamená chybu v podkladu a ne chybu v mapě. V menu 'Nastavení pozadí' klikněte na 'Zarovnat pozadí' - to vám dovolí posunout podklad, aby lícoval s mapou.\n", "addresses": "# Adresy\n\nJednou z nejužitečnějších součástí mapy jsou adresy.\n\nAdresy jsou sice někdy chápány jako označení kousku ulice, ale v OpenStreetMap jsou uloženy v budovách či objektech podél ulice. V České republice jsou adresy větÅ¡inou samostatným uzlem uvnitř budovy.\n\nMůžete tedy data o adrese vkládat jak k samostatnému bodu, tak k ploÅ¡e označující budovu.\nNejlepším zdrojem informací o adresách je průzkum přímo v terénu či jeho dobrá znalost - stejně jako u celého projektu OpenStreetMap je přebírání dat z komerčních zdrojů typu Google Maps přísně zakázáno.\n", - "inspector": "# Používání Inspektoru\n\nInspektor je prvek uživatelského rozhraní na pravé straně. Inspektor se objeví, když je vybraný nějaký objekt, a umožní vám editovat jeho vlastnosti.\n\n### Výběr typu objektu\n\nJakmile vytvoříte uzel, cestu nebo plochu, můžete zvolit typ objektu. Např. jestli jde o silnici nebo pěšinu, obchod nebo hospodu. Inspektor zobrazí tlačítka pro nejčastější typy objektů; další můžete najít prostřednictvím pole pro vyhledávání.\n\nKdyž u tlačítka typu objektu kliknete na 'i' vpravo dole, zobrazí se vám o něm více informací. Když kliknete na samotné tlačítko, vyberete přísluÅ¡ný typ.\n\n### Formuláře a editace vlastností\n\nPoté, co vyberete typ objektu nebo když vyberete objekt s už přiřazeným typem, v inspektoru se zobrazí pole s bližšími informacemi o objektu - jako třeba název nebo adresa.\n\nPod těmito poli jsou další ikony. Když na ně kliknete, tak můžete přidávat další detaily, jako vazbu na [Wikipedii](http://www.wikipedia.org/), přístup pro vozíčkáře atd.\n\nPokud chcete přidat k objektu jeÅ¡tě nějaké jiné vlastnosti, klikněte na 'Další vlastnosti' úplně dole. Jedním z informačních zdrojů pak může být [Taginfo](http://taginfo.openstreetmap.org/), kde se dozvíte o nejčastějších kombinacích tagů.\n\nZměny provedené v inspektoru jsou ihned vidět na mapě zobrazené ve vaÅ¡em prohlížeči. Můžete je vrátit zpět kliknutím na tlačítko 'Undo'.\n\n### Zavření inspektoru\n\nInspektor můžete zavřít kliknutím na tlačítko vpravo nahoře, nebo stisknutím Escape, nebo kliknutím jinam na mapu.\n", + "inspector": "# Používání Inspektoru\n\nInspektor je prvek uživatelského rozhraní na levé straně, který umožňuje editovat vlastnosti zvoleného objektu.\n\n### Výběr typu objektu\n\nJakmile vytvoříte uzel, cestu nebo plochu, můžete zvolit typ vytvořeného objektu. Např. jestli jde o silnici nebo pěšinu, obchod nebo hospodu. Inspektor zobrazí tlačítka pro nejčastější typy objektů; další můžete najít prostřednictvím pole pro vyhledávání.\n\nKdyž u tlačítka typu objektu kliknete na 'i' vpravo dole, zobrazí se vám o něm více informací. Když kliknete na samotné tlačítko, vyberete přísluÅ¡ný typ.\n\n### Formuláře a editace vlastností\n\nPoté, co vyberete typ objektu nebo když vyberete objekt s už přiřazeným typem, v inspektoru se zobrazí pole s bližšími informacemi o objektu - jako třeba název nebo adresa.\n\nPod těmito poli jsou další ikony. Když na ně kliknete, tak můžete přidávat další detaily, jako vazbu na [Wikipedii](http://www.wikipedia.org/), přístup pro vozíčkáře atd.\n\nPokud chcete přidat k objektu jeÅ¡tě nějaké jiné vlastnosti, klikněte na 'Další vlastnosti' úplně dole. Jedním z informačních zdrojů pak může být [Taginfo](http://taginfo.openstreetmap.org/), kde se dozvíte o nejčastějších kombinacích tagů.\n\nZměny provedené v inspektoru jsou ihned vidět na mapě zobrazené ve vaÅ¡em prohlížeči. Můžete je vrátit zpět kliknutím na tlačítko 'Undo'.\n", "buildings": "# Budovy\n\nOpenStreetMap je největší databází budov na světě. Můžete tuto databázi rozÅ¡iřovat a vylepÅ¡ovat.\n\n### Výběr\n\nBudovu označíte kliknutím na její hranici. Budova se v editoru rozsvítí, otevře se malá nabídka nástrojů a boční panel s informacemi o budově.\n\n### Úpravy\n\nBudovy někdy mohou mít Å¡patnou polohu, tvar nebo nesprávné vlastnosti.\n\nPokud chcete posunout celou budovu, označte ji a kliněte na ikonu posunu - pak můžete pohnout budovou myší. Posun ukončíte kliknutím.\n\nKdyž má budova Å¡patný tvar, klikněte na uzel na hranici budovy a posuňte ho na správné místo.\n\n### Vytváření\n\nMohou být budovy v mapě zaznamenané jako plochy, nebo jako samostatné uzly? Pravidlo je takové, že _pokud je to možné, budovy by se měly mapovat jako plochy_, a firmy, podniky, zařízení a další subjekty působící v budově by se měly mapovat jako uzly uvnitř budovy. V České republice se jako uzly uvnitř budovy obvykle mapují i adresy.\n\nChcete-li nakreslit novou budovu, klikněte na tlačítko 'Plocha' vlevo nahoře a klikáním nakreslete obrys budovy. Kreslení ukončíte buď kliknutím na první nakreslený uzel nebo stisknutím klávesy 'Enter' nebo 'Return'.\n\n### Smazání\n\nBudovy lze také mazat - ale dělejte to pouze v případě, že jste si opravdu jistí, že budova ve skutečnosti neexistuje. Satelitní snímky nejsou dostatečným důkazem, protože mohou být zastaralé nebo zavádějící. Buďte opatrní - když budovu smažete, budova zmizí z mapy pro vÅ¡echny její uživatele.\n\nBudovu smažete tak, že ji označíte kliknutím a potom buď kliknete na ikonu odpadkového koÅ¡e, nebo stisknete klávesu 'Delete'.\n", "relations": "# Relace\n\nRelace je speciálním typem objektu OpenStreetMap, který seskupuje dohromady jiné objekty.\nDvěma nejčastějšími příklady relací jsou *relace trasy*, které obsahují seznam částí cest, po kterých vede nějaká trasa, a *multipolygony*, které obsahují seznam jednoduchých ploch tvořících dohromady složitější plochu (např. plochu z několika částí nebo s dírami uvnitř).\n\nObjekty seznamu v relaci se nazývají *prvky*. V bočním panelu jsou vidět relace, kterých je zvolený objekt prvkem, a relaci pak můžete kliknutím zvolit. Po zvolení relace jsou vÅ¡echny její prvky jednak uvedené v bočním panelu a také označené na mapě.\n\nVe větÅ¡ině případů iD dokáže relace udržovat při editacích automaticky. Měli byste si být vědomi jistých omezení: třeba když smažete kus cesty a potom ji nakreslíte znovu, je třeba zkontrolovat, že nový kus cesty je prvkem stejných relací jako původní kus.\n\n## Editace relací\n\nPři editaci relací se držte následujících principů.\n\nNový prvek do relace přidáte tak, že zvolíte daný objekt, kliknete na tlačítko \"+\" v bočním panelu v sekci \"VÅ¡echny relace\", a zvolíte nebo napíšete jméno relace.\n\nPodobně novou relaci založíte tak, že zvolíte objekt, který by se měl stát prvním prvkem relace, kliknete na tlačítko \"+\" v sekci \"VÅ¡echny relace\" a zvolíte \"Nová relace...\".\n\nPrvek z relace vyjmete tím způsobem, že zvolíte daný objekt a kliknete na tlačítko odpadkového koÅ¡e vedle relace, ze které objekt chcete vyjmout.\n\nMultipolygony s dírami můžete vytvořit pomocí nástroje \"Spojit\". Nakreslete dvě plochy (vnitřní a vnější), stiskněte klávesu Shift a klikněte postupně na obě plochy, čímž je označíte. Multipolygon pak vytvoříte kliknutím na tlačítko \"Spojit\" (+).\n" }, @@ -396,9 +402,6 @@ }, "category-route": { "name": "Trasa" - }, - "category-water": { - "name": "Voda" } }, "fields": { @@ -915,10 +918,6 @@ "name": "TrhoviÅ¡tě", "terms": "tržiÅ¡tě,trh" }, - "amenity/parking": { - "name": "ParkoviÅ¡tě", - "terms": "parkoviÅ¡tě,parkování,parkovací stání" - }, "amenity/pharmacy": { "name": "Lékárna", "terms": "lékárna,apatyka" @@ -1108,8 +1107,8 @@ "terms": "dům" }, "building/hut": { - "name": "Chata", - "terms": "chatka,dřevěnice" + "name": "Chatička", + "terms": "chatička,chatka,chata,bouda,dřevěnice,kůlna,dřevník" }, "building/industrial": { "name": "Průmyslová budova", @@ -1120,7 +1119,8 @@ "terms": "obytná budova,ubytování,bývání,byt" }, "emergency/ambulance_station": { - "name": "Zdravotní pohotovost" + "name": "Stanice záchranné služby", + "terms": "ambulance,pohotovost,zdravotní pohotovost,pohotovostní stanice,záchranná služba,služba" }, "emergency/fire_hydrant": { "name": "Požární hydrant", @@ -1382,6 +1382,10 @@ "name": "Volný čas", "terms": "oddech,volno,volná chvíle,odpočinek,volný čas" }, + "leisure/common": { + "name": "Volně přístupný prostor", + "terms": "volně přístupný prostor,volně přístupné,veřejně přístupné" + }, "leisure/dog_park": { "name": "Psí park", "terms": "park pro psy,psí park" @@ -1478,6 +1482,10 @@ "name": "Maják", "terms": "maják,světlo" }, + "man_made/observation": { + "name": "Rozhledna", + "terms": "rozhledna,pozorovatelna,věž" + }, "man_made/pier": { "name": "Molo", "terms": "molo,sloupy,pilíř,vlnolam,hráz,kotva,kotvení,ukotvení,lodě,promenáda,lávka,promenáda a přístaviÅ¡tě,přístavní hráz" @@ -1595,33 +1603,40 @@ "terms": "kancelář,kancelářský,úřad,úřadovna,administrativa,office,sídlo" }, "place": { - "name": "Místo" + "name": "Místo", + "terms": "obec,místo,lokace,město,vesnice" }, "place/city": { - "name": "Velkoměsto" + "name": "Velkoměsto", + "terms": "velkoměsto,město,city" }, "place/hamlet": { - "name": "Vesnička" + "name": "Vesnička", + "terms": "vesnička,vesnice,obec,lhota" }, "place/island": { "name": "Ostrov", "terms": "ostrov,ostrůvek,souostroví,archipel,atol,útes" }, "place/isolated_dwelling": { - "name": "Samota" + "name": "Samota", + "terms": "samota,vesnička,obec" }, "place/locality": { - "name": "Neobydlené místo" + "name": "Neobydlené místo", + "terms": "neobydlené místo,místo,lokalita" }, "place/town": { - "name": "Město" + "name": "Město", + "terms": "město,městys,městečko,velkoměsto,obec" }, "place/village": { "name": "Vesnice", "terms": "vesnice" }, "point": { - "name": "Uzel" + "name": "Uzel", + "terms": "uzel,bod,vrchol,tečka,puntík" }, "power": { "name": "Energetika", @@ -1632,8 +1647,12 @@ "terms": "generátor, elektrický generátor, elektrárna, zdroj proudu" }, "power/line": { - "name": "Elektrické vedení", - "terms": "elektrické vedení" + "name": "Elektrické vedení vysokého napětí", + "terms": "elektrické vedení,vysoké napětí,přenosová soustava,energetika" + }, + "power/minor_line": { + "name": "Elektrické vedení nízkého napětí", + "terms": "elektrické vedení,nízké napětí,přenosová soustava,elektrický kabel,energetika" }, "power/pole": { "name": "Eletrický sloup", @@ -1648,14 +1667,16 @@ "terms": "sloup vysokého napětí,vysoké napětí" }, "power/transformer": { - "name": "Transformátor" + "name": "Transformátor", + "terms": "transformátor,transformátorová stanice,elektrická stanice,adaptér" }, "railway": { "name": "Železnice", "terms": "železnice, železniční dráha" }, "railway/abandoned": { - "name": "OpuÅ¡těná železnice" + "name": "OpuÅ¡těná železnice", + "terms": "opuÅ¡těná železnice,opuÅ¡těná traÅ¥,nepoužívaná" }, "railway/disused": { "name": "Nepoužívaná železnice", @@ -1670,37 +1691,44 @@ "terms": "přejezd,železniční přejezd,přejezd přes koleje,přejezd přes železnici,přejezd přes vlak,vlakový přejezd" }, "railway/monorail": { - "name": "Jednokolejka" + "name": "Jednokolejka", + "terms": "jednokolejka,monorail,jednokolejná traÅ¥" }, "railway/platform": { "name": "NástupiÅ¡tě", "terms": "železniční nástupiÅ¡tě, nástupiÅ¡tě" }, "railway/rail": { - "name": "Kolej" + "name": "Kolej", + "terms": "koleje,železnice,vlak,traÅ¥" }, "railway/station": { - "name": "Nádraží" + "name": "Nádraží", + "terms": "stanice,železniční stanice,zastávka,železniční zastávka,nádraží,vlak" }, "railway/subway": { "name": "Metro", "terms": "metro" }, "railway/subway_entrance": { - "name": "Vstup do metra" + "name": "Vstup do metra", + "terms": "vstup do metra,vchod do metra,vlez do metra,vestibul,metro" }, "railway/tram": { "name": "Tramvaj", "terms": "tramvaj,tranvaj,Å¡alina,Å¡mirgl,tramvajka,elektrika,električka,tram" }, "relation": { - "name": "Relace" + "name": "Relace", + "terms": "relace,vztah,seznam,objekt" }, "route/ferry": { - "name": "Trasa trajektu" + "name": "Trasa trajektu", + "terms": "trajekt,trasa,linka,loď,trasa trajektu" }, "shop": { - "name": "Obchod" + "name": "Obchod", + "terms": "obchod,prodej,nákup,stánek,market,obchodní,nákupní" }, "shop/alcohol": { "name": "Prodejna alkoholu", @@ -1711,60 +1739,76 @@ "terms": "Pekařství" }, "shop/beauty": { - "name": "Kosmetický salón" + "name": "Kosmetický salón", + "terms": "kosmetický salón,kadeřnictví,vizážista,kosmetika,salón krásy,nehty,kosmetika,depilace" }, "shop/beverages": { - "name": "Prodejna nápojů" + "name": "Prodejna nápojů", + "terms": "prodejna nápojů,obchod s nápoji,nápoje,pití,malinovka,kofola,občerstvení,nealkoholické nápoje" }, "shop/bicycle": { - "name": "Cykloprodejna" + "name": "Cykloprodejna", + "terms": "obchod s koly,kola,horská kola,jízdní kola,cyklistika,cykloprodejna" }, "shop/books": { "name": "Knihkupectví", "terms": "Knihovnictví" }, "shop/boutique": { - "name": "Módní butik" + "name": "Módní butik", + "terms": "oblečení,Å¡aty,oděv,oděvy,butik,móda,módní" }, "shop/butcher": { "name": "Řeznictví", "terms": "Řezník" }, "shop/car": { - "name": "Prodejna aut" + "name": "Prodejna aut", + "terms": "prodejna aut,autosalón,autobazar" }, "shop/car_parts": { - "name": "Náhradní díly pro auta" + "name": "Náhradní díly pro auta", + "terms": "prodejna autodílů,autodíly,automobilový,auto" }, "shop/car_repair": { - "name": "Autoopravna" + "name": "Autoopravna", + "terms": "opravna aut,autoservis,servis,pneuservis,opravna" }, "shop/chemist": { - "name": "Drogérie" + "name": "Drogérie", + "terms": "drogérie,parfumérie,kosmetika,hygiena,čisticí prostředky" }, "shop/clothes": { - "name": "Oblečení" + "name": "Oblečení", + "terms": "oděvy,oděv,Å¡aty,oblečení,obchod s oblečením,móda,módní" }, "shop/computer": { - "name": "Počítače" + "name": "Počítače", + "terms": "obchod s výpočetní technikou,počítače,elektro,elektronika,výpočetní technika" }, "shop/confectionery": { - "name": "Cukrovinky" + "name": "Cukrovinky", + "terms": "cukrárna,cukrovinky,cukrářství,cukrářské zboží,sladkosti,cukroví" }, "shop/convenience": { - "name": "Smíšené zboží" + "name": "Smíšené zboží", + "terms": "smíšené zboží,krám,obchod,potraviny,večerka" }, "shop/deli": { - "name": "Lahůdkářství" + "name": "Lahůdkářství", + "terms": "lahůdky,lahůdkářství,delikatesy,delikatesa,deli" }, "shop/department_store": { - "name": "Obchodní dům" + "name": "Obchodní dům", + "terms": "obchodní dům,nákupní středisko,obchodní středisko,nákupní centrum" }, "shop/doityourself": { - "name": "Obchod pro kutily" + "name": "Obchod pro kutily", + "terms": "obchod pro kutily,stavební materiál,stavebniny,staviva,potřeby pro kutily,zahradní potřeby,železářství,kutil" }, "shop/dry_cleaning": { - "name": "Čistírna" + "name": "Čistírna", + "terms": "čistírna,chemické čiÅ¡tění,čiÅ¡tění oděvů za sucha" }, "shop/electronics": { "name": "Elektro", @@ -1775,74 +1819,104 @@ "terms": "stánek,ovoce,zelenina,trh,tržiÅ¡tě,farmářský trh,farmářské tržiÅ¡tě,farma" }, "shop/fishmonger": { - "name": "Rybárna" + "name": "Rybárna", + "terms": "prodej ryb,prodavač ryb,ryby,obchodník s rybami,obchod s rybami,rybárna,mořské plody,plody moře" }, "shop/florist": { - "name": "Květinářství" + "name": "Květinářství", + "terms": "květinář,květinářství,květy,květiny,kytice" }, "shop/furniture": { - "name": "Nábytek" + "name": "Nábytek", + "terms": "obchod s nábytkem,nábytek,domácnost" }, "shop/garden_centre": { - "name": "Zahradnictví" + "name": "Zahradnictví", + "terms": "zahradnictví,zahradní centrum,zahradnické středisko,zahradnické centrum" }, "shop/gift": { - "name": "Dárky, suvenýry" + "name": "Dárky, suvenýry", + "terms": "obchod s dárky,suvenýry" }, "shop/greengrocer": { - "name": "Ovoce a zelenina" + "name": "Ovoce a zelenina", + "terms": "zelinář,zelinářství,prodejna zeleniny,zelenina,ovoce,ovoce a zelenina" }, "shop/hairdresser": { - "name": "Kadeřnictví" + "name": "Kadeřnictví", + "terms": "kadeřník,holič,vizážista,kadeřnictví" }, "shop/hardware": { "name": "Železářství", "terms": "Železářství" }, "shop/hifi": { - "name": "Hifi elektronika" + "name": "Hifi elektronika", + "terms": "obchod se zvukovými systémy,obchod s ozvučením,ozvučení,hifi" }, "shop/jewelry": { - "name": "Klenotnictví" + "name": "Klenotnictví", + "terms": "zlatnictví,Å¡perky,klenotník,klenoty,klenotnictví,bižutérie,náramky,náuÅ¡nice,prsteny" }, "shop/kiosk": { - "name": "Stánek" + "name": "Stánek", + "terms": "stánek,noviny,kiosek,občerstvení,tabák" }, "shop/laundry": { - "name": "Prádelna" + "name": "Prádelna", + "terms": "prádelna,čistírna,prádlo" + }, + "shop/locksmith": { + "name": "Zámečnictví", + "terms": "zámečnictví,zámečník,klíč,zámek" }, "shop/mall": { - "name": "Obchodní centrum" + "name": "Obchodní centrum", + "terms": "nákupní středisko,obchodní středisko,obchody,nákupní centrum" }, "shop/mobile_phone": { - "name": "Obchod s mobily" + "name": "Obchod s mobily", + "terms": "obchod s mobilními telefony,přenosné telefony,mobil,telefon" }, "shop/motorcycle": { - "name": "Obchod s motocykly" + "name": "Obchod s motocykly", + "terms": "prodejna motocyklů,prodejna motorek,motocykly,motorky" }, "shop/music": { - "name": "Obchod s hudbou" + "name": "Obchod s hudbou", + "terms": "hudební obchod,obchod s hudbou,cd,lp" }, "shop/newsagent": { - "name": "Trafika" + "name": "Trafika", + "terms": "prodavač novin,trafikant,trafika,noviny,časopisy,tabák" }, "shop/optician": { - "name": "Optika" + "name": "Optika", + "terms": "optik,optika,brýle,zrak,kontaktní čočky,čočky" }, "shop/outdoor": { - "name": "Vybavení do přírody" + "name": "Vybavení do přírody", + "terms": "obchod s vybavením pro pobyt v přírodě,stany,spacáky,outdoor" }, "shop/pet": { - "name": "Chovatelské potřeby" + "name": "Chovatelské potřeby", + "terms": "obchod pro domácí zvířata,obchod pro domácí mazlíčky,zverimex" + }, + "shop/photo": { + "name": "Fotografický obchod", + "terms": "fotografie,fotografický obchod,foto,fotoobchod,video,vyvolávání,tisk,film,filmy,fotostudio,studio,fotoaparát,digitální,digitál,střih,ateliér,objektiv" }, "shop/shoes": { - "name": "Obuvnictví" + "name": "Obuvnictví", + "terms": "dům obuvi,boty,obuvnictví,obuvník,Å¡vec" }, "shop/sports": { - "name": "Sportovní potřeby" + "name": "Sportovní potřeby", + "terms": "sport,obchod se sportovními potřebami,sportovní potřeby,vybavení pro sport" }, "shop/stationery": { - "name": "Kancelářské potřeby" + "name": "Kancelářské potřeby", + "terms": "papírnictví,papír,kancelářské potřeby,papírnické zboží,psací potřeby" }, "shop/supermarket": { "name": "Supermarket", @@ -1853,134 +1927,172 @@ "terms": "Hračkářství" }, "shop/travel_agency": { - "name": "Cestovní kancelář" + "name": "Cestovní kancelář", + "terms": "cestovní kancelář,cestovka,cestování,dovolená" }, "shop/tyres": { - "name": "Pneuservis" + "name": "Pneuservis", + "terms": "prodejna pneumatik,pneumatiky,pneuservis" }, "shop/vacant": { - "name": "Neobsazený obchod" + "name": "Neobsazený obchod", + "terms": "prázdný obchod,neobsazený obchod" }, "shop/variety_store": { - "name": "Laciné zboží" + "name": "Laciné zboží", + "terms": "laciné zboží,levné zboží,sleva,slevy,krach,výprodej,za babku,vÅ¡echno pod,smíšené zboží,retail,variety" }, "shop/video": { - "name": "Video obchod" + "name": "Video obchod", + "terms": "videopůjčovna,videokazety,videokazeta,dvd" }, "tourism": { - "name": "Turismus" + "name": "Turismus", + "terms": "turismus,turistika,cestování,cestovní ruch,turistický ruch" }, "tourism/alpine_hut": { - "name": "Horská chata" + "name": "Horská chata", + "terms": "horská chata,alpská chata,chata,noclehárna,horská bouda,bouda,alpská chata" }, "tourism/artwork": { - "name": "Umělecké dílo" + "name": "Umělecké dílo", + "terms": "umělecké dílo,socha,sousoší,plastika,obraz,architektonické dílo,malba,freska,mozaika" }, "tourism/attraction": { - "name": "Pamětihodnost" + "name": "Pamětihodnost", + "terms": "pamětihodnost,turistická atrakce,turistická zajímavost,turistické lákadlo,atrakce,zajímavost,lákadlo" }, "tourism/camp_site": { - "name": "Kemp" + "name": "Kemp", + "terms": "kemp,camp,camping,kamp,kamping,stan,přívěs,karavan,tábořiÅ¡tě,tábor" }, "tourism/caravan_site": { - "name": "Místo pro karavany" + "name": "Místo pro karavany", + "terms": "místo pro karavany,kemp,camp,camping,karavan" }, "tourism/chalet": { - "name": "Horská bouda" + "name": "Chata", + "terms": "chata,chalupa,chatka" }, "tourism/guest_house": { "name": "Penzion", "terms": "B&B,Bed & Breakfast,Bed and Breakfast" }, "tourism/hostel": { - "name": "Hostel" + "name": "Hostel", + "terms": "hostel,noclehárna,ubytovna,ubytování" }, "tourism/hotel": { - "name": "Hotel" + "name": "Hotel", + "terms": "hotel,ubytování" }, "tourism/information": { - "name": "Informace" + "name": "Informace", + "terms": "informace,údaje,údaj,cedule,tabule" }, "tourism/motel": { - "name": "Motel" + "name": "Motel", + "terms": "motel,hotel,penzion,ubytování" }, "tourism/museum": { "name": "Muzeum", "terms": "knihovna,galerie,výstavní,muzeum,repozitář,depozitář,archiv,sklad,lapidárium" }, "tourism/picnic_site": { - "name": "Místo pro piknik" + "name": "Místo pro piknik", + "terms": "piknik,místo pro piknik,tábořiÅ¡tě,ohniÅ¡tě,stůl,lavička,lavice,gril" }, "tourism/theme_park": { - "name": "Zábavní park" + "name": "Zábavní park", + "terms": "zábavní park,pouÅ¥,lunapark,atrakce,kolotoč" }, "tourism/viewpoint": { - "name": "Výhled" + "name": "Výhled", + "terms": "výhled,rozhledna,rozhled" }, "tourism/zoo": { "name": "ZOO", "terms": "zoo" }, "type/boundary": { - "name": "Hranice" + "name": "Hranice", + "terms": "hranice,hraniční,čára" }, "type/boundary/administrative": { - "name": "Administrativní hranice" + "name": "Administrativní hranice", + "terms": "administrativní hranice,správní hranice,hranice správní oblasti,hranice kraje,hranice oblasti,hranice regionu" }, "type/multipolygon": { - "name": "Multipolygon" + "name": "Multipolygon", + "terms": "multipolygon,polygon,mnohoúhelník" }, "type/restriction": { - "name": "Omezení" + "name": "Omezení", + "terms": "omezení,dopravní omezení" }, "type/route": { - "name": "Trasa" + "name": "Trasa", + "terms": "trasa,cesta,linka,stopa,značka,spojení" }, "type/route/bicycle": { - "name": "Cyklotrasa" + "name": "Cyklotrasa", + "terms": "cyklotrasa,cyklistická trasa,cyklistická značka" }, "type/route/bus": { - "name": "Autobusová trasa" + "name": "Autobusová trasa", + "terms": "autobusová trasa,autobusová linka,autobus,bus,autobusové spojení,autobusový spoj" }, "type/route/detour": { - "name": "Trasa objížďky" + "name": "Trasa objížďky", + "terms": "objížďka,trasa objížďky,náhradní trasa" }, "type/route/ferry": { - "name": "Trajektová trasa" + "name": "Trajektová trasa", + "terms": "trajekt,trasa,linka,loď,trasa trajektu" }, "type/route/foot": { - "name": "Pěší trasa" + "name": "Pěší trasa", + "terms": "pěší trasa,trasa pro pěší,turistická značka,turistická trasa,značka pro pěší,klub českých turistů,kčt" }, "type/route/hiking": { "name": "Turistická trasa", - "terms": "turistická trasa,turistická značka" + "terms": "pěší trasa,trasa pro pěší,turistická značka,turistická trasa,značka pro pěší,klub českých turistů,kčt" }, "type/route/pipeline": { - "name": "Potrubní trasa" + "name": "Potrubní trasa", + "terms": "potrubí,potrubní trasa,roura,roury,transport,vodovod,ropovod,produktovod,plynovod,kanál,rozvod" }, "type/route/power": { - "name": "Elektrická trasa" + "name": "Elektrická trasa", + "terms": "trasa elektrického vedení,elektrické vedení,elektrika,napětí,vysoké napětí,drát,dráty,kabel,kabely" }, "type/route/road": { - "name": "Silniční trasa" + "name": "Silniční trasa", + "terms": "silnice,silniční trasa,trasa silnice,trasa dálnice,dálnice" }, "type/route/train": { - "name": "Železniční trasa" + "name": "Železniční trasa", + "terms": "železniční trasa,vlaková trasa,železniční linka,vlaková linka,kolej,koleje,železnice,dráhy,dráha,železniční cesta,železniční cesty,drážní" }, "type/route/tram": { - "name": "Tramvajová trasa" + "name": "Tramvajová trasa", + "terms": "tramvajová trasa,tramvajová linka,kolej,koleje,tramvaj,linka tramvaje" }, "type/route_master": { - "name": "Řídící relace trasy" + "name": "Řídící relace trasy", + "terms": "řídící relace trasy,route master,hlavní relace,nadrelace,master" }, "vertex": { - "name": "Jiné" + "name": "Jiné", + "terms": "další,ostatní,jiné,jiná,jiný,jinak" }, "waterway": { - "name": "Vodní tok" + "name": "Vodní tok", + "terms": "vodní tok,řeka,potok,kanál,tok" }, "waterway/canal": { - "name": "Vodní kanál" + "name": "Vodní kanál", + "terms": "vodní kanál,kanál,přivaděč,náhon,průplav,závlaha" }, "waterway/dam": { "name": "Hráz", @@ -1991,14 +2103,16 @@ "terms": "příkop, strouha, Å¡karpa" }, "waterway/drain": { - "name": "Odvodňovací strouha" + "name": "Odvodňovací strouha", + "terms": "odvodňovací strouha,strouha,odvodňovací kanál,odvaděč" }, "waterway/river": { "name": "Řeka", "terms": "potok,potůček,strouha,říčka,přítok,koryto" }, "waterway/riverbank": { - "name": "Břeh řeky" + "name": "Břeh řeky", + "terms": "břeh řeky,břeh,nábřeží,pobřeží" }, "waterway/stream": { "name": "Potok", diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json index a81949014..64b294594 100644 --- a/vendor/assets/iD/iD/locales/da.json +++ b/vendor/assets/iD/iD/locales/da.json @@ -83,7 +83,8 @@ "annotation": { "line": "Gjorde hjørner pÃ¥ en linje retvinklede.", "area": "Gjorde hjørner pÃ¥ et omrÃ¥de retvinklede." - } + }, + "not_squarish": "Dette kan ikke laves firkantet da det ikke er firkantet." }, "straighten": { "title": "Ret lige", @@ -246,18 +247,21 @@ "back_tooltip": "Ændre objekt", "remove": "Fjern", "search": "Søg", + "multiselect": "Valgte objekter", "unknown": "Ukendt", "incomplete": "", "feature_list": "Søgefunktioner", - "edit": "Ret objekt" + "edit": "Ret objekt", + "none": "Ingen" }, "background": { "title": "Baggrund", "description": "Baggrundsindstillinger", "percent_brightness": "{opacity}% lysstyrke", + "none": "Ingen", "custom": "Brugerdefineret", "custom_prompt": "Angiv en tile skabelon. Valide værdier er {z}, {x}, {y} for Z/X/Y skemaer og {u} for quadtile skema. ", - "fix_misalignment": "Ret fejljustering", + "fix_misalignment": "Ret justering", "reset": "nulstil" }, "restore": { @@ -317,7 +321,9 @@ "cannot_zoom": "Kan ikke zoome længere ud i nuværende tilstand.", "gpx": { "local_layer": "Lokal GPX fil", - "drag_drop": "Træk og slip en .gpx fil pÃ¥ siden" + "drag_drop": "Træk og slip en .gpx fil pÃ¥ siden eller klik pÃ¥ knappen til højre for at browse", + "zoom": "Zoom hen til GPX spor", + "browse": "Browse efter en .gpx fil" }, "help": { "title": "Hjælp", @@ -325,9 +331,9 @@ "editing_saving": "# Redigering & Gem\n\nDette redigeringsværktøj er lavet primært til at arbejde online, og du\narbejder gennem et website lige nu.\n\n### Vælg Objekter\n\nFor at vælge et kortobjekt, som fx en vej eller et interessepunkt, klik\npÃ¥ dette pÃ¥ kortet. Dette vil highlighte det valgte objekt, Ã¥bne et panel med\nyderligere detajler om det og samtidigt vise en menu med forskellige ting du kan gøre\nmed dette objekt.\n\nFlere objekter pÃ¥ en gang kan vælges ved at holde \"Shift\" knappen ned, klik og udvælg\npÃ¥ kortet. Dette vil vælge alle indtegnede objekter indenfor en firkant. Dette tillader\ndig at gøre flere ting med flere objekter pÃ¥ en gang.\n\n### Gem Redigeringer\n\nNÃ¥r du laver ændringer fx tilføjer veje, bygninger og steder, sÃ¥ er disse\ngemt lokalt pÃ¥ din computer lige ind til du har gemt dem pÃ¥ OpenStreetMaps server.\nDu skal ikke bekymre dig om, hvis du laver en fejl - du kan fortryde ændringer ved at klikke pÃ¥ \"Fortryd\" knappen.\n\nKlik pÃ¥ \"Gem\" for at afslutte dine ændringer - fx du har lavet et komplet omrÃ¥de af en by og du ønsker at gÃ¥ i gang med et nyt omrÃ¥de. Du har mulighed for at gennemse hvad du har lavet og redigeringsværktøjet giver nogle hjælpsomme forslag og advarsler, hvis der er noget som ikke ser helt korrekt ud.\n\nHvis alting ser fint nok ud, sÃ¥ kan du skrive en lille kort kommentar om de ændringer du lige har lavet og klik sÃ¥ \"Gem\" igen for at sende ændringerne til [OpenStreetMap.org](http://www.openstreetmap.org/). Dine ændringer vil nu være synlige og tilgængelige for alle. Der igen kan bygge videre og forbedre data.\n\nHvis du ikke kan afslutte dine ændringer lige med det samme, sÃ¥ kan du forlade redigeringsværktøjet og komme igen senere (NB kræver du bruger samme browser og computer igen). Redigeringsværktøjet vil nu gendanne alt dit arbejde igen.\n", "roads": "# Veje\n\nDu kan oprette, tilrette og slette veje med dette tegneværktøj. Veje kan være af mange forskellige typer: stier, landeveje, spor, cykelstier mv. Enhver ofte benyttet rute kan kortlægges.\n\n### Vælg\n\nKlik pÃ¥ en vej for at vælge den. Et omrids dukker op sammen med en lille værktøjsmenu og et sidepanel der viser flere oplysninger om vejen.\n\n### Ændring\n\nOfte ses veje der ikke er justeret i forhold til luftfotoet bag dem eller i forhold til et GPS-spor. Du kan justere disse veje sÃ¥ de er placeret rigtigt.\n\nKlik først pÃ¥ vejen du vil ændre. Dette fremhæver den og viser kontrolpunkter langs med den som kan trækkes det rigtige sted hen. Hvis du har brug for flere kontrolpunkter for at gøre vejen mere detaljeret, kan du dobbeltklikke pÃ¥ en del af vejen, sÃ¥ dukker et punkt op.\n\nHvis vejen er forbundet til andre veje, men ikke er korrekt forbundet pÃ¥ kortet, sÃ¥ træk et af kontrolpunkterne hen pÃ¥ den anden vej for at koble dem sammen. Det er vigtigt for kortet, faktisk vitalt for rutevejledninger, at veje er forbundet.\n\nDu kan ogsÃ¥ klikke pÃ¥ flytteværktøjet eller trykke pÃ¥ tastegenvejen \"M\" for at flytte hele vejen pÃ¥ en gang, og sÃ¥ klikke igen for at gemme flytningen.\n\n### Sletning\n\nHvis en vej er helt forkert - du kan ikke se den pÃ¥ et luftfoto og du har ideelt set fÃ¥et bekræftet at vejen ikke findes lokalt - sÃ¥ kan du slette vejen. Men pas pÃ¥ med at slette hvad andre har lavet - som med andre ændringer er resultatet synligt for alle og luftfoto kan være forældede sÃ¥ vejen kunne være bygget i mellemtiden.\n\nDu kan slette en bygning ved at vælge den og klikke pÃ¥ skraldespands-ikonet - alternativt kan du bruge slet-tasten pÃ¥ dit tastatur.\n\n### Oprettelse\n\nHar du fundet et sted hvor der skulle være en vej, men den er ikke pÃ¥ kortet? Klik pÃ¥ linje-ikonet i øverste venstre del af tegneværktøjet eller klik pÃ¥ tastegenvejen \"2\" for at tegne en linje.\n\nKlik pÃ¥ begyndelsen af vejen for at pÃ¥begynde den. Hvis vejen forgrener sig fra en eksisterende vej, sÃ¥ begynd vejen der hvor de er forbundet.\n\nKlik derefter pÃ¥ punkter pÃ¥ vejens forløb sÃ¥ det passer med luftfoto eller GPS-spor. Hvis vejen du tegner krydser en anden vej, sÃ¥ kobl dem sammen ved at klikke pÃ¥ punktet hvor de skærer hinanden. NÃ¥r du er færdig med at tegne, sÃ¥ dobbeltklik eller tryk pÃ¥ enter-tasten pÃ¥ tastaturet.\n", "gps": "## GPS\n\nGPS data er de mest troværdige data for OpenStreetMap. Dette redigeringsværktøj\nunderstøtter lokalt lagrede - `.gpx` filer pÃ¥ din computer. Du kan indsamle\nGPX spor med mange forskellige smartphone applikationer og med dedikeret\nGPS hardware.\n\nDu kan finde mere information om hvordan du laver en GPS undersøgelse - læs\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nFor at bruge et GPX spor til kortlægning - træk og slip GPX filen indover kortet i \nredigeringsværktøjet. Hvis den bliver genkendt som gyldigt format, sÃ¥ vil den blive tilføjet kortet som en\nlyse grøn linje. Klik pÃ¥ \"Baggrundsindstillinger\" menuen pÃ¥ den højre side for tilkoble\neller frakoble. Eller ogsÃ¥ zoom til det nye GPX understøttet lag.\n\nGPX sporet er ikke direkte oploadet til OpenStreetMap - Den bedste mÃ¥de\nat bruge dette spor at indtegne efter det og bruge det som en rettesnor for de\nnye objekter du tilføjer. Du kan ogsÃ¥ [opload GPX sporet til OpenStreetMap](http://www.openstreetmap.org/trace/create)\nderved kan andre brugere ogsÃ¥ bruge dette.\n", - "imagery": "# Billedlag\n\nLuftfotos er en vigtig resource ved kortlægning. En kombination af \nflyfotos, satellitfoto og frit udarbejdede kilder er tilgængelige i \nværktøjet under \"Baggrundsindstillinger\" menuen i venstre side.\n\nSom standard bruges et [Bing Maps](http://www.bing.com/maps/) satellitlag, men \nzoomer du hen til nye geografiske omrÃ¥der vil andre billedlag være tilgængelige.\nNogle lande som fx USA, Frankrig og Danmark har billedlag i meget høj kvalitet for\nnogle omrÃ¥der.\n\nBilledlag kan nogle gange være forskudte i forhold til kortdata pga fejltagelser fra leverandørens side.\nHvis du ser en masse veje der er forskudt i forhold til billedlaget, skal du\nikke umiddelbart begynde at justere dem alle for at matche dem med billedlaget. I stedet for kan\ndu justere billedlaget, sÃ¥ det matcher de eksisterende date ved at klikke pÃ¥ \"Juster\" nederst i \"Baggrundsindstillinger\".\n", + "imagery": "# Billeder\n\nLuftfotos er en vigtig ressource til kortlægning. En kombination af luftfotos taget fra fly, satellitbilleder og frit tilgængelige andre kilder er tilgængelig i redigeringsværktøjet i 'Baggrundsindstillinger\" menuen i højre side.\n\n[Bing Maps](http://www.bing.com/maps/) satellitbilledelaget er standardopsætning i redigeringsværktøjet. NÃ¥r du zoomer og kommer til nye geografiske omrÃ¥der, sÃ¥ vil andre kilder være tilgængelige. I nogle lande som fx USA, Frankrig og Danmark vil der ofte være luftfotos i høj kvalitet i nogle egne.\n\nBillederne er af og til forskudt i forhold til de geografiske data, dette skyldes en fejl fra billedeleverandørens side. Hvis du ser en masse veje forskudt i forhold til billederne, sÃ¥ skal du ikke begynde at rykke disse objekter for at matche billedlaget. Du kan i stedet for i 'Baggrundsindstillinger\" og nederst \"Ret fejljustering\" flytte billede, sÃ¥ det passer til de geografisk objekter.\n", "addresses": "#Adresser\n\nAdresser er noget af det mest brugbare information pÃ¥ kortet.\n\nAdresser er ofte repræsenteret som dele af gader. I OpenStreetMap\ner de disse registret som attributter pÃ¥ bygninger eller langs med veje.\n\nDu kan tilføje adresseinformation til steder som er kortlagt som bygninger\neller som enkeltpunkter. Den optimale kilde til adressedata stammer fra \nindsamling pÃ¥ selve stedet eller fra personlig kendskab. Som med mange\nandre objekter, sÃ¥ er det strengt forbudt at kopiere fra kommercielle kilder\nsom fx fra Google Maps.\n", - "inspector": "# Inspiceringspanelet\n\nInspiceringspanelet er det element i højre side der dukker op nÃ¥r et objekt er markeret. Det lader dig rette i objektets værdier.\n\n### Valg af type\n\nNÃ¥r du har tilføjet et punkt, eller en linje eller et areal, kan du vælge hvilken type det er, som f.eks. motorvej eller skovvej, supermarked eller café. Panelet har knapper til at vælge almindelige typer, og du kan finde andre ved at indtaste hvad du leder efter i søgefeltet.\n\nKlik pÃ¥ 'i' i nederste højre hjørne pÃ¥ et typeknap for at fÃ¥ flere oplysninger om typen. Klik pÃ¥ knappen for at vælge typen.\n\n### Formularer og rettelse af tags\n\nNÃ¥r du har valgt en type, eller hvis du har valg et objekt der allerede har en type, viser panelet nogle felter med oplysningerne for typen, f.eks. navn og adresse.\n\nUnder felterne er der ikoner til at tilføje andre oplysninger, som [Wikipedia](http://www.wikipedia.org/)-information, adgang for rullestol, med flere.\n\nI bunden af panelet kan du klikke pÃ¥ \"Flere tags\" for at tilføje vilkÃ¥rlige tags til objektet. [Taginfo](http://taginfo.openstreetmap.org/) kan bruges til at lære mere om populære tag-kombinationer.\n\nÆndringer du laver i panelet bliver automatisk anvendt pÃ¥ kortet. Du kan fortryde dem pÃ¥ et vilkÃ¥rligt tidspunkt ved at klikke pÃ¥ knappen \"Fortryd\".\n\n### Luk inspiceringspanelet\n\nDu kan lukke panelet ved at klikke pÃ¥ lukkeknappen i øverste højre hjørne, ved at trykke pÃ¥ \"Esc\"-knappen pÃ¥ tastaturet eller ved at klikke pÃ¥ kortet.\n", + "inspector": "# Brug af inspiceringspanelet\n\nInspiceringspanelet er sektionen i venstre side som tillader dig at\nrette detaljer for et valgt objekt.\n\n### Udvælgelse af et objekt\n\nEfter du har tilføjet et punkt, linje eller omrÃ¥de, sÃ¥ kan du vælge hvilken slags objekt\ndet er, fx om det er en motorvej eller villavej, supermarked eller cafe.\nInspiceringspanelet vil vise nogle knapper for de mest brugte objekttyper og du kan\nfinde andre ved at søge i søgeboksen.\n\nKlik pÃ¥ 'i' nede i højre hjørne ved objekttypeknappen for at fÃ¥ mere \ninformation. Klik pÃ¥ en knap for at vælge den objekttype.\n\n### Formularer og rettelse af tags\n\nNÃ¥r du har valgt en type, eller hvis du har valg et objekt der allerede har en type, viser panelet nogle felter\nmed oplysningerne for typen, f.eks. navn og adresse.\n\nUnder felterne er der ikoner til at tilføje andre oplysninger, som [Wikipedia](http://www.wikipedia.org/)-\ninformation, adgang for rullestol, med flere.\n\nI bunden af panelet kan du klikke pÃ¥ \"Flere tags\" for at tilføje \nvilkÃ¥rlige tags til objektet. [Taginfo](http://taginfo.openstreetmap.org/) kan \nbruges til at lære mere om populære tag-kombinationer.\n\nÆndringer du laver i panelet bliver automatisk anvendt pÃ¥ kortet.\nDu kan fortryde dem pÃ¥ et vilkÃ¥rligt tidspunkt ved at klikke pÃ¥ knappen \"Fortryd\".\n", "buildings": "# Bygninger\n\nOpenStreetMap udgør verdens største database af bygninger. Du kan opretteendnu flere selv og gøre databasen endnu bedre.\n\n### Vælg\n\nDu vælger en bygning ved at klikke pÃ¥ en af dens sider. Dette vil fremhæve bygningen og vil samtidig Ã¥bne en lille værktøjsmenu og et sidepanel der viser flere oplysninger om bygningen.\n\n### Ændring\n\nNogle gange er bygninger placeret forkert eller har forkerte tags.\n\nDu kan flytte en bygning ved vælge den og klikke pÃ¥ flytteværktøjet. Bevæg din mus for at flytte bygningen, og klik sÃ¥ nÃ¥r bygningen er blevet placeret korrekt.\n\nHvis en bygnings form ser forkert ud, sÃ¥ klik og træk i punkterne i omridset af bygningen til den er rigtig.\n\n### Opret\n\nDa OpenStreetMap bÃ¥de kan registre bygninger som et enkelt punkt eller som en polygon, sÃ¥ kan følgende tommelfingerregel gives. Kortlæg sÃ¥ vidt muligt alle bygninger som polygoner og kortlæg sÃ¥ fx butikker, firmaer og andet som opererer fra en bygning som enkeltpunkter.\n\nStart kortlægning af en bygning ved at klikke pÃ¥ \"OmrÃ¥de\"-knappen øverst oppe til venstre. NÃ¥r du er færdig med at indtegne bygningen, sÃ¥ klik pÃ¥ entertasten pÃ¥ dit tastatur eller klik pÃ¥ det første punkt i din indtegnede bygning for at lukke.\n\n### Sletning\n\nHvis en bygning er helt forkert - du kan ikke se den pÃ¥ et luftfoto og du har ideelt set fÃ¥et bekræftet at bygningen ikke findes lokalt - sÃ¥ kan du slette bygningen. Men pas meget pÃ¥ med at slette hvad andre har lavet. Luftfoto kan fx være forældede og der kan være blevet bygget i mellemtiden i omrÃ¥det.\n\nDu kan slette en bygning ved at vælge den og klikke pÃ¥ skraldespands-ikonet - alternativt kan du bruge slet-tasten pÃ¥ dit tastatur.\n", "relations": "# Relationer\n\nEn relation er en speciel type objekt i OpenStreetMap sammenhænge som grupperer andre\nobjekter sammen. For eksempel to af de mest almindelige former for relationer er\n1) *rute relationer* der grupperer vejsegmenter der tilhører en bestemt vej/sti\nsammen. 2) *multipolygoner* som grupperer flere linjer der udgør et komplekst omrÃ¥de\nsammen (en med flere stykker eller huller i som fx i en donut).\n\nGruppen af objekter i en relation kaldes *medlemmer*. I sidemenuen kan du se hvilke\nrelationer et objekt er medlem af. Du kan ogsÃ¥ i sidemenuen klikke pÃ¥ relationen. NÃ¥r\nder er blevet klikket pÃ¥ en relation vil der dukke en liste op med alle dens medlemer og \npÃ¥ kortet vil disse medlemmer være markeret tydeligt ud.\n\nDe fleste gange vil iD hÃ¥ndtere relationer automatisk for dig.\nDu skal her være meget opmærksom pÃ¥ hvis du fx sletter et vejsegment fordi du vil optegne\ndet mere præcist med et nyt vejsegment, at dette nye vejsegment ogsÃ¥ bliver tilføjet\nsom et medlem af den oprindelige relation(er).\n\n\n## Redigering relationer\n\nHer kommer de grundlæggende trin for trin for at redigere relationer\n\nDu tilføjer et objekt til en relation ved at markere objektet ud, dernæst klik \"+\" knappen\nved \"Alle relationer\" sektionen i sidemenuen. Vælg eller skriv navnet pÃ¥ relationen.\n\nEn helt ny relation laves ved at du først udvælger det første objekt som skal være medlem.\nKlik dernæst pÃ¥ \"+\" knappen ved \"Alle relationer\" sektionen og vælg \"Ny relation...\".\n\nDu fjerner et objekt fra en relation ved at udvælge objektet pÃ¥ kortet. Dernæst gÃ¥r du ned til\nrelationen du vil fjerne det fra (i sidemenuen). Klik sÃ¥ pÃ¥ skraldespands ikonet ved relationens navn. \nAdvarsel vær forsigtig med dette.\n\nDu laver en multipolygon med huller ved at benytte \"Fusioner\" værktøjet. Indtegn de to omrÃ¥der\n(indre og ydre omrÃ¥de), hold sÃ¥ Skift knappen ned og klik pÃ¥ hver af dem.\nDernæst klik pÃ¥ \"Fusioner\" (+) knappen.\n" }, @@ -382,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Bygning" + }, "category-landuse": { "name": "Brug af land" }, @@ -397,7 +406,10 @@ "category-route": { "name": "Rute" }, - "category-water": { + "category-water-area": { + "name": "Vand" + }, + "category-water-line": { "name": "Vand" } }, @@ -610,7 +622,7 @@ "label": "Type" }, "maxspeed": { - "label": "Hastighedsbegræsning", + "label": "Hastighedsbegrænsning", "placeholder": "40, 50, 60..." }, "name": { @@ -630,7 +642,7 @@ "label": "Type" }, "oneway": { - "label": "Ensrettet vej" + "label": "Ensrettet" }, "oneway_yes": { "label": "Ensrettet" @@ -696,6 +708,9 @@ "shelter": { "label": "Shelter" }, + "shelter_type": { + "label": "Type" + }, "shop": { "label": "Type" }, @@ -736,6 +751,9 @@ "trail_visibility": { "label": "Spor synlighed" }, + "tree_type": { + "label": "Type" + }, "vending": { "label": "Gods type" }, @@ -768,7 +786,7 @@ "terms": "adresse, adresser" }, "aeroway": { - "name": "Lufthavnsveje", + "name": "Lufthavnsvej", "terms": "Lufthavnsveje" }, "aeroway/aerodrome": { @@ -916,8 +934,8 @@ "terms": "Markedsplads" }, "amenity/parking": { - "name": "Parkering", - "terms": "Parkering, Bilparkering" + "name": "Bilparkering", + "terms": "Bilparkering" }, "amenity/pharmacy": { "name": "Apotek", @@ -971,6 +989,10 @@ "name": "Skole", "terms": "Skole, Folkeskole, Privatskole" }, + "amenity/shelter": { + "name": "Shelter", + "terms": "Shelter, læskur" + }, "amenity/swimming_pool": { "name": "Svømmebassin", "terms": "Svømmebassin, Swimming Pool, Pool" @@ -1135,8 +1157,16 @@ "name": "Indgang", "terms": "Indgang, Indgangsparti" }, + "footway/crossing": { + "name": "Kryds", + "terms": "Kryds" + }, + "footway/sidewalk": { + "name": "Fortov", + "terms": "Fortov" + }, "highway": { - "name": "Veje", + "name": "Vej", "terms": "Veje, Gader" }, "highway/bridleway": { @@ -1383,6 +1413,10 @@ "name": "Fritids", "terms": "Fritid" }, + "leisure/common": { + "name": "Hyppig", + "terms": "Hyppig, Almindelig" + }, "leisure/dog_park": { "name": "Hundepark", "terms": "Hundepark" @@ -1479,6 +1513,10 @@ "name": "Fyr (navigation)", "terms": "Fyr (navigation)" }, + "man_made/observation": { + "name": "ObservationstÃ¥rn", + "terms": "observationstÃ¥rn, udkigstÃ¥rn" + }, "man_made/pier": { "name": "BÃ¥debro", "terms": "BÃ¥debro" @@ -1595,6 +1633,86 @@ "name": "Kontor", "terms": "Kontor" }, + "office/accountant": { + "name": "Revisor", + "terms": "Revisor" + }, + "office/administrative": { + "name": "Administrativt kontor", + "terms": "Administrativt kontor" + }, + "office/architect": { + "name": "Arkitekt", + "terms": "Arkitekt, Arkitektfirma" + }, + "office/company": { + "name": "Firmakontor", + "terms": "Firmakontor, Selskabskonto" + }, + "office/educational_institution": { + "name": "Uddannelsesinstitution", + "terms": "Uddannelsesinstitution" + }, + "office/employment_agency": { + "name": "Arbejdsformidling", + "terms": "Arbejdsformidling, Jobcenter" + }, + "office/estate_agent": { + "name": "Ejendomsmælger", + "terms": "Ejendomsmælger" + }, + "office/financial": { + "name": "Finanskontor", + "terms": "Finanskontor" + }, + "office/government": { + "name": "Statslig kontor", + "terms": "Statslig kontor, Styrelse" + }, + "office/insurance": { + "name": "Forsikringselskab", + "terms": "Forsikringsselskab" + }, + "office/it": { + "name": "IT-kontor", + "terms": "IT-kontor, IT-firma" + }, + "office/lawyer": { + "name": "Advokatkontor", + "terms": "Advokatkontor, Advokatfirma" + }, + "office/newspaper": { + "name": "Avis", + "terms": "Avis" + }, + "office/ngo": { + "name": "NGO kontor", + "terms": "NGO kontor, NGO" + }, + "office/physician": { + "name": "Læge", + "terms": "Læge, Doktor" + }, + "office/political_party": { + "name": "Politisk parti", + "terms": "Politisk parti" + }, + "office/research": { + "name": "Forskning", + "terms": "Forskning" + }, + "office/telecommunication": { + "name": "Teleselskabskontor", + "terms": "Teleselskabskontor" + }, + "office/therapist": { + "name": "Terapeut", + "terms": "Terapeut" + }, + "office/travel_agent": { + "name": "Rejsebureau", + "terms": "Rejseselskab, Rejsebureau" + }, "place": { "name": "Lokalitet", "terms": "Lokalitet, Sted" @@ -1643,6 +1761,10 @@ "name": "Elledning", "terms": "Elledning" }, + "power/minor_line": { + "name": "Elledning", + "terms": "Elledning" + }, "power/pole": { "name": "Elmast (telefonmast)", "terms": "Elmast (telefonmast)" @@ -1855,6 +1977,10 @@ "name": "Vaskeri", "terms": "Vaskeri, Møntvaskeri" }, + "shop/locksmith": { + "name": "LÃ¥sesmed", + "terms": "LÃ¥sesmed" + }, "shop/mall": { "name": "Indkøbscenter", "terms": "Indkøbscenter" @@ -1887,6 +2013,10 @@ "name": "Kæledyrsbutik", "terms": "Kæledyrsbutik, Dyreforhandler" }, + "shop/photo": { + "name": "Fotoforretning", + "terms": "" + }, "shop/shoes": { "name": "Skobutik", "terms": "Skobutik, Skoforretning" diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json index 64d08917f..f3387e9c7 100644 --- a/vendor/assets/iD/iD/locales/de.json +++ b/vendor/assets/iD/iD/locales/de.json @@ -64,7 +64,7 @@ "title": "Abrunden", "description": { "line": "Diese Linie kreisförmig machen.", - "area": "Dieses Gebiet kreisförmig machen." + "area": "Diese Fläche kreisförmig machen." }, "key": "O", "annotation": { @@ -79,11 +79,12 @@ "line": "Die Ecken dieser Linien rechteckig machen.", "area": "Die Ecken dieser Fläche rechteckig machen." }, - "key": "R", + "key": "S", "annotation": { "line": "Die Ecken einer Linie rechtwinklig ausgerichtet.", "area": "Die Ecken einer Fläche rechtwinklig ausgerichtet." - } + }, + "not_squarish": "Dieses Objekt kann nicht rechtwinklig gemacht werden, da es nicht annähernd rechtwinklig ist." }, "straighten": { "title": "Begradigen", @@ -121,10 +122,10 @@ }, "disconnect": { "title": "Trennen", - "description": "Trenne diese Wege voneinander.", + "description": "Trenne diese Wege/Flächen voneinander.", "key": "D", - "annotation": "Wege getrennt.", - "not_connected": "Es gibt nicht hier nicht genug Linien/Gebiete, um diese zu trennen." + "annotation": "Wege/Flächen getrennt.", + "not_connected": "Es gibt nicht hier nicht genug Linien/Flächen, um diese zu trennen." }, "merge": { "title": "Vereinigen", @@ -167,14 +168,14 @@ "title": "Teilen", "description": { "line": "Die Linie an diesem Punkt teilen.", - "area": "Die Gebietsgrenze teilen.", - "multiple": "Die Linie/Gebietsgrenze an diesem Punkt teilen." + "area": "Die Grenze dieser Fläche in zwei Teile teilen.", + "multiple": "Die Linie/Flächengrenze an diesem Punkt teilen." }, "key": "X", "annotation": { "line": "Linie teilen.", - "area": "Gebietsgrenze teilen.", - "multiple": "{n} Linien/Gebietsgrenzen teilen." + "area": "Flächengrenze teilen.", + "multiple": "{n} Linien/Flächengrenzen teilen." }, "not_eligible": "Linien können nicht am Anfang oder Ende geteilt werden.", "multiple_ways": "Es gibt hier zu viele Linien, um diese teilen zu können." @@ -246,18 +247,21 @@ "back_tooltip": "Eigenschaft ändern", "remove": "Entfernen", "search": "Suchen", + "multiselect": "Ausgewählte Elemente", "unknown": "Unbekannt", "incomplete": "", "feature_list": "Objekte suchen", - "edit": "Eigenschaft bearbeiten" + "edit": "Eigenschaft bearbeiten", + "none": "Nichts" }, "background": { "title": "Hintergrund", "description": "Hintergrundeinstellungen", "percent_brightness": "{opacity}% Helligkeit", + "none": "Kein Hintergrund", "custom": "Benutzerdefiniert", "custom_prompt": "Gib eine Kachel-Vorlage ein. Gültige Token sind {z}, {x}, {y} für das Z/X/Y Schema und {u} für das 'quadtile'-Schema.", - "fix_misalignment": "Fehlerhafte Ausrichtung korrigieren", + "fix_misalignment": "Ausrichtung korrigieren", "reset": "Zurücksetzen" }, "restore": { @@ -294,7 +298,7 @@ }, "source_switch": { "live": "live", - "lose_changes": "Es gibt ungespeicherte Änderungen. Durch Wechsel des Karten-Servers gehen diese verloren. Sind Sie sicher, dass Sie den Server wechseln wollen?", + "lose_changes": "Es gibt ungespeicherte Änderungen. Durch Wechsel des Karten-Servers gehen diese verloren. Bist Du sicher, dass Du den Server wechseln willst?", "dev": "dev" }, "tag_reference": { @@ -306,8 +310,8 @@ "untagged_point": "Punkt ohne Eigenschaften", "untagged_line": "Linie ohne Attribute", "untagged_area": "Fläche ohne Attribute", - "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.", - "tag_suggests_area": "Das Attribut {tag} legt nahe, dass die Linie eine Fläche sein sollte, ist aber keine Fläche ist", + "many_deletions": "Du löscht gerade {n} Elemente. Willst Du das wirklich? Damit werden diese Elemente von der Karte gelöscht die alle auf openstreetmap.org sehen können.", + "tag_suggests_area": "Das Attribut {tag} legt nahe, dass die Linie eine Fläche sein sollte, es ist aber keine Fläche", "deprecated_tags": "Veraltete Attribute: {tags}" }, "zoom": { @@ -317,7 +321,9 @@ "cannot_zoom": "Es kann im aktuellen Modus nicht weiter herausgezoomt werden.", "gpx": { "local_layer": "Lokale GPX-Datei", - "drag_drop": "Eine GPX-Datei per Drag & Drop auf die Seite ziehen" + "drag_drop": "Ein GPX-Datei mit Drag & Drop auf die Seite ziehen oder den Button rechts klicken um eine GPX-Datei zu laden", + "zoom": "Zum GPX-Track zoomen", + "browse": "Eine GPX-Datei laden" }, "help": { "title": "Hilfe", @@ -325,11 +331,11 @@ "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n### Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen.\n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast, sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen.\n", "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n", "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren — \".gpx\"-Dateien auf \ndeinem Computer. Du kannst diese GPS-Spuren mit Hilfe diverser\nSmartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir\nfolgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf\nder Karte dargestellt. Klicke auf \"Hintergrundeinstellungen\", um sie zu\n(de-)aktivieren, oder um zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen.\nAm besten verwendest du ihn, um neue Wege hinzuzufügen. Möchtest du den \nGPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n", - "imagery": "# Bildmaterial\n\nLuftbilder sind eine wichtige Quelle für das Kartografieren. Eine Kombination aus Luftbildern von Flugzeugen, Satellitenbilder und freien Quellen sind im Editor über das \"Hintergrundeinstellungen\"- Menü auf der linken Seite verfügbar. \n\nAls Standard ist der [Bing Maps](http://www.bing.com/maps/) Satelliten-Layer ausgewählt. Je nach Gegend werden dir verschiedene andere Quellen angezeigt.\nIn einigen Länder wie den USA, Frankreich, Deutschland und Dänemark stehen zum Teil sehr hochauflösende Luftbilder zur Verfügung.\n\nLuftbilder sind manchmal durch Fehler der Luftbild-Anbieter verschoben. \nWenn du feststellst, dass viele Straßen gegenüber dem Hintergrund verschoben sind, dann verschiebe nicht die Straßen sondern das Luftbild, bis sie übereinstimmen. Um das Luftbild zu korrigieren, klicke auf \"Fehlerhafte Ausrichtung korrigieren\" in den Hintergrundeinstellungen.\n\n", + "imagery": "# Bildmaterial\n\nLuftbilder sind eine wichtige Quelle für das Kartografieren. Eine Kombination aus Luftbildern von Flugzeugen, Satellitenbilder und freien Quellen sind im Editor über das \"Hintergrundeinstellungen\"- Menü auf der linken Seite verfügbar. \n\nAls Standard ist der [Bing Maps](http://www.bing.com/maps/) Satelliten-Layer ausgewählt. Je nach angezeigter Gegend werden Dir verschiedene andere Quellen angezeigt.\nIn einigen Länder wie den USA, Frankreich, Deutschland und Dänemark stehen zum Teil sehr hochauflösende Luftbilder zur Verfügung.\n\nLuftbilder sind manchmal durch Fehler der Luftbild-Anbieter verschoben. \nWenn du feststellst, dass viele Straßen gegenüber dem Hintergrund verschoben sind, dann verschiebe nicht die Straßen sondern das Luftbild, bis sie übereinstimmen. Um das Luftbild zu korrigieren, klicke auf \"Fehlerhafte Ausrichtung korrigieren\" unten in den Hintergrundeinstellungen.\n\n", "addresses": "# Adressen\n\nAdressen sind eine der wichtigsten Informationen einer Karte.\n\nObwohl Adressen oft als Teil einer Straße repräsentiert werden, werden sie in OpenStreetMap als Attribute von Gebäuden oder Objekten neben der Straße eingetragen.\n\nDu kannst Adressinformationen sowohl zu Flächen die als Gebäudegrundriss gezeichnet sind, als auch zu einzelnen Punkten hinzufügen. Adressen musst du über eine Stadtbegehung oder dein eigenes Wissen herausfinden, da die Nutzung kommerzieller Quellen wie Google Maps strikt verboten ist.\n", - "inspector": "# Den Inspektor benutzen\n \nDer Inspektor ist das Bedienelement, das rechts im Editor erscheint, wenn du ein Objekt auswählst. Mit dem Inspektor kannst du die Details des Objektes bearbeiten.\n\n ### Eine Eigenschaft auswählen\n \nNachdem du einen Punkt, eine Linie oder eine Fläche hinzugefügt hast kannst du auswählen, welche Eigenschaft das Objekt hat - ob es eine Autobahn oder eine Wohnstraße; ein Supermarkt oder ein Café ist.\nDer Inspektor wird Knöpfe für die am häufigsten verwendeten Eigenschaften zeigen. Andere Eigenschaften findest du, indem du im Suchfeld eingibst wonach du suchst. \n \nKlicke auf den 'i'-Knopf in der Ecke rechts unten in einem Eigenschaften-Knopf, um mehr darüber zu erfahren. \n\n ### Vorlagen verwenden und Tags editieren\n \nNachdem du ein Objekt mit einer Eigenschaft versehen oder ausgewählt hast, zeigt der Inspektor Felder mit Details zu der Eigenschaft wie Name und Adresse an.\n\nUnter diesen Feldern kannst du Icons anklicken, um weitere Details hinzuzufügen wie zum Beispiel einen [Wikipedia](http://www.wikipedia.org/)-Link, Zugänglichkeit für Rollstühle und anderes.\n\nGanz unten im Inspektor kannst du auf 'Weitere Merkmale' klicken, um das Objekt mit beliebigen anderen Tags zu versehen.\n[Taginfo](http://taginfo.openstreetmap.org/) ist eine gute Quelle, um oft genutzte Kombinationen von Eigenschaften zu finden.\n\nÄnderungen die du im Inspektor vornimmst, werden automatisch auf die ausgewählten Objekte angewendet. Durch Klicken auf den 'Rückgängig'-Knopf kannst du sie rückgängig machen.\n\n ### Den Inspektor schließen\n\nDu kannst den Inspektor schließen, indem du auf den Schließen-Knopf oben rechts klickst, den 'Escape'-Knopf auf der Tastatur drückst oder in die Karte klickst.\n", + "inspector": "# Den Inspektor benutzen\n \nDer Inspektor ist das Bedienelement, das rechts im Editor erscheint, wenn du ein Objekt auswählst. Mit dem Inspektor kannst du die Details des Objektes zu bearbeiten.\n\n ### Eine Eigenschaft auswählen\n \nNachdem du einen Punkt, eine Linie oder eine Fläche hinzugefügt hast kannst du auswählen, welche Eigenschaft das Objekt hat - ob es eine Autobahn oder eine Wohnstraße; ein Supermarkt oder ein Café ist.\nDer Inspektor wird Knöpfe für die am häufigsten verwendeten Eigenschaften zeigen.Andere Eigenschaften findest du, indem du im Suchfeld eingibst wonach du suchst. \n \nKlicke auf den 'i'-Knopf in der Ecke rechts unten in einem Eigenschaften-Knopf, um mehr darüber zu erfahren. \n\n ### Vorlagen verwenden und Tags editieren\n \nNachdem du ein Objekt mit einer Eigenschaft versehen oder ausgewählt hast, zeigt der Inspektor Felder mit Details zu der Eigenschaft an wie Name und Adresse.\n\nUnter diesen Feldern kannst du Icons anklicken, um weitere Details hinzuzufügen wie zum Beispiel einen [Wikipedia](http://www.wikipedia.org/)-Link, Zugänglichkeit für Rollstühle und anderes.\n\nGanz unten im Inspektor kannst du auf 'Weitere Merkmale' klicken, um das Objekt mit beliebigen anderen Tags zu versehen.\n[Taginfo](http://taginfo.openstreetmap.org/) ist eine gute Quelle, um oft genutzte Kombinationen von Eigenschaften zu finden.\n\nÄnderungen die du im Inspektor vornimmst, werden automatisch auf die ausgewählten Objekte angewendet. Durch Klicken auf den 'Rückgängig'-Knopf kannst du sie rückgängig machen.\n\n ### Den Inspektor schließen\n\nDu kannst den Inspektor schließen, indem du auf den Schließen-Knopf oben rechts klickst, den 'Escape'-Knopf auf der Tastatur drückst oder in die Karte klickst.\n", "buildings": "# Gebäude\n\nOpenStreetMap ist die weltgrößte Datenbank für Gebäude und du kannst helfen sie\nweiter zu verbessern.\n\n### Auswahl\n\nDu kannst ein Gebäude auswählen, indem du auf dessen Umrisslinie klickst. Der\nUmriss wird nun hervorgehoben. Außerdem wird ein Werkzeugmenü und eine\nSeitenleiste eingeblendet, welche Informationen zum Gebäude zeigt.\n\n### Bearbeitung\n\nManchmal sind Gebäude falsch platziert oder haben falsche Eigenschaften.\n\nUm ein Gebäude komplett zu verschieben wähle es aus und klicke auf das\n„Bewegen“-Werkzeug. Verschiebe nun das Gebäude mit der Maus und Klicke einmal\nwenn es an der richtigen Stelle ist.\n\nUm den Gebäudeumriss zu korrigieren, klicke und ziehe die Umrissknoten, bis\nsie an der richtigen Stelle sind.\n\n### Erstellen\n\nEine oft gestellte Frage bezieht sich auf das Erstellen von Gebäuden als\nGebäudefläche und/oder als Punkt. Hier gilt, wann immer es möglich ist, sollte\ndas Gebäude als Fläche eingetragen werden. Firmen, Geschäfte und ähnliches\nwerden zusätzlich als Punkte innerhalb des Gebäudeumrisses angelegt.\n\nUm ein Gebäude als Fläche zu zeichnen, klicke auf den „Fläche“-Knopf oben\nlinks und vollende das Gebäude, indem du entweder die \"Enter\"-taste drückst,\noder auf den ersten Knoten klickst.\n\n### Löschen\n\nWenn du siehst und weißt, dass ein Gebäude nicht existiert - zum Beispiel,\nweil du vor Ort warst - kannst du es löschen und es wird von der Karte\nentfernt. Sei vorsichtig mit der Löschfunktion! Das Ergebnis kann, wie\nbei jeder anderen Veränderung, von allen gesehen werden. Außerdem sind\nSatellitenbilder oft veraltet und ein Gebäude könnte einfach neu gebaut sein.\n\nDu kannst ein Gebäude löschen, indem du es auswählst und auf das\nPapierkorbsymbol klickst oder die „Entfernen“-Taste betätigst.\n", - "relations": "# Relationen\n\nEine Relation ist ein besonderes Element in OpenStreetMap, welches andere Elemente\nzusammenfasst. Es gibt zwei gängige Arten von Relationen: *Weg-Relationen* fassen\nAbschnitte eines Weges zu einer Autobahn (oder zu einem anderen Weg) zusammenfassen.\n*Multipolygone* fassen mehrere Gebiete zu einem komplexen Gebiet zusammen, dabei\nkann auch ein Gebiet ein Loch in einem anderen Gebiet (wie in einem Donut) beschreiben.\n\nDie Elemente in einer Relation werden *Mitglieder* genannt. In der Seitenleiste kannst\nDu sehen, in welchen Relationen ein Element enthalten ist. Durch Klick auf eine Relation\nwerden alle Elemente der Relation in der Seitenleisten aufgezeigt und auf der Karte markiert.\n\nNormalerweise kümmert sich iD während der Bearbeitung automatisch um die Pflege der Relationen.\nWenn Du einen Abschnitt eines Weges löscht um ihn genauer neu zu zeichnen, solltest Du sicherstellen,\ndass der neuen Abschnitt Mitglied in den gleichen Relationen wie das Original wird.\n\n## Bearbeiten von Relationen\n\nUm ein Element einer Relation hinzuzufügen, wähle das zukünftige Mitglied aus und\nklicke in der Seitenleiste auf die Schaltfläche \"+\" im Abschnitt \"Alle Relationen\".\nDu kannst dann die Relation auswählen oder den Namen der Relation eintippen.\n\nUm eine neue Relation erstellen, wähle das erste zukünftige Mitglied aus und\nklicke in der Seitenleiste auf die Schaltfläche \"+\" im Abschnitt \"Alle Relationen\"\nund wähle \"Neue Relation ...\".\n\nUm ein Element aus einer Relation zu entfernen, wählen Sie das Mitglied aus und klicke\nauf den Papierkorb neben der Relation aus Du es entfernen willst.\n\nDu kannst Multipolygone mit Löchern mit dem \"Vereinigen\"-Werkzeug erstellen.\nZeichne zwei Bereiche (den äußeren und den inneren Bereich) und klicke auf den äußeren Bereich.\nDann halte die Umschalttaste gedrückt und klicke auf den inneren Bereich und klicke dann auf \"Vereinigen\" (+).\n" + "relations": "# Relationen\n\nEine Relation ist ein besonderes Element in OpenStreetMap, welches andere Elemente\nzusammenfasst. Es gibt zwei gängige Arten von Relationen: *Routen* fassen\nAbschnitte eines Weges zu einer Autobahn (oder zu einem anderen Weg) zusammenfassen.\n*Multipolygone* fassen mehrere Flächen zu einer komplexen Fläche zusammen, dabei\nkann auch eine Fläche ein Loch in einer anderen Fläche (wie der Innenhof in einem Gebäude oder die Lichtung im Wald) beschreiben.\n\nDie Elemente in einer Relation werden *Mitglieder* genannt. In der Seitenleiste kannst\nDu sehen, in welchen Relationen ein Element enthalten ist. Durch Klick auf eine Relation\nwerden alle Elemente der Relation in der Seitenleisten aufgezeigt und auf der Karte markiert.\n\nNormalerweise kümmert sich iD während der Bearbeitung automatisch um die Pflege der Relationen.\nWenn Du einen Abschnitt eines Weges löscht um ihn genauer neu zu zeichnen, solltest Du sicherstellen,\ndass der neuen Abschnitt Mitglied in den gleichen Relationen wie das Original wird.\n\n## Bearbeiten von Relationen\n\nUm ein Element einer Relation hinzuzufügen, wähle das zukünftige Mitglied aus und\nklicke in der Seitenleiste auf die Schaltfläche \"+\" im Abschnitt \"Alle Relationen\".\nDu kannst dann die Relation auswählen oder den Namen der Relation eintippen.\n\nUm eine neue Relation erstellen, wähle das erste zukünftige Mitglied aus und\nklicke in der Seitenleiste auf die Schaltfläche \"+\" im Abschnitt \"Alle Relationen\"\nund wähle \"Neue Relation ...\".\n\nUm ein Element aus einer Relation zu entfernen, wähle das Mitglied aus und klicke\nauf den Papierkorb neben der Relation aus Du es entfernen willst.\n\nDu kannst Multipolygone mit Löchern mit dem \"Vereinigen\"-Werkzeug erstellen.\nZeichne zwei Bereiche (den äußeren und den inneren Bereich) und klicke auf den äußeren Bereich. Dann halte die Umschalttaste gedrückt und klicke auf den inneren Bereich und klicke dann auf \"Vereinigen\" (+).\n" }, "intro": { "navigation": { @@ -382,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Gebäude" + }, "category-landuse": { "name": "Landnutzung" }, @@ -397,13 +406,16 @@ "category-route": { "name": "Route" }, - "category-water": { + "category-water-area": { + "name": "Wasser" + }, + "category-water-line": { "name": "Wasser" } }, "fields": { "access": { - "label": "Zugangsbeschränkungen", + "label": "Zugangsbeschränkung", "placeholder": "Unbekannt", "types": { "access": "Allgemein", @@ -736,6 +748,9 @@ "trail_visibility": { "label": "Erkennbarkeit des Wanderweges" }, + "tree_type": { + "label": "Typ" + }, "vending": { "label": "Dienstleistung" }, @@ -916,8 +931,8 @@ "terms": "Marktplatz" }, "amenity/parking": { - "name": "Parkplatz", - "terms": "Parkmöglichkeit" + "name": "Autoparkplatz", + "terms": "Autoparkplatz, Parkplatz, Parkhaus, Garage, Parkgarage" }, "amenity/pharmacy": { "name": "Apotheke", @@ -1135,6 +1150,14 @@ "name": "Eingang", "terms": "Eingang" }, + "footway/crossing": { + "name": "Fussgängerüberweg", + "terms": "Zebrastreifen" + }, + "footway/sidewalk": { + "name": "Bürgersteig", + "terms": "Gehsteig, Fußgängerweg, Gehweg, Fußweg, Gangsteig, Trottoir" + }, "highway": { "name": "Straße/Weg", "terms": "Autobahn" @@ -1383,6 +1406,10 @@ "name": "Erholung", "terms": "Freizeit" }, + "leisure/common": { + "name": "öffentliche Fläche", + "terms": "öffentliche Grünfläche" + }, "leisure/dog_park": { "name": "Hundepark", "terms": "Hundefreilaufzone,Hundeauslaufzone,Hundezone,Hundeauslaufplatz" @@ -1479,6 +1506,10 @@ "name": "Leuchtturm", "terms": "Leuchtturm" }, + "man_made/observation": { + "name": "Aussichtsturm", + "terms": "Ausguck, Ausblick, Beobachtungsstand" + }, "man_made/pier": { "name": "Steg", "terms": "Anleger, Pier" @@ -1595,6 +1626,86 @@ "name": "Büro", "terms": "Büro, Amt, Behörde, Geschäft" }, + "office/accountant": { + "name": "Steuerberater", + "terms": "Buchhalter, Buchführer, Wirtschaftsprüfer" + }, + "office/administrative": { + "name": "Verwaltungsamt", + "terms": "Verwaltungsstelle, Öffentliche Verwaltung" + }, + "office/architect": { + "name": "Architekt", + "terms": "Architekturbüro, Planungsbüro" + }, + "office/company": { + "name": "Firma", + "terms": "Büro, Gesellschaft" + }, + "office/educational_institution": { + "name": "Schulamt", + "terms": "Schulverwaltung, Universitätsverwaltung, Bildungseinrichtung" + }, + "office/employment_agency": { + "name": "Arbeitsamt", + "terms": "Arbeitsagentur, Arbeitsvermittlung, Arbeitsvermittlungsstelle, Stellenvermittlung, Agentur für Arbeit" + }, + "office/estate_agent": { + "name": "Immobilienmakler", + "terms": "Makler, Immobilienhändler, Liegenschaftsverwalter, Grundstücksmakler" + }, + "office/financial": { + "name": "Finanzberater", + "terms": "Geldberater" + }, + "office/government": { + "name": "Behörde", + "terms": "Amt, Regierungsstelle" + }, + "office/insurance": { + "name": "Versicherung", + "terms": "Versicherungsbüro" + }, + "office/it": { + "name": "IT Büro", + "terms": "Softwareentwickler, Softwarebüro, Programmierer, IT" + }, + "office/lawyer": { + "name": "Anwalt", + "terms": "Jurist, Advokat, Rechtsanwalt, Notar" + }, + "office/newspaper": { + "name": "Redaktion", + "terms": "Zeitung, Zeitschrift" + }, + "office/ngo": { + "name": "Nichtregierungsorganisation", + "terms": "Gemeinnütziger Verein" + }, + "office/physician": { + "name": "Arztpraxis", + "terms": "Praxis" + }, + "office/political_party": { + "name": "Partei", + "terms": "Politische Partei, Parteizentrale" + }, + "office/research": { + "name": "Forschungseinrichtung", + "terms": "Forschungsinstitut, Wissenschaftliches Institut" + }, + "office/telecommunication": { + "name": "Telefongesellschaft", + "terms": "Telekommunikation, Nachrichtentechniker" + }, + "office/therapist": { + "name": "Therapeut", + "terms": "Masseur" + }, + "office/travel_agent": { + "name": "Reisebüro", + "terms": "Reiseagentur" + }, "place": { "name": "Ort", "terms": "Platz, Ort, Stelle, Gegend" @@ -1643,6 +1754,10 @@ "name": "Stromleitung", "terms": "Stromleitung" }, + "power/minor_line": { + "name": "Nieder-/Mittelspannungsleitung", + "terms": "Niederspannungsleitung, Mittelspannungsleitung, Freileitung, Niederspannungsfreileitung, Mittelspannungsfreileitung" + }, "power/pole": { "name": "Strommast", "terms": "Strommast, Stromleitungsmast" @@ -1764,7 +1879,7 @@ "terms": "Autowerkstatt, Kfz-Werkstatt, Autoreparatur" }, "shop/chemist": { - "name": "Apotheke", + "name": "Drogerie", "terms": "Drogerie" }, "shop/clothes": { @@ -1855,6 +1970,10 @@ "name": "Wäscherei", "terms": "Wäscherei" }, + "shop/locksmith": { + "name": "Schlosser", + "terms": "Schlosser, Schlüsseldienst" + }, "shop/mall": { "name": "Einkaufzentrum", "terms": "Einkaufszentrum, Mall" @@ -1887,6 +2006,10 @@ "name": "Tierhandlung", "terms": "Tierhandlung, Zoohandlung" }, + "shop/photo": { + "name": "Fotofachgeschäft", + "terms": "Fotoladen, Fotograf, Fotogeschäft" + }, "shop/shoes": { "name": "Schuhgeschäft", "terms": "Schuhgeschäft" diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json index 58c1df5ac..6a41acf3c 100644 --- a/vendor/assets/iD/iD/locales/el.json +++ b/vendor/assets/iD/iD/locales/el.json @@ -18,6 +18,9 @@ "browse": { "title": "Επισκόπηση", "description": "Μετακίνηση και εστίαση του χάρτη." + }, + "draw_area": { + "tail": "Κάντε κλικ για να προσθέσετε κόμβους στην περιοχή σας. Κλικ στον πρώτο κόμβο για να τελειώσετε την περιοχή. " } }, "operations": { @@ -70,6 +73,12 @@ "area": "Τετραγωνίστηκαν οι γωνίες μιας περιοχής" } }, + "straighten": { + "title": "Ευθυγράμμηση", + "description": "Ευθυγράμμιση αυτής της γραμμής.", + "annotation": "Ευθυγραμμίστηκε μια γραμμή.", + "too_bendy": "Αυτό δεν μπορεί να ευθυγραμμιστεί επειδή λυγίζει αρκετά." + }, "delete": { "title": "Διαγραφή", "description": "Αφαιρέστε αυτό από το χάρτη.", @@ -99,7 +108,9 @@ }, "disconnect": { "title": "Αποσύνδεση", + "description": "Αποσυνδέστε αυτές τις γραμμές/περιοχές μεταξύ τους.", "key": "D", + "annotation": "Αποσύνδεση γραμμών/περιοχών.", "not_connected": "Δεν υπάρχουν αρκετές γραμμές/περιοχές εδώ για αποσύνδεση." }, "merge": { @@ -126,6 +137,7 @@ }, "rotate": { "title": "Περιστροφή", + "description": "Περιστρέψτε αυτό το αντικείμενο γύρω από το κέντρο του. ", "key": "R", "annotation": { "line": "Περιστράφηκε μια γραμμή.", @@ -203,6 +215,7 @@ "no_documentation_key": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτό το κλειδί", "show_more": "Εμφάνιση Περισσότερων", "view_on_osm": "Προβολή στο openstreetmap.org", + "all_tags": "Όλες οι ετικέτες", "all_members": "Όλα τα μέλη", "all_relations": "Όλες οι σχέσεις", "new_relation": "Νέα σχέση", @@ -213,14 +226,17 @@ "back_tooltip": "Αλλαγή χαρακτηριστικού", "remove": "Αφαίρεση", "search": "Αναζήτηση", + "multiselect": "Επιλεγμένα αντικείμενα", "unknown": "Άγνωστο", "feature_list": "Αναζήτηση χαρακτηριστικών", - "edit": "Επεξεργασία χαρακτηριστικού" + "edit": "Επεξεργασία χαρακτηριστικού", + "none": "Κανένα" }, "background": { "title": "Παρασκήνιο", "description": "Ρυθμίσεις παρασκηνίου", "percent_brightness": "{opacity}% φωτεινότητα", + "none": "Κανένα", "custom": "Προσαρμοσμένο", "fix_misalignment": "Διόρθωση ευθυγράμμισης", "reset": "Μηδενισμός" @@ -240,6 +256,7 @@ "unsaved_changes": "Έχετε μη αποθηκευμένες αλλαγές" }, "success": { + "edited_osm": "Επεξεργαστήκατε τον OSM", "just_edited": "Μόλις επεξεργαστήκατε το OpenStreetMap!", "view_on_osm": "Εμφάνιση στο OSM", "facebook": "Διαμοιρασμός στο Facebook", @@ -274,9 +291,11 @@ "in": "Μεγέθυνση", "out": "Σμίκρυνση" }, + "cannot_zoom": "Δεν είναι δυνατή μεγαλύτερη σμίκρυνση στην τρέχουσα κατάσταση λειτουργίας.", "gpx": { "local_layer": "Τοπικό αρχείο GPX", - "drag_drop": "Σύρετε και αφήστε ένα αρχείο .gpx στη σελίδα" + "zoom": "Εστίαση στο ίχνος GPX", + "browse": "Εξερεύνηση για αρχείο .gpx" }, "help": { "title": "Βοήθεια", @@ -318,9 +337,6 @@ }, "category-route": { "name": "Διαδρομή" - }, - "category-water": { - "name": "Νερό" } }, "fields": { @@ -467,6 +483,9 @@ "fire_hydrant/type": { "label": "Τύπος" }, + "fixme": { + "label": "Διορθώστε με" + }, "generator/method": { "label": "Μέθοδος" }, @@ -570,6 +589,9 @@ "railway": { "label": "Είδος" }, + "ref": { + "label": "Αναφορά" + }, "relation": { "label": "Είδος" }, @@ -581,6 +603,7 @@ "buddhist": "Βουδισμός", "jewish": "Ιουδαϊσμός", "hindu": "Ινδουισμός", + "shinto": "Σιντοϊσμός", "taoist": "Ταοϊσμός" } }, @@ -806,10 +829,6 @@ "name": "Αγορά", "terms": "Αγορά" }, - "amenity/parking": { - "name": "Χώρος Στάθμευσης", - "terms": "Χώρος στάθμευσης, Πάρκινγκ" - }, "amenity/pharmacy": { "name": "Φαρμακείο", "terms": "Φαρμακείο" @@ -1098,6 +1117,9 @@ "name": "Σκαλοπάτια", "terms": "Σκαλιά, Σκαλοπάτια" }, + "highway/stop": { + "name": "Σήμα Στοπ" + }, "highway/tertiary": { "name": "Τριτεύων Δρόμος" }, @@ -1212,6 +1234,9 @@ "leisure": { "name": "Αναψυχή" }, + "leisure/common": { + "name": "Κοινό" + }, "leisure/dog_park": { "name": "Πάρκο Σκύλων", "terms": "Πάρκο σκύλων" @@ -1266,6 +1291,9 @@ "name": "Γλύστρα", "terms": "Γλίστρα" }, + "leisure/sports_center": { + "name": "Αθλητικό Κέντρο" + }, "leisure/stadium": { "name": "Στάδιο", "terms": "Στάδιο" @@ -1353,6 +1381,7 @@ "terms": "Τόπος με γρασίδι, Λιβάδι" }, "natural/heath": { + "name": "Θαμνότοπος", "terms": "Λόγγος, Χέρσο, Ακαλιέργητο" }, "natural/peak": { @@ -1630,6 +1659,9 @@ "name": "Καθαριστήριο", "terms": "Πλυντήριο" }, + "shop/locksmith": { + "name": "Κλειδαράς" + }, "shop/mall": { "name": "Εμπορικό Κέντρο", "terms": "Εμπορικό κέντρο" @@ -1830,6 +1862,9 @@ "name": "Χαντάκι", "terms": "Χαντάκι, Τάφρος" }, + "waterway/drain": { + "name": "Οχετός" + }, "waterway/river": { "name": "Ποταμός", "terms": "Ποτάμι" diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json index 095ba0fbd..902f69a2d 100644 --- a/vendor/assets/iD/iD/locales/en-GB.json +++ b/vendor/assets/iD/iD/locales/en-GB.json @@ -1,9 +1,53 @@ { + "modes": { + "add_area": { + "title": "Area", + "description": "Add parks, buildings, lakes or other areas to the map.", + "tail": "Click on the map to start drawing an area, like a park, lake, or building." + }, + "add_line": { + "title": "Line", + "description": "Add roads, streets, footpaths, canals or other lines to the map.", + "tail": "Click on the map to start drawing a road, path, or route." + }, + "add_point": { + "title": "Point", + "description": "Add restaurants, monuments, post boxes or other points to the map.", + "tail": "Click on the map to add a point." + }, + "browse": { + "title": "Browse", + "description": "Pan and zoom the map." + } + }, "operations": { + "add": { + "annotation": { + "point": "Added a point.", + "vertex": "Added a node to a way." + } + }, + "start": { + "annotation": { + "line": "Started a line.", + "area": "Started an area." + } + }, "rotate": { "description": "Rotate this object around its centre point." } }, + "zoom_in_edit": "Zoom in to Edit", + "inspector": { + "none": "None" + }, + "background": { + "fix_misalignment": "Fix alignment" + }, + "gpx": { + "drag_drop": "Drag and drop a .gpx file on the page, or click the button to the right to browse", + "browse": "Browse for a .gpx file" + }, "intro": { "lines": { "add": "Lines are used to represent features such as roads, railways and rivers. **Click the Line button to add a new line.**" @@ -14,6 +58,23 @@ "amenity/fuel": { "name": "Petrol Station", "terms": "gas, fuel, propane, diesel, lng, cng, biodiesel" + }, + "amenity/kindergarten": { + "name": "Nursery", + "terms": "Nursery, Pre-school, preschool, kingergarden" + }, + "amenity/post_box": { + "name": "Post Box", + "terms": "Mailbox" + }, + "amenity/ranger_station": { + "name": "Warden Station" + }, + "tourism/camp_site": { + "terms": "camping" + }, + "tourism/caravan_site": { + "name": "Caravan Park" } } } diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json index 60bdd77b2..5c87e7a7f 100644 --- a/vendor/assets/iD/iD/locales/en.json +++ b/vendor/assets/iD/iD/locales/en.json @@ -247,18 +247,25 @@ "back_tooltip": "Change feature", "remove": "Remove", "search": "Search", + "multiselect": "Selected items", "unknown": "Unknown", "incomplete": "", "feature_list": "Search features", - "edit": "Edit feature" + "edit": "Edit feature", + "check": { + "yes": "Yes", + "no": "No" + }, + "none": "None" }, "background": { "title": "Background", "description": "Background settings", "percent_brightness": "{opacity}% brightness", + "none": "None", "custom": "Custom", "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.", - "fix_misalignment": "Fix misalignment", + "fix_misalignment": "Fix alignment", "reset": "reset" }, "restore": { @@ -318,7 +325,9 @@ "cannot_zoom": "Cannot zoom out further in current mode.", "gpx": { "local_layer": "Local GPX file", - "drag_drop": "Drag and drop a .gpx file on the page" + "drag_drop": "Drag and drop a .gpx file on the page, or click the button to the right to browse", + "zoom": "Zoom to GPX track", + "browse": "Browse for a .gpx file" }, "help": { "title": "Help", @@ -326,9 +335,9 @@ "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n", "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n", "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n", - "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the left.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n", + "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n", "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n", - "inspector": "# Using the Inspector\n\nThe inspector is the user interface element on the right-hand side of the\npage that appears when a feature is selected and allows you to edit its details.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n\n### Closing the Inspector\n\nYou can close the inspector by clicking the close button in the top-right,\npressing the 'Escape' key, or clicking on the map.\n", + "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n", "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n", "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n" }, @@ -383,6 +392,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Building" + }, "category-landuse": { "name": "Land Use" }, @@ -398,7 +410,10 @@ "category-route": { "name": "Route" }, - "category-water": { + "category-water-area": { + "name": "Water" + }, + "category-water-line": { "name": "Water" } }, @@ -699,6 +714,9 @@ "shelter": { "label": "Shelter" }, + "shelter_type": { + "label": "Type" + }, "shop": { "label": "Type" }, @@ -739,6 +757,9 @@ "trail_visibility": { "label": "Trail Visibility" }, + "tree_type": { + "label": "Type" + }, "vending": { "label": "Type of Goods" }, @@ -919,7 +940,7 @@ "terms": "" }, "amenity/parking": { - "name": "Parking", + "name": "Car Parking", "terms": "" }, "amenity/pharmacy": { @@ -964,7 +985,7 @@ }, "amenity/ranger_station": { "name": "Ranger Station", - "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office" + "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center" }, "amenity/restaurant": { "name": "Restaurant", @@ -974,6 +995,10 @@ "name": "School", "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university" }, + "amenity/shelter": { + "name": "Shelter", + "terms": "lean-to" + }, "amenity/swimming_pool": { "name": "Swimming Pool", "terms": "" @@ -1138,6 +1163,14 @@ "name": "Entrance", "terms": "" }, + "footway/crossing": { + "name": "Crossing", + "terms": "crosswalk,zebra crossing" + }, + "footway/sidewalk": { + "name": "Sidewalk", + "terms": "" + }, "highway": { "name": "Highway", "terms": "" @@ -1386,6 +1419,10 @@ "name": "Leisure", "terms": "" }, + "leisure/common": { + "name": "Common", + "terms": "open space" + }, "leisure/dog_park": { "name": "Dog Park", "terms": "" @@ -1482,6 +1519,10 @@ "name": "Lighthouse", "terms": "" }, + "man_made/observation": { + "name": "Observation Tower", + "terms": "lookout tower,fire tower" + }, "man_made/pier": { "name": "Pier", "terms": "" @@ -1598,6 +1639,86 @@ "name": "Office", "terms": "" }, + "office/accountant": { + "name": "Accountant", + "terms": "" + }, + "office/administrative": { + "name": "Administrative Office", + "terms": "" + }, + "office/architect": { + "name": "Architect", + "terms": "" + }, + "office/company": { + "name": "Company Office", + "terms": "" + }, + "office/educational_institution": { + "name": "Educational Institution", + "terms": "" + }, + "office/employment_agency": { + "name": "Employment Agency", + "terms": "" + }, + "office/estate_agent": { + "name": "Real Estate Office", + "terms": "" + }, + "office/financial": { + "name": "Financial Office", + "terms": "" + }, + "office/government": { + "name": "Government Office", + "terms": "" + }, + "office/insurance": { + "name": "Insurance Office", + "terms": "" + }, + "office/it": { + "name": "IT Office", + "terms": "" + }, + "office/lawyer": { + "name": "Law Office", + "terms": "" + }, + "office/newspaper": { + "name": "Newspaper", + "terms": "" + }, + "office/ngo": { + "name": "NGO Office", + "terms": "" + }, + "office/physician": { + "name": "Physician", + "terms": "" + }, + "office/political_party": { + "name": "Political Party", + "terms": "" + }, + "office/research": { + "name": "Research Office", + "terms": "" + }, + "office/telecommunication": { + "name": "Telecom Office", + "terms": "" + }, + "office/therapist": { + "name": "Therapist", + "terms": "" + }, + "office/travel_agent": { + "name": "Travel Agency", + "terms": "" + }, "place": { "name": "Place", "terms": "" @@ -1646,6 +1767,10 @@ "name": "Power Line", "terms": "" }, + "power/minor_line": { + "name": "Minor Power Line", + "terms": "" + }, "power/pole": { "name": "Power Pole", "terms": "" @@ -1696,7 +1821,7 @@ }, "railway/station": { "name": "Railway Station", - "terms": "" + "terms": "train station,station" }, "railway/subway": { "name": "Subway", @@ -1858,6 +1983,10 @@ "name": "Laundry", "terms": "" }, + "shop/locksmith": { + "name": "Locksmith", + "terms": "keys" + }, "shop/mall": { "name": "Mall", "terms": "" @@ -1890,6 +2019,10 @@ "name": "Pet Store", "terms": "" }, + "shop/photo": { + "name": "Photography Store", + "terms": "" + }, "shop/shoes": { "name": "Shoe Store", "terms": "" @@ -1904,7 +2037,7 @@ }, "shop/supermarket": { "name": "Supermarket", - "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop" + "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop" }, "shop/toys": { "name": "Toy Store", @@ -1948,7 +2081,7 @@ }, "tourism/camp_site": { "name": "Camp Site", - "terms": "" + "terms": "camping" }, "tourism/caravan_site": { "name": "RV Park", diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json index 483490d86..06ad61dee 100644 --- a/vendor/assets/iD/iD/locales/es.json +++ b/vendor/assets/iD/iD/locales/es.json @@ -74,15 +74,24 @@ "not_closed": "Esto no se puede redondear porque no es un bucle." }, "orthogonalize": { + "title": "Escuadrar", + "description": { + "line": "Escuadrar las esquinas de esta línea.", + "area": "Escuadrar las esquinas de esta área." + }, + "key": "S", "annotation": { - "line": "Esquinas de la línea escuadrados.", - "area": "Esquinas del área escuadrados." - } + "line": "Escuadra las esquinas de una línea.", + "area": "Escuadra las esquinas de un área." + }, + "not_squarish": "Esto no puede escuadrarse porque no es cuadrado." }, "straighten": { "title": "Enderezado", "description": "Enderezar esta línea", - "key": "S" + "key": "S", + "annotation": "Enderezar una línea.", + "too_bendy": "Esto no puede ser enderezado porque es demasiado sinuoso." }, "delete": { "title": "Eliminar", @@ -238,18 +247,20 @@ "back_tooltip": "Cambiar tipo de elemento", "remove": "Eliminar", "search": "Buscar", + "multiselect": "Elementos seleccionados", "unknown": "Desconocido", "incomplete": "", "feature_list": "Buscar elementos", - "edit": "Editar elemento" + "edit": "Editar elemento", + "none": "Ninguno" }, "background": { "title": "Fondo", "description": "Configuración del fondo", "percent_brightness": "{opacity}% brillo", + "none": "Ninguno", "custom": "Personalizado", "custom_prompt": "Introduzca una plantilla de teselas. Los símbolos válidos son {z}, {x}, {y} para el esquema Z\\/X\\/Y y {u} para el esquema quadtile.", - "fix_misalignment": "Corregir alineación", "reset": "reiniciar" }, "restore": { @@ -309,7 +320,9 @@ "cannot_zoom": "No se puede alejar más la imagen en el modo actual.", "gpx": { "local_layer": "Archivo GPX local", - "drag_drop": "Arrastra y suelte un fichero .gpx a la página" + "drag_drop": "Arrastre un archivo .gpx a la página, o de click en el botón a la derecha para buscar", + "zoom": "Acercar a la traza GPX", + "browse": "Buscar un archivo .gpx" }, "help": { "title": "Ayuda", @@ -317,9 +330,9 @@ "editing_saving": "# Editar & Guardar\n\nEste editor está diseñado para trabajar en línea principalmente, ya que en estos momentos esta accediendo a través de un sitio web.\n\n### Seleccionar elementos gráficos\n\nPara seleccionar un elemento del mapa, como una carretera o un punto de interés, simplemente haz clic sobre él. Esto resaltará el elemento seleccionado, abriendo un panel con sus características, y mostrará un menú de cosas que puedes hacer con ese elemento.\n\nSe pueden seleccionar múltiples elementos de una vez manteniendo pulsada la tecla 'Mayús' y haciendo clic y arrastrando el ratón sobre el mapa. Esto seleccionará todas los elementos que están dentro del recuadro que se dibuja, lo que le permite realizar acciones con todos ellos al mismo tiempo.\n\n### Guardar ediciones\n\nCuando haga cambios -como editar carreteras, edificios o lugares- estos se almacenan localmente en tu ordenador hasta que decidas guardarlos en el servidor. No se preocupe si cometes un error - puede deshacer los cambios haciendo clic en el botón 'Deshacer', y rehacerlos de nuevo haciendo clic en el botón 'Rehacer'.\n\nHaga clic en 'Guardar' para finalizar un grupo de ediciones (por ejemplo, si ha completado una zona de la ciudad y quisiera empezar en una nueva área). Antes de subir los cambios al servidor tendrás oportunidad de revisar lo que has hecho, y el editor proporciona avisos y sugerencias útiles si algo parece que no es correcto en los cambios.\n\nSi ve que todo es correcto escriba un breve comentario explicando el cambio que ha hecho y haga clic en 'Guardar' de nuevo para registrar los cambios en [OpenStreetMap.org](http:\\/\\/www.openstreetmap.org\\/), donde serán visibles para todos los demás usuarios y estarán disponible para que otros colaboradores del proyecto puedan seguir construyendo y mejorando el mapa.\n\nSi aún no ha terminado sus ediciones en una sesión, puede dejar la ventana del editor abierta y volver más tarde (en el mismo navegador y ordenador), y el editor le permitirá retomar tu trabajo.\n", "roads": "# Carreteras\n\nPuede crear, corregir y borrar carreteras con este editor. Las vías pueden ser de todas las clases: caminos, carreteras, senderos, ciclovías, etc. A cualquier línea dibujada en el mapa se le debe indicar el tipo de elemento lineal que es.\n\n### Seleccionar\n\nHaga clic sobre una vía para seleccionarla. Verá sobre ella como se visualiza su esquema, formada por nodos y segmentos, junto con un menú de herramientas que aparece sobre el mapa y una barra lateral que muestra más información sobre la vía.\n\n### Modificar\n\nA menudo verá viales que no están alineados correctamente con la imagen aérea de fondo o con la traza GPS. Puede ajustar esas vías para situarlas en el lugar exacto.\n\nPrimero haga clic sobre la vía que desea cambiar. Esto la resaltará y mostrará los nodos o puntos de control a lo largo de la vía que la forman. A continuación simplemente arrastre esos puntos a la posición correcta. Si desea añadir nuevos puntos de control para dibujar la carretera con mayor detalle haga doble clic sobre la parte de la vía donde quiere añadir el nuevo nodo y este será creado en la vía. \n\nSi la vía conecta con otra carretera o camino pero esta conexión no aparece correctamente en el mapa puede arrastrar uno de los puntos de la vía hasta la otra carretera y se unirá automáticamente a ella mediante un nodo común. Es muy importante tener las carreteras conectadas en el mapa, ya que es esencial para proporcionar instrucciones correctas para la conducción si queremos que la cartografía se útil, por ejemplo, para los navegadores GPS.\n\n### Eliminar\n\nSi un camino es totalmente incorrecto -ha observado que no aparece en las imágenes de satélite y de manera ideal lo ha confirmado en campo- puede eliminarlo, lo cual lo borrará del mapa. Sea precavido al eliminar elementos del mapa. Como cualquier otra edición que haga este cambio será visto por todo el mundo y las imágenes de satélite a menudo no están actualizadas, por lo que una carretera que no existe en ellas pero sí en el mapa simplemente puede aparecer porque es de reciente construcción y otro usuario la ha añadido. \n\n### Crear\n\n¿Ha encontrado un lugar donde debería existir una carretera pero no aparece? Haga clic con el ratón sobre el icono 'Línea' situado en la parte superior izquierda del editor o simplemente presione la tecla '2' de su teclado que es el acceso rápido para comenzar a dibujar una línea. \n\nHaga clic sobre el mapa en el inicio de la carretera para comenzar a dibujar. Si la vía se ramifica a partir de una carretera ya existente empiece haciendo clic sobre el lugar donde ambas conectan.\n\nHaga clic en puntos a lo largo de la vía para definir el trazado correcto de la carretera. La densidad de puntos dependerá de la complejidad del recorrido, por lo que es aconsejable dibujar desde un nivel de zoom apropiado. Si la vía que está dibujando atraviesa otra carretera conéctela con esta haciendo clic sobre el punto de intersección. Una vez haya terminado el dibujo haga doble clic con el ratón o presiones la tecla 'Return' o 'Intro' de su teclado para finalizar.\n", "gps": "# GPS\n\nLos datos procedentes de un GPS son la fuente más fiable para OpenStreetMap. Este editor soporta archivos `.gpx` con trazas guardadas en su equipo local. Este tipo de trazas GPS se pueden obtener con un gran número de aplicaciones para teléfonos inteligentes, así como con receptores GPS normales.\n\nPara más información acerca de como obtener datos en campo mediante GPS lea [Capturando información mediante GPS] (http://learnosm.org/en/beginner/using-gps/).\n\nPara utilizar una traza GPX para cartografiar simplemente arrastre y suelte el archivo GPX sobre el editor de mapas. Si es reconocido, se añadirá al mapa como una línea verde brillante. Haga clic en el menú 'Configuración de fondo' de la izquierda para activar, desactivar o hacer zoom sobre esta nueva capa de con la traza GPX.\n\nTenga en cuenta que la traza GPX no es subida directamente a OpenStreetMap, sino que se utiliza para dibujar sobre ella en el mapa, ayudándole como guía para los nuevos elementos que desea añadir.\n", - "imagery": "# Imágenes\n\nLas imágenes aéreas son un importante recurso para cartografiar. Una combinación de vuelos aéreos, fotografías de satélite y otros tipos de fuentes libres se encuentran disponibles en el editor bajo el icono de la derecha llamado 'Configuración de fondo'.\n\nPor defecto el editor muestra la capa imágenes de satélite de [Bing Maps](http://www.bing.com/maps/) , pero una vez se vaya desplazando por el mapa y haciendo zoom sobre diferentes zonas, nuevas fuentes de imágenes podrán estar disponibles.\n\nLas imágenes aéreas a veces se encuentran desplazadas del mapa debido a errores por parte de los proveedores de los datos que las suministran. Si observa que existen numerosas carreteras que no coinciden con el fondo de imagen no las muevas para ajustarlas. En vez de ello puede ajustar la fotografía aérea para que esta coincida con los datos existentes, haciendo clic en el apartado 'Corregir alineación' del menú 'Configuración de fondo'.\n", - "addresses": "# Addresses\n\n# Direcciones\n\nLas direcciones son parte de la información más útil que se puede añadir al mapa. \n\nAunque las direcciones se representan a menudo como parte de las calles, en OpenStreetMap esta información es guardada como atributos de los edificios y lugares presentes a lo largo de los viales.\n\nPuede agregar información sobre direcciones a lugares dibujados en el mapa como contornos de edificios, así como aquellos localizados únicamente con un punto. La fuente óptima para obtener datos de direcciones es la consulta sobre el terreno o el conocimiento personal. El uso de fuentes comerciales, como Google Maps, para obtener estos datos está estrictamente prohibido.\n", - "inspector": "# Usar el inspector\n\nEl inspector es el elemento del interfaz de usuario situado el lateral izquierdo de la pantalla, el cual aparece cuando un elemento del mapa es seleccionado. Permite editar los detalles de este.\n\n### Seleccionar una tipo de elemento\n\nDespués de agregar una punto, una línea o un área, puede indicar que tipo de elemento representa en el mapa: una carretera, una calle urbana, un supermercado o una cafetería. El inspector mostrará botones con los tipos de elementos más comunes, no obstante se pueden encontrar otros simplemente escribiendo lo que está buscando en la caja de búsqueda.\n\nHaciendo clic con el ratón en el botón 'i' que aparece en la esquina inferior derecha es posible conocer más acerca de ese tipo de elemento. Pulsando sobre el botón le seleccionaremos. \n\n### Utilizar los formularios y editar etiquetas\n\nUna vez elegido el tipo de elemento que representa el dibujo del mapa, o seleccionado un tipo de elemento ya previamente asignado, el inspector mostrará una serie de campos con las características de este, tales como su nombre o dirección. \n\nUna vez visto los campos, puede hacer clic en los iconos para añadir nuevos detalles que lo complemente, como agregar un enlace a su artículo en la [Wikipedia](http://www.wikipedia.org/), si es posible el acceso en silla de ruedas y muchos más.\n\nEn la parte inferior del inspector puede hacer clic sobre 'Etiquetas adicionales' para agregar tantas etiquetas como desee. [Taginfo](http://taginfo.openstreetmap.org/) es un gran recurso para aprender más acerca de la combinación de etiquetas más populares.\n\nLos cambios aplicados en el inspector se aplican automáticamente al mapa. Puede anularlo en cualquier momento haciendo clic sobre el botón 'Deshacer'.\n\n### Cerrar el inspector\n\nPuede cerrar el inspector bien pulsando clic con el ratón sobre el botón cerrar de la esquina superior derecha, bien presionando la tecla 'Escape' del teclado o sencillamente haciendo clic sobre el mapa.\n", + "imagery": "# imágenes\n\nimágenes aéreas es un importante recurso para el trazado de mapas. Una combinación\nde vuelos aéreos, vistas de satélite, y compilaciones grátis están disponibles\nen el editor bajo el menú 'Ajustes de Fondo' a la derecha.\n\nPor defecto [Bing Maps](http://www.bing.com/maps/) capa satelital es\npresentado en el editor, pero mientras se mueve y hace zoom a nuevas áreas\ngeográficas, nuevas fuentes estarán disponibles. Algunos Países, como los Estados\nUnidos, Francia, y Dinamarca poseen imágenes de muy alta calidad disponible\npara algunas áreas.\n\nImágenes aveces están desplazadas de la data del mapa por un error en el\nproveedor de imágenes. Si observa muchos caminos desplazados del fondo,\nno los mueva inmediatamente para emparejarlos. En cambio puede ajustar\nlas imágenes para que ella se empareje con los datos existentes dando click\nen 'Corregir Alineación' en el botón de Ajustes de Fondo.\n", + "addresses": "# Direcciones\n\nLas direcciones son parte de la información más útil que se puede añadir al mapa. \n\nAunque las direcciones se representan a menudo como parte de las calles, en OpenStreetMap esta información es guardada como atributos de los edificios y lugares presentes a lo largo de los viales.\n\nPuede agregar información sobre direcciones a lugares dibujados en el mapa como contornos de edificios, así como aquellos localizados únicamente con un punto. La fuente óptima para obtener datos de direcciones es la consulta sobre el terreno o el conocimiento personal. El uso de fuentes comerciales, como Google Maps, para obtener estos datos está estrictamente prohibido.\n", + "inspector": "# Usar el inspector\n\nEl inspector es la sección situado al lado izquierdo de la pantalla, el cual permite editar los detalles del elemento seleccionado en el mapa.\n\n### Seleccionar una tipo de elemento\n\nDespués de agregar una punto, una línea o un área, puede indicar que tipo de elemento representa en el mapa: una carretera, una calle urbana, un supermercado o una cafetería. El inspector mostrará botones con los tipos de elementos más comunes, no obstante se pueden encontrar otros simplemente escribiendo lo que está buscando en la caja de búsqueda.\n\nHaciendo clic con el ratón en el botón 'i' que aparece en la esquina inferior derecha es posible conocer más acerca de ese tipo de elemento. Pulsando sobre el botón le seleccionaremos. \n\n### Utilizar los formularios y editar etiquetas\n\nUna vez elegido el tipo de elemento que representa el dibujo del mapa, o seleccionado un tipo de elemento ya previamente asignado, el inspector mostrará una serie de campos con las características de este, tales como su nombre o dirección. \n\nUna vez visto los campos, puede hacer clic en los iconos para añadir nuevos detalles que lo complemente, como agregar un enlace a su artículo en la [Wikipedia](http://www.wikipedia.org/), si es posible el acceso en silla de ruedas y muchas más.\n\nEn la parte inferior del inspector puede hacer clic sobre 'Etiquetas adicionales' para agregar tantas etiquetas como desee. [Taginfo](http://taginfo.openstreetmap.org/) es un gran recurso para aprender más acerca de la combinación de etiquetas más populares.\n\nLos cambios aplicados en el inspector se aplican automáticamente al mapa. Puede anularlo en cualquier momento haciendo clic sobre el botón 'Deshacer'.\n", "buildings": "# Edificios\n\nOpenStreetMap es la base de datos cartográfica más grande del mundo sobre edificios. Puede crear y mejorar esta base de datos.\n\n### Seleccionar\n\nPuede seleccionar un edificio haciendo clic con el ratón sobre su borde. Esto resaltará el edificio y abrirá un pequeño menú de herramientas y una barra lateral que mostrará más información sobre la edificación. \n\n### Modificar\n\nAlgunas veces los edificios están situados incorrectamente o poseen etiquetas erróneas.\n\nPara mover un edificio completo selecciónelo y haga clic en la herramienta 'Mover'. Desplace el ratón para trasladar el edificio y haga clic cuando esté correctamente situado. \n\nPara corregir la forma del edificio de manera puntual haga clic con el ratón sobre uno de los nodos que forma el borde del edificio y sin soltar arrástrelo al lugar adecuado.\n\n### Crear\n\nUna de las principales preguntas acerca de cómo añadir edificios al mapa es por qué OpenStreetMap almacena los edificios independientemente bien como polígonos o como puntos. La regla general es \"dibujar un edificio como un polígono siempre que sea posible\" y cartografiar la situación de las empresas, hogares, servicios y otros elementos que alberga el edificio como puntos situados dentro de este. \n\nComience a dibujar un edificio como un polígono haciendo clic en el botón 'Área' situado en la parte superior izquierda del interfaz y finalice bien pulsando la tecla 'Return' o 'Intro' de su teclado o simplemente haciendo clic en el primer nodo dibujado para cerrar el polígono.\n\n### Eliminar\n\nSi un edificio es totalmente incorrecto -puede ver que no existe en la imagen por satélite y de manera ideal lo ha confirmado visitando el lugar- puede borrarlo para que se elimine del mapa. Sea precavido cuando suprima elementos del mapa, como en cualquier otra edición los cambios que realice serán visibles por todo el mundo y a veces las imágenes de satélite pueden estar desactualizadas, por lo que el edifico simplemente es de nueva construcción y ha sido añadido por otro usuario.\n\nPuede eliminar un edificio haciendo clic con el ratón sobre él para seleccionarlo y a continuación pulsar en el icono de la papelera o simplemente pulsando la tecla 'Supr' de su teclado.\n", "relations": "# Relaciones\n\nUna relación es un tipo especial de elemento en OpenStreetMap que permite agrupar diferentes elementos juntos. Por ejemplo, existen dos tipos muy comunes de relaciones en OSM:\n\n- Por un lado están las * relaciones de ruta*, que agrupan a tramos de carreteras que juntos pertenecen a una autopista y poseen una denominación común (ej: Autopista del Cantábrico). \n\n- Por otro lado podemos encontrar los *multipolígonos*, que agrupan a varias áreas que definen superficies complejas (polígonos donuts, parcelas aisladas pero que forman en su conjunto una única propiedad, etc.)\n\nEl grupo de elementos en una relación reciben el nombre de *miembros*. En el panel lateral podrá ver de que relaciones forma parte un elemento, y haciendo clic sobre una de las relaciones lo seleccionará. Así mismo, si selecciona una relación podrá ver una lista con todos los miembros que la componen en el panel lateral y todos ellos se resaltarán en el mapa.\n\nEn su mayor parte, el editor ID se encargará de mantener las relaciones de manera automática a medida que se edita. Lo principal que debe tener en cuenta es que si elimina una sección de carretera para redibujarla de manera más precisa deberá asegurarse de que la nueva sección es un miembro de la misma relación como lo fue la sección original.\n\n## Editando relaciones\n\nSi deseas editar relaciones aquí encontrará los conceptos básicos.\n\nPara añadir un elemento a una relación seleccione aquel, haga clic en el botón \"+\" que encontrará en la sección \"Todas las relaciones\" de panel lateral y seleccione el nombre y tipo de relación.\n\nPara crear una nueva relación seleccione el primer elemento que compondrá la relación, haga clic en el botón \"+\" que encontrará en el apartado \"Todas las relaciones\" del panel lateral y seleccione \"Nueva relación...\".\n \nPara eliminar un elemento de una relación selecciones aquel y haga clic en el botón con el icono de cubo de basura próximo a la relación de la que queremos eliminarlo.\n\nPuede crear multipolígonos con agujeros (donut) usando la herramienta \"Unir\". Dibuje dos áreas (una que delimite el interior del donut y otra el exterior), mantenga pulsada la tecla Mayúsculas y haga clic con el ratón en uno de ellos para seleccionarlos. A continuación pulse el botón \"Unir\" (+).\n\n" }, @@ -374,6 +387,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Edificio" + }, "category-landuse": { "name": "Uso del suelo" }, @@ -389,8 +405,11 @@ "category-route": { "name": "Ruta" }, - "category-water": { + "category-water-area": { "name": "Lámina de agua" + }, + "category-water-line": { + "name": "Curso de agua" } }, "fields": { @@ -462,6 +481,9 @@ "atm": { "label": "Cajero automático" }, + "backrest": { + "label": "Respaldo" + }, "barrier": { "label": "Tipo" }, @@ -725,6 +747,12 @@ "trail_visibility": { "label": "Visibilidad de la senda" }, + "tree_type": { + "label": "Tipo" + }, + "vending": { + "label": "Tipo de producto" + }, "water": { "label": "Tipo" }, @@ -754,7 +782,8 @@ "terms": "dirección, domicilio, señas, residencia" }, "aeroway": { - "name": "Aerovía" + "name": "Aerovía", + "terms": "Zonas de un aeropuerto" }, "aeroway/aerodrome": { "name": "Aéropuerto", @@ -808,7 +837,8 @@ "terms": "bar, pub, tasca, cantina, café, taberna" }, "amenity/bench": { - "name": "Banco" + "name": "Banco", + "terms": "Asiento público, Banco" }, "amenity/bicycle_parking": { "name": "Aparcamiento de bibicletas", @@ -818,6 +848,9 @@ "name": "Alquiler de bicicletas", "terms": "bicicleta, alquilar, bici" }, + "amenity/boat_rental": { + "name": "Alquiler de barcos" + }, "amenity/cafe": { "name": "Cafetería", "terms": "café,cafetería,bar" @@ -827,7 +860,8 @@ "terms": "coche, automóvil, alquiler, vehículo, rent, car" }, "amenity/car_sharing": { - "name": "Vehículo compartido" + "name": "Vehículo compartido", + "terms": "Auto compartido" }, "amenity/car_wash": { "name": "Lavado de coches", @@ -893,10 +927,6 @@ "name": "Mercado", "terms": "mercado, mercadillo" }, - "amenity/parking": { - "name": "Aparcamiento", - "terms": "aparcamiento,estacionamiento, parking, garaje" - }, "amenity/pharmacy": { "name": "Farmacia", "terms": "farmacia,botica, laboratorio, apoteca, herbolario" @@ -906,7 +936,8 @@ "terms": "templo, basílica, capilla, colegiata, parroquia, santuario, ermita, oratorio,iglesia, basílica, catedral, sinagoga, mezquita, pagoda,morabito, rábida,templo,aljama" }, "amenity/place_of_worship/buddhist": { - "name": "Templo budista" + "name": "Templo budista", + "terms": "Templo Budista" }, "amenity/place_of_worship/christian": { "name": "Iglesia", @@ -952,14 +983,16 @@ "terms": "piscina,estanque,pileta" }, "amenity/taxi": { - "name": "Parada de taxis" + "name": "Parada de taxis", + "terms": "Parada de Taxis" }, "amenity/telephone": { "name": "Teléfono", "terms": "teatro,sala, salón, anfiteatro, coliseo, escenario" }, "amenity/theatre": { - "name": "Teatro" + "name": "Teatro", + "terms": "Teatro" }, "amenity/toilets": { "name": "Baños", @@ -973,6 +1006,9 @@ "name": "Universidad", "terms": "universidad,facultad, escuela, seminario, colegio, cátedra, claustro, paraninfo," }, + "amenity/vending_machine": { + "name": "Máquina expendedora" + }, "amenity/waste_basket": { "name": "Papelera", "terms": "papelera, cubo, contenedor, basura, papeles, deshecho" @@ -994,16 +1030,20 @@ "terms": "bolardo, baliza, noray, amarre, horquilla, poste, obstáculo" }, "barrier/cattle_grid": { - "name": "Barrera canadiense" + "name": "Barrera canadiense", + "terms": "Paso con rejas para animales" }, "barrier/city_wall": { - "name": "Muralla de la ciudad" + "name": "Muralla de la ciudad", + "terms": "muralla, muro, pared, murallón, fortificación, fortaleza, cercado, baluarte, contrafuerte" }, "barrier/cycle_barrier": { - "name": "Barrera para bicicletas" + "name": "Barrera para bicicletas", + "terms": "Barrera para bicicletas" }, "barrier/ditch": { - "name": "Zanja" + "name": "Zanja", + "terms": "Zanja" }, "barrier/entrance": { "name": "Entrada", @@ -1018,22 +1058,28 @@ "terms": "portón, abertura, pórtico, portillo, cancela, entrada, salida, paso, puerta" }, "barrier/hedge": { - "name": "Seto" + "name": "Seto", + "terms": "Seto" }, "barrier/kissing_gate": { - "name": "Portilla giratoria" + "name": "Portilla giratoria", + "terms": "Puerta de seguridad para ganado" }, "barrier/lift_gate": { - "name": "Puerta levadiza" + "name": "Puerta levadiza", + "terms": "Barrera elevada" }, "barrier/retaining_wall": { - "name": "Muro de contención" + "name": "Muro de contención", + "terms": "Muro de contención" }, "barrier/stile": { - "name": "Escalones" + "name": "Escalones", + "terms": "Peldaños en una valla" }, "barrier/toll_booth": { - "name": "Peaje" + "name": "Peaje", + "terms": "Cabina de peaje" }, "barrier/wall": { "name": "Pared", @@ -1087,18 +1133,27 @@ "terms": "boca de incendio,hidrante de incendio" }, "emergency/phone": { - "name": "Teléfono de emergencias" + "name": "Teléfono de emergencias", + "terms": "Teléfono de emergencia" }, "entrance": { "name": "Entrada", "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla" }, + "footway/crossing": { + "name": "Cruce peatonal" + }, + "footway/sidewalk": { + "name": "Acera", + "terms": "acera, paso, bordillo, anden, borde, peatonal, peatón" + }, "highway": { "name": "Vía", "terms": "calle, cañada, ronda, carril, pista, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, senda" }, "highway/bridleway": { - "name": "Camino de herradura" + "name": "Camino de herradura", + "terms": "Camino de herradura" }, "highway/bus_stop": { "name": "Parada de autobús", @@ -1109,10 +1164,12 @@ "terms": "cruce peatonal, paso peatonal, paso de cebra, paso de peatones, paso semafórico" }, "highway/cycleway": { - "name": "Senda ciclable" + "name": "Senda ciclable", + "terms": "Camino para bicicletas" }, "highway/footway": { - "name": "Senda peatonal" + "name": "Senda peatonal", + "terms": "Camino peatonal" }, "highway/living_street": { "name": "Calle residencial", @@ -1139,7 +1196,8 @@ "terms": "vereda, sendero, camino, vía, calzada, ramal, trocha, atajo, travesía, huella, rastro" }, "highway/pedestrian": { - "name": "Vía peatonal" + "name": "Vía peatonal", + "terms": "Peatonal" }, "highway/primary": { "name": "Carretera primaria", @@ -1174,13 +1232,16 @@ "terms": "calle, callejón, calleja, callejuela, callizo, pasadizo, travesía" }, "highway/service/drive-through": { - "name": "Ventanilla de autoservicio" + "name": "Ventanilla de autoservicio", + "terms": "Parada sin bajar del vehiculo" }, "highway/service/driveway": { - "name": "Vía privada de acceso" + "name": "Vía privada de acceso", + "terms": "calle, carril, pista, trayecto, avenida, carretera, vía de servicio, vía" }, "highway/service/emergency_access": { - "name": "Acceso de emergencia" + "name": "Acceso de emergencia", + "terms": "Acceso de emergencia" }, "highway/service/parking_aisle": { "name": "Pasillo de aparcamiento", @@ -1190,6 +1251,9 @@ "name": "Escaleras", "terms": "escalera, escalinata, grada, gradería, escala, escalerilla, peldaños, escalones" }, + "highway/stop": { + "name": "Señal de Stop" + }, "highway/tertiary": { "name": "Carretera local", "terms": "calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria" @@ -1199,34 +1263,40 @@ "terms": "enlace, unión, cruce, calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria" }, "highway/track": { - "name": "Pista" + "name": "Pista", + "terms": "Vía" }, "highway/traffic_signals": { "name": "Semáforos", "terms": "señal, tráfico, semáforo" }, "highway/trunk": { - "name": "Carretera principal" + "name": "Carretera principal", + "terms": "Carretera principal" }, "highway/trunk_link": { - "name": "Enlace a carretera principal" + "name": "Enlace a carretera principal", + "terms": "Enlace principal" }, "highway/turning_circle": { "name": "Círculo de giro", "terms": "círculo, giro, retorno, cul de sac" }, "highway/unclassified": { - "name": "Carretera sin clasificación" + "name": "Carretera sin clasificación", + "terms": "Carretera sin clasificación" }, "historic": { - "name": "Lugar histórico" + "name": "Lugar histórico", + "terms": "Lugar histórico" }, "historic/archaeological_site": { "name": "Sitio arqueológico", "terms": "arqueológico, sitio, lugar, histórico, excavación" }, "historic/boundary_stone": { - "name": "Mojón" + "name": "Mojón", + "terms": "Mojón" }, "historic/castle": { "name": "Castillo", @@ -1261,36 +1331,44 @@ "terms": "parcela,solar, terreno, superficie, tierra, propiedad, zona, fracción, parte, trozo" }, "landuse/basin": { - "name": "Cuenca " + "name": "Cuenca ", + "terms": "Cuenca" }, "landuse/cemetery": { "name": "Cementerio", "terms": "cementerio, camposanto, necrópolis, sacramental" }, "landuse/commercial": { - "name": "de negocios" + "name": "de negocios", + "terms": "Comercial" }, "landuse/construction": { - "name": "Construcción" + "name": "Construcción", + "terms": "Construcción" }, "landuse/farm": { - "name": "Granja" + "name": "Granja", + "terms": "Granja" }, "landuse/farmyard": { - "name": "Tierras de cultivo" + "name": "Tierras de cultivo", + "terms": "Edificios de la granja" }, "landuse/forest": { - "name": "Bosque" + "name": "Bosque", + "terms": "Bosque" }, "landuse/grass": { "name": "Hierba", "terms": "herbazal, pradera, pradería, prado, pasto, majada, monte, dehesa" }, "landuse/industrial": { - "name": "Industrial" + "name": "Industrial", + "terms": "Industrial" }, "landuse/meadow": { - "name": "Prado" + "name": "Prado", + "terms": "prado, pradera, campo, mies, braniza, braña" }, "landuse/orchard": { "name": "Huerta", @@ -1305,7 +1383,8 @@ "terms": "zona, residencial, urbano" }, "landuse/retail": { - "name": "Zona comercial" + "name": "Zona comercial", + "terms": "negocio, venta, comercio, tienda, despacho, colmado, al por menor" }, "landuse/vineyard": { "name": "Viñedo", @@ -1315,6 +1394,9 @@ "name": "Ocio", "terms": "zona, diversión, entretenimiento, pasatiempo, distracción, recreo, ocio, esparcimiento" }, + "leisure/common": { + "name": "Común" + }, "leisure/dog_park": { "name": "Parque canino", "terms": "perro,can,parque" @@ -1324,7 +1406,8 @@ "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín" }, "leisure/golf_course": { - "name": "Campo de golf" + "name": "Campo de golf", + "terms": "Campo de golf" }, "leisure/marina": { "name": "Marina", @@ -1335,32 +1418,43 @@ "terms": "parque, jardín" }, "leisure/pitch": { - "name": "Cancha de deporte" + "name": "Cancha de deporte", + "terms": "cancha, frontón, campo, pista, polideportivo, terreno de juego, juego, deporte" }, "leisure/pitch/american_football": { "name": "Campo de fútbol americano", "terms": "Cancha de fútbol americano" }, "leisure/pitch/baseball": { - "name": "Diamante de Béisbol" + "name": "Diamante de Béisbol", + "terms": "Campo de Beisbol" }, "leisure/pitch/basketball": { - "name": "Cancha de Baloncesto" + "name": "Cancha de Baloncesto", + "terms": "Cancha de Baloncesto" + }, + "leisure/pitch/skateboard": { + "name": "Parque de patinaje" }, "leisure/pitch/soccer": { - "name": "Campo de fútbol" + "name": "Campo de fútbol", + "terms": "terreno, campo, pista, fútbol, juego, balompie" }, "leisure/pitch/tennis": { - "name": "Cancha de tenis" + "name": "Cancha de tenis", + "terms": "Pista de Tenis" }, "leisure/pitch/volleyball": { - "name": "Cancha de voleibol" + "name": "Cancha de voleibol", + "terms": "Pista de Voleibol" }, "leisure/playground": { - "name": "Parque infantil" + "name": "Parque infantil", + "terms": "parque infantil, columpios, zona de juegos, juegos, niños" }, "leisure/slipway": { - "name": "Grada" + "name": "Grada", + "terms": "Grada" }, "leisure/sports_center": { "name": "Centro deportivo", @@ -1371,57 +1465,75 @@ "terms": "estadio,cancha" }, "leisure/swimming_pool": { - "name": "Piscina" + "name": "Piscina", + "terms": "piscina, natación, parque acuático" }, "leisure/track": { "name": "Pista de carreras", "terms": "circuito, pista" }, "line": { - "name": "Línea" + "name": "Línea", + "terms": "Línea" }, "man_made": { - "name": "Hecho por el hombre" + "name": "Hecho por el hombre", + "terms": "manufactura, industrial, fabricado, manufacturado, fábrica, industria, hecho por el hombre" }, "man_made/breakwater": { - "name": "Rompeolas" + "name": "Rompeolas", + "terms": "rompeolas, escollera, dique, malecón, espigón, andén, muelle, desembarcadero" }, "man_made/cutline": { - "name": "Cortafuegos" + "name": "Cortafuegos", + "terms": "Corte de línea" }, "man_made/lighthouse": { "name": "Faro", "terms": "faro" }, + "man_made/observation": { + "name": "Torre de Observación" + }, "man_made/pier": { - "name": "Embarcadero" + "name": "Embarcadero", + "terms": "Pilote, Embarcadero" }, "man_made/pipeline": { - "name": "Tubería" + "name": "Tubería", + "terms": "tubería, cañería, caño, conducto, red" }, "man_made/survey_point": { - "name": "Vértice geodésico" + "name": "Vértice geodésico", + "terms": "Vértice geodésico" }, "man_made/tower": { - "name": "Torre" + "name": "Torre", + "terms": "torre, mástil, torreta" }, "man_made/wastewater_plant": { - "name": "Planta depuradora de aguas" + "name": "Planta depuradora de aguas", + "terms": "depuradora, aguas residuales, agua, EDAR, PTAR, tratamiento, plan de depuración, planta depuradora, saneamiento" }, "man_made/water_tower": { - "name": "Torre de agua" + "name": "Torre de agua", + "terms": "Depósito de agua elevado" }, "man_made/water_well": { - "name": "Pozo de agua" + "name": "Pozo de agua", + "terms": "Pozo de agua" }, "man_made/water_works": { - "name": "Trabajos hídricos" + "name": "Trabajos hídricos", + "terms": "Depósito de agua" }, "natural": { - "name": "Natural" + "name": "Natural", + "terms": "natural, naturaleza" }, "natural/bay": { - "name": "Bahía" + "name": "Bahía", + "terms": "bahía, cala, ensenada, golfo, refugio, abrigo, rada, abra" }, "natural/beach": { "name": "Playa", @@ -1432,27 +1544,38 @@ "terms": "acantilado, despeñadero, risco, precipicio, escarpadura" }, "natural/coastline": { - "name": "Línea de costa" + "name": "Línea de costa", + "terms": "costa, litoral, playa, orilla, acantilado, margen" + }, + "natural/fell": { + "name": "Meseta" }, "natural/glacier": { - "name": "Glaciar" + "name": "Glaciar", + "terms": "glaciar, nevero, helero, ventisquero" }, "natural/grassland": { "name": "Pradera", "terms": "prado, pradera, pastizal, pasto" }, "natural/heath": { - "name": "Landa" + "name": "Landa", + "terms": "brezal, landa, jaral, matorral, llanura, páramo, meseta, arenal, estepa, planicie, descampado, escajo, tojo" }, "natural/peak": { "name": "Pico", "terms": "pico, montaña, cresta, cima, cúspide, cumbre, picacho, aguja" }, + "natural/scree": { + "name": "Acumulación de piedras y rocas" + }, "natural/scrub": { - "name": "Matorral" + "name": "Matorral", + "terms": "monte bajo, maleza, matorral, mata, monte" }, "natural/spring": { - "name": "Fuente o manantial" + "name": "Fuente o manantial", + "terms": "Manantial" }, "natural/tree": { "name": "Árbol", @@ -1467,23 +1590,76 @@ "terms": "agua, lago, laguna, ibón, estanque, embalse, pantano, balsa" }, "natural/water/pond": { - "name": "Balsa de agua" + "name": "Balsa de agua", + "terms": "Estanque" }, "natural/water/reservoir": { "name": "Embalse", "terms": "agua, lago, ibón, estanque, embalse, pantano, balsa, laguna, dique, presa, represa, reservorio" }, "natural/wetland": { - "name": "Pantano" + "name": "Pantano", + "terms": "Humedal" }, "natural/wood": { - "name": "Bosque natural" + "name": "Bosque natural", + "terms": "bosque, bosque natural, madera, foresta, arbolado, monte, árbol, boscaje, frondosidad" }, "office": { - "name": "Oficina" + "name": "Oficina", + "terms": "Puesto, Oficina" + }, + "office/accountant": { + "name": "Contable", + "terms": "contable, contador, tesorero, interventor, cajero, administrador, contabilidad, gestor" + }, + "office/administrative": { + "name": "Oficina administrativa", + "terms": "administrativo, gestoría, asesoría" + }, + "office/architect": { + "name": "Arquitecto", + "terms": "constructor, proyectista, edificador, aparejador, urbanista" + }, + "office/company": { + "name": "Oficina de empresa" + }, + "office/employment_agency": { + "name": "Agencia de colocación", + "terms": "agencia, empleo, desempleo, colocación, trabajo, ocupación, paro, desocupación, INEM" + }, + "office/estate_agent": { + "name": "Inmobiliaria", + "terms": "agencia, bienes raíces, inmobiliaria, alquiler, inmueble, venta" + }, + "office/government": { + "name": "Oficina de gobierno" + }, + "office/insurance": { + "name": "Aseguradora", + "terms": "oficina, aseguradora, seguro" + }, + "office/lawyer": { + "name": "Despacho de abogados", + "terms": "despacho, bufete, abogado, procurador, letrado, jurisconsulto, jurisperito, jurista, legista" + }, + "office/newspaper": { + "name": "Periódico" + }, + "office/ngo": { + "name": "ONG", + "terms": "oficina, ONG, organización no gubernamental, " + }, + "office/political_party": { + "name": "Partido político" + }, + "office/travel_agent": { + "name": "Agencia de viajes", + "terms": "agencia, viaje, vacaciones, turismo, excursión" }, "place": { - "name": "Lugar" + "name": "Lugar", + "terms": "sitio, emplazamiento, parte, punto, lado, espacio, zona, área, paraje, lugar" }, "place/city": { "name": "Ciudad", @@ -1494,27 +1670,32 @@ "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, pueblecito" }, "place/island": { - "name": "Isla" + "name": "Isla", + "terms": "Isla" }, "place/isolated_dwelling": { - "name": "Vivienda aislada" + "name": "Vivienda aislada", + "terms": "Viviendas aisladas" }, "place/locality": { "name": "Paraje", "terms": "paraje, lugar, sitio, rincón" }, "place/town": { - "name": "Ciudad" + "name": "Ciudad", + "terms": "ciudad, pueblo, población, localidad, villa, núcleo urbano, urbano" }, "place/village": { "name": "Pueblo", "terms": "localidad, población, aldea, pueblo, villa, ciudad, lugar, sitio, parroquia" }, "point": { - "name": "Punto" + "name": "Punto", + "terms": "Punto" }, "power": { - "name": "Línea eléctrica de baja o media tensión" + "name": "Línea eléctrica de baja o media tensión", + "terms": "Energía" }, "power/generator": { "name": "Generador de energía", @@ -1524,59 +1705,76 @@ "name": "Línea de alta tensión", "terms": "energía, potencia, electricidad, subestación, tendido, eléctrico, línea, eléctrica, torre" }, + "power/minor_line": { + "name": "Línea eléctrica de media tensión" + }, "power/pole": { "name": "Poste eléctrico", "terms": "torre, torreta, alta, tensión, poste, electricidad" }, "power/sub_station": { - "name": "Subestación" + "name": "Subestación", + "terms": "Subestación" }, "power/tower": { - "name": "Torre de alta tensión" + "name": "Torre de alta tensión", + "terms": "Torre de alto voltaje" }, "power/transformer": { - "name": "Transformador" + "name": "Transformador", + "terms": "Transformador" }, "railway": { "name": "Ferrocarril", "terms": "ferrocarril, tren, convoy, suburbano, línea férrea, metro" }, "railway/abandoned": { - "name": "Ferrocarril abandonado" + "name": "Ferrocarril abandonado", + "terms": "Ferrocarril abandonado" }, "railway/disused": { - "name": "Ferrocarril en desuso" + "name": "Ferrocarril en desuso", + "terms": "Ferrocarril en deshuso" }, "railway/halt": { "name": "Apeadero", "terms": "apeadero,estación,ferrocarril,tren,andén" }, "railway/level_crossing": { - "name": "Cruce a nivel" + "name": "Cruce a nivel", + "terms": "Paso a nivel" }, "railway/monorail": { - "name": "Monorraíl " + "name": "Monorraíl ", + "terms": "Monorail" }, "railway/platform": { - "name": "Andén" + "name": "Andén", + "terms": "Andén de ferrocarril" }, "railway/rail": { - "name": "Raíl" + "name": "Raíl", + "terms": "Rail" }, "railway/station": { - "name": "Estación de ferrocarril" + "name": "Estación de ferrocarril", + "terms": "Estación de Ferrocarril" }, "railway/subway": { - "name": "Metro" + "name": "Metro", + "terms": "Metro" }, "railway/subway_entrance": { - "name": "Entrada de metro" + "name": "Entrada de metro", + "terms": "Entrada de metro" }, "railway/tram": { - "name": "Tranvía" + "name": "Tranvía", + "terms": "Tranvía" }, "relation": { - "name": "Relación" + "name": "Relación", + "terms": "Relación, Vínculo, Asociación" }, "route/ferry": { "name": "Ruta de Ferry" @@ -1588,8 +1786,8 @@ "name": "Licorería" }, "shop/bakery": { - "name": "Panadería", - "terms": "panadería, horno, tahona, tienda, pastelería" + "name": "Panadería o pastelería", + "terms": "panadería, horno, tahona, tienda, pastelería, confitería, pastel, pan, bollería, bollo" }, "shop/beauty": { "name": "Salón de belleza" @@ -1616,22 +1814,28 @@ "name": "Tienda de componente de vehículos" }, "shop/car_repair": { - "name": "Taller de reparación de vehículos" + "name": "Taller de reparación de vehículos", + "terms": "reparación, automóvil, vehículo, carro, coche, taller" }, "shop/chemist": { - "name": "Farmacia" + "name": "Farmacia", + "terms": "farmacéutico, botica, farmacia, boticario, apoteca" }, "shop/clothes": { - "name": "Tienda de ropa" + "name": "Tienda de ropa", + "terms": "tienda, ropa, vestido, traje, vestimenta, textil, establecimiento, ropaje, sastrería, comercio, negocio, local" }, "shop/computer": { - "name": "Tienda de informática" + "name": "Tienda de informática", + "terms": "tienda, establecimiento, informática, ordenador, computador, comuptadora, comercio, negocio, local" }, "shop/confectionery": { - "name": "Confitería" + "name": "Confitería", + "terms": "confitería, dulces, repostería, golosina, bombones, tienda de dulces, pastelería" }, "shop/convenience": { - "name": "Tienda de alimentación" + "name": "Tienda de alimentación", + "terms": "tienda, almacén, colmado, abarrote, alimentación" }, "shop/deli": { "name": "Delicatessen" @@ -1655,7 +1859,8 @@ "name": "Pescadería" }, "shop/florist": { - "name": "Floristería" + "name": "Floristería", + "terms": "floristería, florista, flores, ramos, plantas, tienda, comercio" }, "shop/furniture": { "name": "Tienda de muebles" @@ -1664,7 +1869,8 @@ "name": "Centro de jardinería" }, "shop/gift": { - "name": "Tienda de regalos" + "name": "Tienda de regalos", + "terms": "tienda, comercio, local, regalo, obsequio" }, "shop/greengrocer": { "name": "Frutería" @@ -1679,13 +1885,19 @@ "name": "Tienda de sonido" }, "shop/jewelry": { - "name": "Joyería" + "name": "Joyería", + "terms": "joyería, joyero, relojería, argentería, orfebrería, orfebre, platero, relojero" }, "shop/kiosk": { - "name": "Kiosko" + "name": "Kiosko", + "terms": "quiosco, kiosko, prensa, revista, estanco" }, "shop/laundry": { - "name": "Lavandería" + "name": "Lavandería", + "terms": "lavandería, lavadero, colada, ropa, tintorería, limpieza" + }, + "shop/locksmith": { + "name": "Cerrajero" }, "shop/mall": { "name": "Centro comercial", @@ -1704,14 +1916,20 @@ "name": "Quiosco de prensa" }, "shop/optician": { - "name": "Óptica" + "name": "Óptica", + "terms": "óptica, gafas, lentillas, oculista, óptico, tienda" }, "shop/outdoor": { - "name": "Tienda de actividades al aire libre" + "name": "Tienda de actividades al aire libre", + "terms": "tienda, deportes, aventura, aire, libre, excursionismo" }, "shop/pet": { "name": "Tienda de mascotas" }, + "shop/photo": { + "name": "Tienda de fotografía", + "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado" + }, "shop/shoes": { "name": "Zapatería" }, @@ -1807,16 +2025,20 @@ "terms": "zoo, zoológico " }, "type/boundary": { - "name": "Límite" + "name": "Límite", + "terms": "frontera, límite, confín, linde, divisoria, borde" }, "type/boundary/administrative": { - "name": "Frontera administrativa" + "name": "Frontera administrativa", + "terms": "frontera, límite, confín, linde, divisoria, borde" }, "type/multipolygon": { - "name": "Multipoligono" + "name": "Multipoligono", + "terms": "multipolígono, polígono, múltiple, multi-polígono" }, "type/restriction": { - "name": "Restricción" + "name": "Restricción", + "terms": "restricción, limitación, prohibición" }, "type/route": { "name": "Ruta", @@ -1837,6 +2059,9 @@ "type/route/foot": { "name": "Ruta a pie" }, + "type/route/hiking": { + "name": "Ruta de senderismo" + }, "type/route/pipeline": { "name": "Ruta de tubería" }, @@ -1876,7 +2101,8 @@ "name": "Desagüe" }, "waterway/river": { - "name": "Río" + "name": "Río", + "terms": "río, torrente, arroyo, torrentera, riachuelo, riacho, afluente, regato" }, "waterway/riverbank": { "name": "Ribera de un río", @@ -1887,7 +2113,8 @@ "terms": "torrente, riachuelo, arroyuelo, regato, reguero, torrentera, rivera, corriente, afluente, brazo, toma, río, arroyo" }, "waterway/weir": { - "name": "Vertedero" + "name": "Vertedero", + "terms": "presa, azud" } } } diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json index 617ddf1c4..84e584cbf 100644 --- a/vendor/assets/iD/iD/locales/et.json +++ b/vendor/assets/iD/iD/locales/et.json @@ -2,11 +2,13 @@ "modes": { "add_area": { "title": "Ala", - "description": "Lisa kaardile parke, hooneid, järvi ja muid alasid." + "description": "Lisa kaardile parke, hooneid, järvi või muid alasid.", + "tail": "Ala (park, järv, ehitis vms) joonistamiseks kliki kaardil." }, "add_line": { "title": "Joon", - "description": "Lisa teid, tänavaid, jalgteid, ojasid ja teisi jooni kaardile." + "description": "Lisa kaardile teid, tänavaid, jalgteid, ojasid ja teisi jooni.", + "tail": "Joone (tee, rada, marsruut vms) joonistamiseks kliki kaardil." }, "add_point": { "title": "Punkt", @@ -33,9 +35,12 @@ } }, "continue": { + "key": "A", + "title": "Jätka", + "description": "Jätka seda joont.", "annotation": { - "line": "Jätkatud joont.", - "area": "Jätkatud ala." + "line": "Joon jätkatud.", + "area": "Ala jätkatud." } }, "cancel_draw": { @@ -45,7 +50,7 @@ "annotation": "Relatsiooni liikme roll on muudetud." }, "change_tags": { - "annotation": "Muudetud silte." + "annotation": "Sildid muudetud." }, "circularize": { "title": "Muuda ringikujuliseks", @@ -61,14 +66,28 @@ "not_closed": "Seda ei saa teha ringikujuliseks kuna see ei ole silmus." }, "orthogonalize": { + "title": "Nurgad täisnurkseks", + "description": { + "line": "Täisnurgasta selle joone nurgad.", + "area": "Täisnurgasta selle ala nurgad." + }, + "key": "S", "annotation": { "line": "Joone nurgad täisnurgastatud.", "area": "Ala nurgad täisnurgastatud." - } + }, + "not_squarish": "Seda ei saa teha täisnurkseks kuna see ei ole nurgeline." + }, + "straighten": { + "title": "Tee sirgeks", + "description": "Tee see joon sirgeks.", + "key": "S", + "annotation": "Joon tehti sirgeks.", + "too_bendy": "Seda ei saa sirgeks teha kuna see painduks liiga palju." }, "delete": { "title": "Kustuta", - "description": "Eemalda see kaardilt.", + "description": "Eemalda kaardilt.", "annotation": { "point": "Punkt kustutatud.", "vertex": "Punkt kustutatud joonelt.", @@ -95,13 +114,15 @@ "disconnect": { "title": "Ühenda lahti", "description": "Ühenda need jooned/alad üksteisest lahti.", - "key": "D" + "key": "D", + "annotation": "Lahtiühendatud jooned/alad." }, "merge": { "title": "Ühenda", "description": "Ühenda need jooned.", "key": "C", "annotation": "{n} joont ühendatud.", + "not_eligible": "Neid objekte ei saa ühendada.", "not_adjacent": "Neid jooni ei saa ühendada kuna need ei ole üksteisega seotud." }, "move": { @@ -133,7 +154,8 @@ "split": { "title": "Tükelda", "description": { - "line": "Tükelda see joon kaheks sellest punktist." + "line": "Tükelda see joon kaheks sellest punktist.", + "area": "Jaga selle ala piir kaheks." }, "key": "X", "annotation": { @@ -144,17 +166,28 @@ } }, "undo": { + "tooltip": "Tühista: : {action}", "nothing": "Pole midagi tagasi võtta." }, "redo": { + "tooltip": "Tee uuesti: {action}", "nothing": "Pole midagi uuesti teha." }, + "tooltip_keyhint": "Kiirvalik:", "browser_notice": "See redaktor on toetatud järgnevates veebilehitsejates: Firefox, Chrome, Safari, Opera, ja Internet Explorer 9 ning uuemates. Palun uuenda oma veebilehitsejat või kasuta Potlatch 2'te kaardi muutmiseks.", + "translate": { + "translate": "Tõlgi", + "localized_translation_label": "Mitmekeelne nimi", + "localized_translation_language": "Vali keel", + "localized_translation_name": "Nimi" + }, + "zoom_in_edit": "Muutmiseks zuumi sisse", "logout": "Logi välja", "loading_auth": "OpenStreetMap'iga ühendamine...", "report_a_bug": "teata veast", "commit": { "title": "Salvesta muudatused", + "description_placeholder": "Muudatuste lühikirjeldus", "message_label": "Salvestuse kommentaar", "upload_explanation": "Su salvestatavad muudatused on nähtaval kõikidel kaartidel mis kasutavad OpenStreetMap-i andmeid.", "upload_explanation_with_user": "Su kasutajana {user} salvestatavad muudatused on nähtaval kõikidel kaartidel, mis kasutavad OpenStreetMap-i andmeid.", @@ -165,41 +198,92 @@ "deleted": "Kustutatud", "created": "Loodud" }, + "contributors": { + "list": "Muutjad: {users}", + "truncated_list": "Muutjad: {users} ja {count} teist" + }, + "geocoder": { + "search": "Otsi kogu maailmast...", + "no_results_visible": "Nähtaval kaardialal tulemusi ei leitud", + "no_results_worldwide": "Tulemusi ei leitud" + }, "geolocate": { "title": "Näita minu asukohta" }, "inspector": { + "no_documentation_combination": "Selle sildi kohta puudub dokumentatsioon", + "no_documentation_key": "Selle objektiliigi kohta puudub informatsioon", "show_more": "Näita rohkem", + "view_on_osm": "Vaata openstreetmap.org lehel", "all_tags": "Kõik sildid", + "all_members": "Kõik liikmed", "all_relations": "Kõik relatsioonid", "new_relation": "Uus relatsioon...", + "role": "Roll", + "choose": "Vali objekti liik", "results": "{n} tulemust otsingule {search}", + "reference": "Vaata OpenStreetMap Wiki lehel", + "back_tooltip": "Muuda objekti", "remove": "Eemalda", "search": "Otsi", + "multiselect": "Valitud ühikud", + "unknown": "Teadmata", + "incomplete": "", "feature_list": "Otsi objekte", - "edit": "Muuda objekti" + "edit": "Muuda objekti", + "none": "Puudub" }, "background": { "title": "Taust", "description": "Tausta seaded", "percent_brightness": "{opacity}% heledus", - "fix_misalignment": "Korrigeeri nihet" + "none": "Puudub", + "custom": "Kohandatud", + "custom_prompt": "Sisesta kohandatud tausta URL. Kasutatavad muutujad on {z}, {x}, {y} Z/X/Y skeemi jaoks ja {u} quadtile skeemi jaoks.", + "fix_misalignment": "Korrigeeri nihet", + "reset": "lähtesta" + }, + "restore": { + "heading": "Sul on salvestamata muudatusi", + "description": "Kas soovid taastada eelmise sessiooni käigus tehtud muudatused?", + "restore": "Taasta", + "reset": "Lähtesta" }, "save": { "title": "Salvesta", "help": "Salvesta muudatused OpenStreetMap'i, tehes need teistele kasutajatele nähtavaks.", + "no_changes": "Salvestamist vajavad muudatused puuduvad.", "error": "Salvestamisel ilmnes tõrge", "uploading": "Muudatuste üleslaadimine OpenStreetMap'i.", "unsaved_changes": "Sul on salvestamata muudatusi" }, + "success": { + "edited_osm": "Sa täiendasid OSM-i!", + "just_edited": "Sa täiendasid just OpenStreetMap-i!", + "view_on_osm": "Vaata OSM lehel", + "facebook": "Jaga Facebook-is", + "twitter": "Jaga Twitteris", + "google": "Jaga Google+-is", + "help_html": "Sinu muudatused peaks \"Standard\" kihile ilmuma mõne minuti pärast. Teiste kihtidega ja teatud objektidega võib kauem aega minna, \n(vaata lisaks).\n" + }, + "confirm": { + "okay": "Korras" + }, "splash": { "welcome": "Tere tulemast kasutama iD OpenStreetMap redaktorit", "text": "iD on kasutajasõbralik ja samas võimas töövahend parima vaba maailmakaardi täiendamiseks. See on versioon {version}. Rohkem infot võib leida veebilehelt {website} ja vigadest saab teatada lehel {github}.", "walkthrough": "Alusta tutvustust", "start": "Kohe redigeerima" }, + "source_switch": { + "live": "live", + "lose_changes": "Sul on salvestamata muudatusi. Kaardiserveri vahetamine kaotab need. Kas oled kindel, et soovid serverit vahetada?", + "dev": "dev" + }, "tag_reference": { - "description": "Kirjeldus" + "description": "Kirjeldus", + "on_wiki": "{tag} wiki.osm.org-is", + "used_with": "kasutatakse koos liigiga {type}" }, "validations": { "untagged_point": "Sildistamata punkt", @@ -213,8 +297,14 @@ "in": "Suurenda sisse", "out": "Suurenda välja" }, + "gpx": { + "local_layer": "Kohalik GPX fail", + "zoom": "Zuumi GPX jälg sisse", + "browse": "Vali .gpx fail" + }, "help": { - "title": "Abi" + "title": "Abi", + "imagery": "# Aerofoto\n\nAerofotod on kaardistamisel oluliseks algallikaks. Valik aerofotosid on kättesaadavad paremal asuva redaktori taustaseadete menüü kaudu, vaikimisi on taustaks [Bing Maps](http://www.bing.com/maps/) satelliitfoto.\n\nMaa-ameti aerofoto taustana kasutamiseks lisa kohandatud tausta valikusse aadress kujul http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg. Selleks, et avada OSM ID-redaktor vaikimisi Maa-ameti ortofoto taustaga, kasuta veebibrauseris aadressi http://www.openstreetmap.org/edit#background=custom:http://kaart.maakaart.ee/orto/{z}/{x}/{y}.jpeg&map=@zoom/@lon/@lat, milles @zoom/@lon/@lat asenda reaalsete väärtustega (näit. 15/59.3438/24.5892).\n\nMõnikord on aerofoto kaardiandmete suhtes nihkes. Kui märkad mitmeid taustaga nihkes olevaid teid, ära asu kohe nende asukohti muutma, vaid kohanda vastavalt aerofoto asendit taustaseadete menüü valiku 'Korrigeeri nihet' abil.\n" }, "intro": { "navigation": { @@ -223,13 +313,18 @@ "select": "Kaardi objekte saab esitada kolmel viisil: kasutades punkte, jooni või alasid. Kõiki objekte saab valida nendel klikkides. **Kliki punktil, et see valida.**" }, "points": { - "title": "Punktid" + "title": "Punktid", + "add": "Punkte saab kasutada objektide nagu kauplused, restoranid ja monumendid esitamiseks. Punktid märgistavad konkreetse koha ja kirjeldavad, mis seal asub. **Uue punkti lisamiseks kliki nupul Punkt.** ", + "choose": "**Vali nimekirjast kohvik**" }, "areas": { - "title": "Alad" + "title": "Alad", + "search": "**Otsi '{name}'.**", + "choose": "**Vali nimekirjast mänguväljak**" }, "lines": { - "title": "Jooned" + "title": "Jooned", + "road": "**Vali nimekirjast tee**" }, "startediting": { "title": "Alusta redigeerimist", @@ -250,9 +345,6 @@ }, "category-road": { "name": "Tee" - }, - "category-water": { - "name": "Vesi" } }, "fields": { @@ -293,7 +385,11 @@ "capacity": { "label": "Mahtutavus" }, + "cardinal_direction": { + "label": "Suund" + }, "clock_direction": { + "label": "Suund", "options": { "clockwise": "Kellasuunas", "anticlockwise": "Kella vastassuunas" @@ -321,6 +417,9 @@ "label": "Faks", "placeholder": "+372 123 4567" }, + "fee": { + "label": "Tasu" + }, "iata": { "label": "IATA" }, @@ -337,6 +436,9 @@ "lanes": { "label": "Sõiduread" }, + "layer": { + "label": "Kiht" + }, "levels": { "label": "Korruseid" }, @@ -349,6 +451,9 @@ "note": { "label": "Märge" }, + "office": { + "label": "Tüüp" + }, "oneway": { "label": "Ühesuunaline" }, @@ -364,6 +469,9 @@ "park_ride": { "label": "Pargi ja Reisi" }, + "parking": { + "label": "Tüüp" + }, "phone": { "label": "Telefon" }, @@ -373,6 +481,9 @@ "shelter": { "label": "Varjualune" }, + "source": { + "label": "Allikas" + }, "sport": { "label": "Sport" }, @@ -394,7 +505,7 @@ "placeholder": "http://näidis24.ee/" }, "wikipedia": { - "label": "Wikipeedia" + "label": "Vikipeedia" } }, "presets": { @@ -476,9 +587,6 @@ "amenity/marketplace": { "name": "Turg" }, - "amenity/parking": { - "name": "Parkla" - }, "amenity/pharmacy": { "name": "Apteek" }, @@ -608,6 +716,9 @@ "highway/motorway": { "name": "Kiirtee" }, + "highway/motorway_junction": { + "name": "Kiirtee liiklussõlm" + }, "highway/path": { "name": "Rada" }, @@ -617,6 +728,9 @@ "highway/primary": { "name": "Põhimaantee" }, + "highway/residential": { + "name": "Elamupiikonna tänav" + }, "highway/secondary": { "name": "Tugimaantee" }, @@ -678,7 +792,7 @@ "name": "Karjäär" }, "landuse/residential": { - "name": "Elamurajoon" + "name": "Elamupiirkond" }, "landuse/retail": { "name": "Kaubanduslik" @@ -806,6 +920,9 @@ "place/island": { "name": "Saar" }, + "place/town": { + "name": "Linn" + }, "place/village": { "name": "Küla" }, diff --git a/vendor/assets/iD/iD/locales/fa.json b/vendor/assets/iD/iD/locales/fa.json new file mode 100644 index 000000000..fa14cc514 --- /dev/null +++ b/vendor/assets/iD/iD/locales/fa.json @@ -0,0 +1,214 @@ +{ + "modes": { + "add_area": { + "title": "مساحت" + }, + "add_point": { + "title": "نقطه" + }, + "browse": { + "title": "جستجو" + } + }, + "operations": { + "delete": { + "title": "حذف" + } + }, + "presets": { + "fields": { + "access": { + "label": "دسترسي" + }, + "address": { + "label": "ادرس", + "placeholders": { + "housename": "نام خانه", + "number": "123", + "street": "خيابان", + "city": "شهر" + } + }, + "aeroway": { + "label": "نوع" + }, + "amenity": { + "label": "نوع" + }, + "artwork_type": { + "label": "نوع" + }, + "barrier": { + "label": "نوع" + }, + "bicycle_parking": { + "label": "نوع" + }, + "boundary": { + "label": "نوع" + }, + "building": { + "label": "ساختمان" + }, + "building_area": { + "label": "ساختمان" + }, + "building_yes": { + "label": "ساختمان" + }, + "capacity": { + "label": "ظرفيت" + }, + "construction": { + "label": "نوع" + }, + "crossing": { + "label": "نوع" + }, + "elevation": { + "label": "ارتفاع" + }, + "entrance": { + "label": "نوع" + }, + "fax": { + "label": "نمابر" + }, + "fire_hydrant/type": { + "label": "نوع" + }, + "generator/type": { + "label": "نوع" + }, + "highway": { + "label": "نوع" + }, + "historic": { + "label": "نوع" + }, + "internet_access": { + "options": { + "wlan": "واي فاي", + "wired": "سيمي", + "terminal": "پايانه" + } + }, + "landuse": { + "label": "نوع" + }, + "layer": { + "label": "لايه" + }, + "leisure": { + "label": "نوع" + }, + "man_made": { + "label": "نوع" + }, + "network": { + "label": "شبکه" + }, + "note": { + "label": "يادداشت" + }, + "office": { + "label": "نوع" + }, + "oneway": { + "label": "يک طرفه" + }, + "opening_hours": { + "label": "ساعت" + }, + "operator": { + "label": "اپراتور" + }, + "parking": { + "label": "نوع" + }, + "phone": { + "label": "تلفن" + }, + "place": { + "label": "نوع" + }, + "power": { + "label": "نوع" + }, + "railway": { + "label": "نوع" + }, + "relation": { + "label": "نوع" + }, + "restriction": { + "label": "نوع" + }, + "route": { + "label": "نوع" + }, + "route_master": { + "label": "نوع" + }, + "service": { + "label": "نوع" + }, + "shop": { + "label": "نوع" + }, + "sport": { + "label": "ورزشي" + }, + "tourism": { + "label": "نوع" + }, + "towertype": { + "label": "نوع برج" + }, + "tracktype": { + "label": "نوع" + }, + "vending": { + "label": "نوع محموله" + }, + "water": { + "label": "نوع" + }, + "waterway": { + "label": "نوع" + }, + "website": { + "label": "وب سايت" + }, + "wetland": { + "label": "نوع" + }, + "wikipedia": { + "label": "ويکي پديا" + }, + "wood": { + "label": "نوع" + } + }, + "presets": { + "aeroway/aerodrome": { + "name": "فرودگاه" + }, + "amenity/bank": { + "name": "بانک" + }, + "amenity/bar": { + "name": "بار" + }, + "amenity/cafe": { + "name": "کافه" + }, + "amenity/place_of_worship/muslim": { + "name": "مسجد" + }, + "amenity/police": { + "name": "پليس" + } + } + } +} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json index e4c7c1969..4ddf13393 100644 --- a/vendor/assets/iD/iD/locales/fi.json +++ b/vendor/assets/iD/iD/locales/fi.json @@ -44,6 +44,7 @@ "key": "A", "title": "Pidennä", "description": "Jatka ja pidennä tätä viivaa.", + "not_eligible": "Viivaa ei voi jatkaa tästä.", "annotation": { "line": "Viivan muokkaaminen aloitettu.", "area": "Alueen muokkaaminen aloitettu." @@ -240,20 +241,22 @@ "choose": "Valitse ominaisuustyyppi", "results": "{n} hakutulosta haulle {search}", "reference": "Näytä OpenStreetMap Wikissä.", - "back_tooltip": "Muuta ominaisuutta", + "back_tooltip": "Vaihda ominaisuustyyppi", "remove": "Poista", "search": "Hae", + "multiselect": "Valitut kohteet", "unknown": "Ei tiedossa", "incomplete": "", "feature_list": "Etsi ominaisuuksia", - "edit": "Muokkaa ominaisuutta" + "edit": "Muokkaa ominaisuutta", + "none": "Ei kohteita" }, "background": { "title": "Tausta", "description": "Taustan asetukset", "percent_brightness": "{opacity}% kirkkaus", + "none": "Ei kohteita", "custom": "Mukautettu", - "fix_misalignment": "Korjaa ilmakuvavirhe", "reset": "palauta" }, "restore": { @@ -312,7 +315,8 @@ "cannot_zoom": "Nykyisessä tilassa ei voi loitontaa enempää.", "gpx": { "local_layer": "Oma GPX-tiedosto", - "drag_drop": "Vedä ja pudota GPX-tiedosto tälle sivulle" + "drag_drop": "Vedä ja pudota GPX-tiedosto tähän tai selaa tiedostoja napsauttamalla oikean yläreunan painiketta", + "browse": "Selaa GPX-tiedostoja" }, "help": { "title": "Ohje", @@ -381,9 +385,6 @@ }, "category-route": { "name": "Reitti" - }, - "category-water": { - "name": "Vesi" } }, "fields": { @@ -449,6 +450,9 @@ "atm": { "label": "Pankkiautomaatti" }, + "backrest": { + "label": "Selkänoja" + }, "barrier": { "label": "Tyyppi" }, @@ -850,10 +854,6 @@ "amenity/marketplace": { "name": "Tori" }, - "amenity/parking": { - "name": "Pysäköintialue", - "terms": "pysäköinti, parkkipaikka, pysäköintipaikka, parkki, pysäköintitalo, parkkitalo, autoparkki, auto" - }, "amenity/pharmacy": { "name": "Apteekki", "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti" @@ -878,7 +878,7 @@ }, "amenity/post_box": { "name": "Postilaatikko", - "terms": "postilaatikko, postinlähetys, oranssi laatikko, kirjeenlähetys, posti, kirje" + "terms": "postilaatikko, postinlähetys, oranssi laatikko, kirjeenlähetys, posti, kirje, itella" }, "amenity/post_office": { "name": "Postitoimisto", @@ -994,10 +994,11 @@ }, "building/garage": { "name": "Autotalli", - "terms": "autotalli, autonsäilytys, autohalli, autovarasto" + "terms": "autotalli, autonsäilytys, autohalli, autovarasto, auto" }, "building/house": { - "name": "Talo" + "name": "Omakotitalo", + "terms": "omakotitalo, omakoti, yksityisasunto, yksityistalo, talo, asunto" }, "building/hut": { "name": "Mökki", @@ -1099,7 +1100,7 @@ "name": "Pelastustie" }, "highway/service/parking_aisle": { - "name": "Pysäköintiväyl" + "name": "Pysäköintiväylä" }, "highway/steps": { "name": "Portaat" @@ -1123,7 +1124,8 @@ "name": "Valtatien ramppi" }, "highway/turning_circle": { - "name": "Kääntymispaikka" + "name": "Kääntymispaikka", + "terms": "kääntymispaikka, kääntöpaikka, U-käännös, kääntöympyrä, kääntymisympyrä, U-käännöksen tekopaikka" }, "highway/unclassified": { "name": "Luokittelematon tie" @@ -1168,7 +1170,7 @@ "name": "Hautausmaa" }, "landuse/commercial": { - "name": "Liiketoiminta" + "name": "Yritysalue" }, "landuse/construction": { "name": "Rakennustyömaa" @@ -1186,7 +1188,7 @@ "name": "Ruohokenttä" }, "landuse/industrial": { - "name": "Teollisuus" + "name": "Teollisuusalue" }, "landuse/meadow": { "name": "Niitty/pelto" @@ -1198,7 +1200,7 @@ "name": "Louhos" }, "landuse/residential": { - "name": "Asutus" + "name": "Asuinalue" }, "landuse/retail": { "name": "Vähittäiskauppa" @@ -1612,7 +1614,8 @@ "terms": "alppimaja, alppimökki, alppitalo, vuorimaja, vuoritalo, vuorimökki, vuoristomaja, vuoristomökki, vuoristotalo" }, "tourism/artwork": { - "name": "Taideteos" + "name": "Taideteos", + "terms": "taideteos, patsas, veistos, taide, taiteellinen, teos" }, "tourism/attraction": { "name": "Turistikohde" @@ -1648,7 +1651,8 @@ "name": "Piknikpuisto" }, "tourism/theme_park": { - "name": "Teemapuisto" + "name": "Huvipuisto", + "terms": "teemapuisto, huvipuisto, elämyspuisto, huvilaite" }, "tourism/viewpoint": { "name": "Näköalapaikka" @@ -1699,6 +1703,9 @@ "type/route/tram": { "name": "Raitiovaunulinja" }, + "type/route_master": { + "name": "Pääreitti" + }, "vertex": { "name": "Muu" }, diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json index 3765abcb2..41ee829a4 100644 --- a/vendor/assets/iD/iD/locales/fr.json +++ b/vendor/assets/iD/iD/locales/fr.json @@ -74,13 +74,24 @@ "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas." }, "orthogonalize": { + "title": "Carré", + "description": { + "line": "Rendre une ligne orthogonale", + "area": "Rendre une forme orthogonale à ce polygone" + }, + "key": "S", "annotation": { "line": "Ligne rendue orthogonale.", "area": "Polygone rendu orthogonal." - } + }, + "not_squarish": "Cela ne peut être fait, ce n'est pas carré." }, "straighten": { - "key": "S" + "title": "Rendre droit", + "description": "Rendre cette ligne droite.", + "key": "S", + "annotation": "Rendre une ligne droite.", + "too_bendy": "Ne peux être redressé car il courbe trop." }, "delete": { "title": "Supprimer", @@ -236,17 +247,21 @@ "back_tooltip": "Changer l'objet", "remove": "Supprimer", "search": "Rechercher", + "multiselect": "Items sélectionnés", "unknown": "Inconnu", "incomplete": "", "feature_list": "Rechercher des objets", - "edit": "Modifier l'élément" + "edit": "Modifier l'élément", + "none": "Aucun" }, "background": { "title": "Fond de carte", "description": "Paramètres du fond de carte", "percent_brightness": "{opacity}% luminosité", + "none": "Aucun", "custom": "Personnalisé", - "fix_misalignment": "Corriger le décalage", + "custom_prompt": "Entre un modèle de tuile. Les jetons valides sont {z}, {x}, {y} pour un système Z/X/Y et {u} pour le quatrième système.", + "fix_misalignment": "Corriger l'alignement", "reset": "réinitialiser" }, "restore": { @@ -306,16 +321,21 @@ "cannot_zoom": "Impossible de zoomer plus en arrière dans ce mode.", "gpx": { "local_layer": "Fichier GPX personnel", - "drag_drop": "Glisser et déposer un fichier .gpx sur la page" + "drag_drop": "Glisser et déposer un fichier .gpx sur la page, ou cliquez sur le bouton droit pour rechercher", + "zoom": "Zoomer le tracé GPX", + "browse": "Recherchez un fichier .gpx" }, "help": { "title": "Aide", "help": "#Aide\n\n Ceci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la carte du\n monde gratuite et éditable. Vous pouvez l'utiliser pour ajouter ou corriger les données\n dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre de droits.\n\n Les modifications que vous réaliserez seront visibles par tout le monde. Pour commencer\n à éditer, vous devez créer un [compte gratuit sur OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n [iD editor](http://ideditor.com/) est un projet collaboratif dont le [code source est\n disponible sur GitHub](https://github.com/systemed/iD).\n", + "editing_saving": "# Éditer et sauvegarder⏎\n⏎\nCet éditeur est conçu principalement pour travailler en mode connecté, et vous l'accéder depuis un site Web en ce moment.⏎\n⏎\n### Sélectionner un élément de la carte⏎\n⏎\nPour sélection un élément de la carte, tel qu'une rue ou un point d'intérêt, cliquez sur ce dernier⏎\nsur la carte. Cette action mettra l'élément en surbrillance, et ouvrira le panneau latéral⏎\nqui affiche les propriétés de l'élément. Un menu apparaîtra également sur la carte,⏎\npermettant de poser des actions sur l'élément (telles que le déplacer, repositionner⏎\nses points constituants, etc).\n⏎\nPour sélectionner plusieurs éléments, appuyez sur la touche 'Majuscule'. Puis, cliquez⏎\nun à un sur les éléments à sélectionner. Alternativement, il est possible de dessinez un rectangle⏎\nsur la carte (toujours en appuyant sur 'Majuscule) pour effectuer la sélection multiple.⏎\nles points à sélectionner.⏎\n⏎\n### Enregistrer les modifications⏎\n⏎\nL'éditeur enregistre localement (sur votre ordinateur) toutes les modifications⏎\nque vous effectuez sur les éléments de la carte (les rues, les bâtiments, etc.).⏎\nCes modifications seront envoyées au serveur OpenStreetMap uniquement⏎\nlorsque vous appuierez sur \"Sauvegarder\".⏎\n⏎\nNe vous faites donc pas de souci si vous faites une erreur. Vous pouvez annuler⏎\ntout changement effectué en appuyant sur le bouton d'annulation (la flèche de demi-tour⏎\npointant vers la gauche).⏎\n⏎\nLorsque vous avez terminé un groupe de modifications - par exemple, vous avez⏎\ncomplété une partie de la ville et vous voulez en débuter une nouvelle,⏎\nil suffit d'appuyer sur le bouton \"Sauvegarder\". Vos changements ne seront pas⏎\nenvoyés immédiatement - vous avez l'occasion de réviser le travail effectué⏎\navant de confirmer les changements. ⏎\n⏎\nSi tout semble bon, entrez un commentaire décrivant vos changements⏎\n(par exemple: \"Ajout d'une boulangerie\" ou \"Ajout de commerces du quartier\"),⏎\npuis appuyez à nouveau sur le bouton 'Sauvegarder' (qui, cette fois-ci, apparaîtra\nen bleu dans le panneau latéral). Vos changements seront alors envoyés à⏎\n[OpenStreetMap.org](http://www.openstreetmap.org/), où il seront partagés et rendus⏎\nvisibles à tous les autres utilisateurs.\n⏎\nSi vous ne pouvez pas terminer vos changements en une seule séance, vous pouvez⏎\nfermer la fenêtre de l'éditeur. Vos changements seront enregistrés localement.⏎\nLorsque vous ouvrirez à nouveau l'éditeur, sur le même ordinateur et avec le même⏎\nnavigateur Web, l'éditeur vous proposera de récupérer le travail de la séance précédente.⏎\n", "roads": "# Routes\n\nVous pouvez créer, mettre à jour et supprimer des routes à l'aide de l'éditeur. Il peut s'agir de tous types de routes : chemins, autoroutes, pistes cyclables, et plus encore : toute voie régulièrement fréquentée peut être cartographiée.\n\n### Sélection\n\nCliquez sur une route pour la sélectionner. Elle sera alors surlignée et un menu 'outils' apparaîtra sur la carte, ainsi qu'une barre d'état affichant des informations supplémentaires.\n\n### Modification\n\nIl est fréquent que les routes ne soient pas bien alignées avec l'imagerie satellite ou avec les traces GPS. Vous pouvez ajuster et corriger la position des routes.\n\nCliquez d'abord sur la route à modifier. Elle est alors surlignée et des points de contrôle apparaissent qui permettent de corriger sa position. Pour ajouter des points de contrôle, double-cliquez sur un segment de la route sans nœuds.\n\nSi la route est connectée à une autre, mais que la connexion est incorrecte, vous pouvez déplacer un de ses points de contrôle sur la seconde route pour corriger la connexion. Des routes bien connectées sont essentielles pour la carte et pour fournir de bonnes informations d'itinéraire.\n\nVous pouvez également cliquer sur l'outil 'Déplacer' ou appuyer sur le raccourci `M` pour déplacer l'ensemble de la route en une fois, puis cliquer de nouveau une fois pour sauvegarder le déplacement.\n\n### Suppression\n\nSi une route est complètement fausse - c'est-à-dire qu'elle n'apparaît pas sur l'image satellite, et que dans l'idéal, vous avez confirmé qu'elle n'existe pas sur le terrain - vous pouvez la supprimer, ce qui l'enlèvera de la carte. Faites attention lorsque vous supprimez des éléments : comme n'importe quelle autre modification, le résultat sera visible par tout le monde sur la carte. Les photos aériennes sont souvent dépassées et la route est peut-être tout simplement récente.\n\nPour supprimer une route, sélectionnez-la en cliquant dessus, puis cliquez sur l'icône 'Poubelle' ou appuyez sur la touche 'Suppr'.\n\n### Création\n\nVous avez constaté qu'une route de votre connaissance manque à la carte ? Cliquez sur l'icône 'Ligne' en haut à gauche de l'éditeur ou appuyez sur le raccourci `2` pour dessiner une route. \n\nPour commencer le dessin, cliquez sur l'endroit où commence la route. Si elle commence à l'embranchement d'une autre route, commencez le dessin en cliquant à l'endroit de la connexion.\n\nCliquez ensuite régulièrement le long de la route pour ajouter des points, en utilisant l'imagerie satellite comme référence. Si la route que vous dessinez croise une autre route, connectez les deux en cliquant à l'endroit de l'intersection. Lorsque vous avez terminé le dessin, double-cliquez ou appuyez sur 'Entrée'.\n", - "imagery": "# Fond de carte\n\nLes photos aériennes sont une source importante pour cartographier. Une\ncompilation de photos prises d'avion, imageries satellites, et autres sources\nlibres d'utilisation sont disponibles dans l'éditeur dans le menu \"Configuration\ndu fond de carte\" à gauche.\n\nPar défaut, l'imagerie aérienne de [Bing Maps](http://www.bing.com/maps/)\nest utilisée dans l'éditeur, mais lorsque vous zoomez sur la carte, d'autres sources\nsont parfois disponibles dans certaines zones. Certains pays tels que la France, les\nÉtats-Unis ou le Danemark disposent d'image de très haute qualité sur certaines\nzones.\n\nCertaines images sont parfois décalées par rapport aux données, notamment\nà cause d'un mauvais calibrage. Si vous voyez de nombreux éléments tous décalés\npar rapport au fond de carte, ne déplacez pas immédiatement ces éléments. À la\nplace, vous pouvez ajuster le fond de carte afin qu'il soit aligné aux données en\ncliquant sur \"Corriger l'alignement\" en bas de l'interface de configuration du fond\nde carte.\n", + "gps": "# GPS⏎\n⏎\nLes traces GPS sont les données les plus fiables pour OpenStreetMap. ⏎\nCet éditeur connaît les traces au format -`.gpx`. Vous pouvez enregistrer ce\ntype de traces avec un grand nombre d'applications pour smartphones\nainsi qu'avec certains GPS de randonnées.⏎\n⏎\nPour plus d'informations sur la manière de relever des traces GPS, vous\npouvez consulter le guide [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).⏎\n⏎\nPour utiliser un relevé GPX, il vous suffit de glisser-déposer le fichier GPX\ndirectement sur la carte. S'il est reconnu, il sera ajouté sur la carte sous\nla forme d'une ligne vert clair. Cliquez sur le menu \"Configuration du fond\nde carte\" à gauche pour activer et désactiver l'affichage de la trace, ou\nencore pour centrer le zoom sur la trace.⏎\n⏎\nLes traces GPX ne sont pas directement enregistrée dans OpenStreetMap.⏎\nLe meilleur moyen de les utiliser est de les prendre comme guide pour ajouter⏎\nvous même des informations sur la carte ou bien en les [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npour les fournir aux autres contributeurs⏎\n", + "imagery": "# Fond de carte⏎\n⏎\nLes photos aériennes sont une source importante pour cartographier. Une\ncompilation de photos prises d'avion, imageries satellites, et autres sources\nlibre d'utilisation sont disponibles dans l'éditeur dans le menu \"Configuration\ndu fond de carte\" à gauche.⏎\n⏎\nPar défaut, l'imagerie aérienne de [Bing Maps](http://www.bing.com/maps/)\nest utilisée dans l'éditeur, mais lorsque vous zoomez sur la carte, d'autres sources\nsont parfois disponibles dans certaines zones. Certains pays tels que la France, les\nÉtats-Unis ou le Danemark disposent d'images de très haute qualité sur certaines\nzones.⏎\n⏎\nCertaines images sont parfois décalées par rapport aux données, notamment\nà cause d'un mauvais calibrage. Si vous voyez de nombreux éléments tous décalés\npar rapport au fond de carte, ne déplacez pas immédiatement ces éléments. A la\nplace, vous pouvez ajuster le fond de carte afin qu'il soit aligné aux données en\ncliquant sur \"Corriger l'alignement\" en bas de l'interface de configuration du fond\nde carte.⏎\n", "addresses": "# Adresses\n\nLes adresses sont parmis les informations les plus utiles pour la carte.\n\nAlors que les adresses sont souvent représentées comme faisant partie des rues, dans OpenStreetMap, les adresses sont enregistrées comme attributs des bâtiments le long des rues.\n\nVous pouvez ajouter une adresse sur les éléments modélisés avec un polygone\net sur ceux modélisés avec des points. La meilleure source de données afin\nde cartographier les adresses reste le relevé sur le terrain ou les connaissances personnelles, car comme pour tous les autres éléments, la copie de données à partir de contenu non libre de droits comme Google Maps est strictement interdite.\n", - "inspector": "# Utilisation de l'inspecteur\n\nL'inspecteur est l'élément de l'interface utilisateur qui apparaît à droite de la page quand un élément est sélectionné. Il permet de mettre à jour les détails le concernant.\n\n### Sélectionner un type d'élément\n\nAprès ajout d'un point, d'une ligne ou d'un polygone, vous pouvez indiquer de quel type d'élément il s'agit : une route principale ou résidentielle, un supermarché, un café… L'inspecteur affiche des boutons pour les éléments les plus communs, et vous pouvez trouver les autres à l'aide du formulaire de recherche.\n\nCliquez sur 'i' dans le coin en bas à droite des boutons pour en savoir plus sur l'élément dont il s'agit. Cliquez sur le bouton pour choisir cet élément.\n\n### Utiliser les formulaires et les tags\n\nAprès avoir choisi le type d'élément, ou lorsque vous sélectionnez un élément dont la nature est déjà indiquée, l'inspecteur affiche des champs comprenant des détails sur l'élément concerné — adresse, nom, etc.\n\nEn-dessous des champs, vous pouvez cliquer sur les icônes pour ajouter des détails supplémentaires, comme des informations issues de [Wikipedia](http://www.wikipedia.org/), des renseignements sur l'accès pour les personnes handicapées, ou plus encore.\n\nEn bas de l'inspecteur, cliquez sur 'attributs supplémentaires' pour ajouter des attributs arbitraires à l'élément. [Taginfo](http://taginfo.openstreetmap.org/) est une excellente ressource pour en savoir plus sur les combinaisons d'attributs les plus fréquentes.\n\nLes changements que vous effectuez dans l'inspecteur sont immédiatement visibles sur la carte. Vous pouvez les annulez dès que vous le souhaitez en cliquant sur 'annuler'. \n\n### Fermer l'inspecteur\n\nPour fermer l'inspecteur, vous pouvez cliquer sur le bouton 'fermer' en haut à droite, appuyer sur Échap ou encore cliquer sur la carte.\n", - "buildings": "# Bâtiments\n\nOpenStreetMap est la plus grande base de données au monde sur le bâti.\nVous pouvez améliorer cette base de données.\n\n### Sélection\n\nVous pouvez sélectionner un bâtiment en cliquant sur son contour. Le bâtiment\nsera ainsi surligné, une boîte à outils apparaîtra, ainsi qu'un panneau contenant\nles informations sur le bâtiment.\n\n### Correction\n\nParfois, un bâtiment est mal placé ou possède des informations incorrectes.\n\nPour déplacer un bâtiment dans son intégralité, sélectionnez-le, puis cliquez\nsur l'outil \"Déplacer\". Déplacez ensuite la souris, puis cliquez lorsque le\nbâtiment est placé correctement.\n\nPour corriger la forme d'un bâtiment, glissez-déposez les points du contour\ndu bâtiment.\n\n### Création\n\nL'une des problématiques concernant les bâtiments est qu'ils peuvent être\nreprésentés à la fois par un point ou par un polygone. La règle d'or est de\n_dessiner les bâtiments avec des polygone dès que c'est possible_, et de\ncartographier les entreprises, équipements, adresses, et tout ce qui ne\ndépend pas directement de la construction comme des points placés\nau sein de la forme du bâtiment.\n\nDessinez un bâtiment en cliquant sur le bouton \"Polygone\" en haut à gauche\nde l'interface, ajoutez des points en cliquant sur la carte et terminez la forme\nen cliquant sur le premier point, ou en appuyant sur la touche \"Entrée\" de\nvotre clavier.\n\n### Suppression\n\nSi un bâtiment dessiné est inexistant (par exemple s'il n'existe pas sur l'image\nsatellite et que vous avez vérifié sur place que ce n'était pas une construction\nrécente), vous pouvez le supprimer. Attention avant de supprimer un élément ;\ntout le monde peut constater que vous l'avez supprimé, et il peut s'agir d'un\nélément plus récent que l'image satellite.\n\nVous pouvez supprimer un bâtiment en le sélectionnant, puis en cliquant sur\nl'icône représentant une poubelle, ou en appuyant sur la touche \"Suppr\" de\nvotre clavier.\n" + "inspector": "# Utilisation de l'inspecteur⏎\n⏎\nL'inspecteur est l'élément de l'interface utilisateur qui apparaît à droite de la page quand un élément est sélectionné. Il permet de mettre à jour les détails concernant l'élément sélectionné.⏎\n⏎\n### Sélectionner un type d'élément⏎\n⏎\nAprès ajout d'un point, d'une ligne ou d'un polygone, vous pouvez indiquer de quel type d'élément il s'agit : une route principale ou résidentielle, un supermarché, un café... L'inspecteur affiche des boutons pour les éléments les plus communs, et vous pouvez trouver les autres à l'aide du formulaire de recherche.⏎\n⏎\nCliquez sur 'i' dans le coin en bas à droite des boutons pour en savoir plus sur l'élément dont il s'agit. Cliquez sur le bouton pour choisir cet élément.⏎\n⏎\n### Utiliser les formulaires et les tags⏎\n⏎\nAprès avoir choisi le type d'élément, ou lorsque vous sélectionnez un élément dont la nature est déjà indiquée, l'inspecteur affiche des champs comprenant des détails sur l'élément concerné - adresse, nom, etc.⏎\n⏎\nEn-dessous des champs, vous pouvez cliquer sur les icônes pour ajouter des détails supplémentaires, comme des informations issues de [Wikipedia](http://www.wikipedia.org/), des renseignements sur l'accès handicapé, ou plus encore.⏎\n⏎\nEn bas de l'inspecteur, cliquez sur 'attributs supplémentaires' pour ajouter des attributs arbitraires à l'élément. [Taginfo](http://taginfo.openstreetmap.org/) est une excellente ressource pour en savoir plus sur les combinaisons d'attributs les plus fréquentes.⏎\n⏎\nLes changements que vous effectuez dans l'inspecteur sont immédiatement visibles sur la carte. Vous pouvez les annulez dès que vous le souhaitez en cliquant sur 'annuler'. ⏎\n⏎\n", + "buildings": "# Bâtiments\n\nOpenStreetMap est la plus grande base de données au monde sur le bâti.\nVous pouvez améliorer cette base de données.\n\n### Sélection\n\nVous pouvez sélectionner un bâtiment en cliquant sur son contour. Le bâtiment\nsera ainsi surligné, une boîte à outils apparaîtra, ainsi qu'un panneau contenant\nles informations sur le bâtiment.\n\n### Correction\n\nParfois, un bâtiment est mal placé ou possède des informations incorrectes.\n\nPour déplacer un bâtiment dans son intégralité, sélectionnez-le, puis cliquez\nsur l'outil \"Déplacer\". Déplacez ensuite la souris, puis cliquez lorsque le\nbâtiment est placé correctement.\n\nPour corriger la forme d'un bâtiment, glissez-déposez les points du contour\ndu bâtiment.\n\n### Création\n\nL'une des problématiques concernant les bâtiments est qu'ils peuvent être\nreprésentés à la fois par un point ou par un polygone. La règle d'or est de\n_dessiner les bâtiments avec des polygone dès que c'est possible_, et de\ncartographier les entreprises, équipements, adresses, et tout ce qui ne\ndépend pas directement de la construction comme des points placés\nau sein de la forme du bâtiment.\n\nDessinez un bâtiment en cliquant sur le bouton \"Polygone\" en haut à gauche\nde l'interface, ajoutez des points en cliquant sur la carte et terminez la forme\nen cliquant sur le premier point, ou en appuyant sur la touche \"Entrée\" de\nvotre clavier.\n\n### Suppression\n\nSi un bâtiment dessiné est inexistant (par exemple s'il n'existe pas sur l'image\nsatellite et que vous avez vérifié sur place que ce n'était pas une construction\nrécente), vous pouvez le supprimer. Attention avant de supprimer un élément ;\ntout le monde peut constater que vous l'avez supprimé, et il peut s'agir d'un\nélément plus récent que l'image satellite.\n\nVous pouvez supprimer un bâtiment en le sélectionnant, puis en cliquant sur\nl'icône représentant une poubelle, ou en appuyant sur la touche \"Suppr\" de\nvotre clavier.\n", + "relations": "# Relations⏎\n⏎\nUne relation est un élément spécial dans OpenStreetMap qui permet de regrouper ensemble d'autre éléments\nPar exemple, les deux plus courants types de relations sont *route relations*,\nqui regroupe des sections de route qui appartiennent à une autoroute, \net *multipolygons*, qui regroupe plusieurs lignes qui définissent\nune zone complexe (une avec plusieurs pièces ou trous à l’intérieur comme un donut).⏎\n⏎\nLe groupe d'éléments dans une relation sont appelés *members*. Dans le menu de côté, vous pouvez\nvoir dans quelles relations l'élément appartient, et sélectionner une des relations pour voir.\nLorsque la relation est sélectionnée, vous pouvez voir tous\nles membres listés dans le menu de côté et la mettre en sur-impression sur la carte.⏎\n⏎\nPour la plus part, iD veillera à maintenir les relations automatiquement\npendant que vous éditez. La chose la plus importe que vous devez savoir est que si vous effacez une\nsection de route pour la rendre plus précise, vous devez vous assurer que \nla nouvelle section est un membre des même relations que l'originale.⏎\n⏎\n## Modifier des Relations⏎\n⏎\nSi vous voulez modifier des relations, voici les bases.⏎\n⏎\nPour apporter une information à une relation, sélectionnez l'élément, appuyez sur le bouton \"+\" dans la\nsection \"All relations\" du menu du côté, et sélectionnez ou saisissez le nom de la relation.⏎\n⏎\nPour créer une nouvelle relation, sélectionnez le premier élément qui doit en être membre,\nappuyez sur le bouton \"+\" dans le section \"All relations\", et sélectionner \"New relation...\".\n⏎\nPour retirer un élément d'une relation, sélectionnez l’élément et appuyez sur le symbole de la corbeille.\nbutton next de la relation si vous souhaitez la supprimer.⏎\n⏎\nVous pouvez créer des multipolygons avec des trous en utilisant l'outil \"Merge\". Dessinez deux polygones (inner\net outer), maintenez la touche Shift/Majuscule et appuyez sur chacune d'elles pour les sélectionner, et après\nappuyez le bouton \"Merge\" (+) .⏎\n" }, "intro": { "navigation": { @@ -382,9 +402,6 @@ }, "category-route": { "name": "Route" - }, - "category-water": { - "name": "Eau" } }, "fields": { @@ -421,10 +438,13 @@ }, "destination": { "title": "Interdit sauf riverains", - "description": "Circulation interdite, sauf pour accéder aux zones désservies" + "description": "Circulation interdite, sauf pour accéder aux zones desservies" } } }, + "access_toilets": { + "label": "Accès" + }, "address": { "label": "Adresse", "placeholders": { @@ -528,12 +548,21 @@ "fee": { "label": "Prix" }, + "fire_hydrant/type": { + "label": "Type" + }, "fixme": { "label": "Corrigez-Moi" }, "generator/method": { "label": "Méthode" }, + "generator/source": { + "label": "Source" + }, + "generator/type": { + "label": "Type" + }, "highway": { "label": "Type" }, @@ -550,7 +579,7 @@ "label": "Pente" }, "internet_access": { - "label": "Accès Internet", + "label": "Accès internet", "options": { "wlan": "Wifi", "wired": "Par câble", @@ -574,6 +603,9 @@ "label": "Niveaux", "placeholder": "2, 4, 6..." }, + "lit": { + "label": "Éclairage" + }, "location": { "label": "Lieu" }, @@ -692,6 +724,9 @@ "surface": { "label": "Revêtement" }, + "toilets/disposal": { + "label": "Élimination" + }, "tourism": { "label": "Type" }, @@ -704,6 +739,9 @@ "trail_visibility": { "label": "Visibilité du sentier" }, + "vending": { + "label": "Type de marchandises" + }, "water": { "label": "Type" }, @@ -711,7 +749,7 @@ "label": "Type" }, "website": { - "label": "Site Internet", + "label": "Site internet", "placeholder": "http://example.com" }, "wetland": { @@ -757,7 +795,7 @@ "terms": "Hélipad" }, "aeroway/runway": { - "name": "Piste d'atterissage", + "name": "Piste d’atterrissage", "terms": "Piste de décollage, Piste d'atterissage, Piste" }, "aeroway/taxiway": { @@ -772,13 +810,17 @@ "name": "Équipements", "terms": "Commodité" }, + "amenity/arts_centre": { + "name": "Centre d'art", + "terms": "Centre artistique" + }, "amenity/atm": { "name": "Distributeur de billets", - "terms": "Distributeur de Billets" + "terms": "Distributeur de billets, guichet automatique, ATM" }, "amenity/bank": { "name": "Banque", - "terms": "Banque" + "terms": "Banque, Caisse populaire" }, "amenity/bar": { "name": "Bar", @@ -789,60 +831,64 @@ "terms": "Banc" }, "amenity/bicycle_parking": { - "name": "Parking à vélos ", - "terms": "Parking à Vélo, Parking à Bicyclette" + "name": "Parc à vélo", + "terms": "Parking à vélo, Parking à bicyclette, Stationnement à vélo" }, "amenity/bicycle_rental": { "name": "Location de vélos", - "terms": "Location de Vélo, Location de Bicyclette" + "terms": "Location de vélo, Location de bicyclette" + }, + "amenity/boat_rental": { + "name": "Location de bateau", + "terms": "Location de bateaux" }, "amenity/cafe": { "name": "Café", "terms": "Café" }, "amenity/car_rental": { - "name": "Location de Voiture", - "terms": "Location de Voiture" + "name": "Location de voiture", + "terms": "Location de voiture" }, "amenity/car_sharing": { - "name": "Partage de Voiture", - "terms": "Partage de Voiture" + "name": "Autopartage", + "terms": "Autopartage, partage de voitures" }, "amenity/car_wash": { - "name": "Lavage de voiture", - "terms": "Lavage de Voiture" + "name": "Lavage de voiture, Lave auto", + "terms": "Lavage de voiture, lave auto" }, "amenity/childcare": { "name": "Garderie", - "terms": "Garderie, Nurserie, École des devoirs" + "terms": "Garderie, nurserie, école des devoirs" }, "amenity/cinema": { "name": "Cinéma", "terms": "Cinéma" }, "amenity/college": { - "name": "Enseignement Supérieur", - "terms": "Institut, École supérieure, Enseignement supérieur, Haute école" + "name": "Enseignement supérieur (non universitaire)", + "terms": "Institut, École supérieure, Enseignement supérieur, Haute école, CÉGEP, cégep" }, "amenity/courthouse": { "name": "Tribunal", "terms": "Palais de Justice, Tribunal" }, "amenity/drinking_water": { - "name": "Eau Potable", - "terms": "Eau Potable" + "name": "Eau potable", + "terms": "Eau potable" }, "amenity/embassy": { "name": "Embassade", "terms": "Embassade" }, "amenity/fast_food": { - "name": "Fast Food,Restauration rapide", + "name": "Restauration rapide", "terms": "Fast Food, Restauration Rapide" }, "amenity/fire_station": { "name": "Caserne de pompiers", - "terms": "Station de Pompiers, Caserne de Pompiers" + "terms": "Station de pompiers, Caserne de pompiers" }, "amenity/fountain": { "name": "Fontaine", @@ -850,7 +896,7 @@ }, "amenity/fuel": { "name": "Station service", - "terms": "Station Essence, Station Service" + "terms": "Station essence, Station service" }, "amenity/grave_yard": { "name": "Cimetière", @@ -873,8 +919,8 @@ "terms": "Marché" }, "amenity/parking": { - "name": "Parking", - "terms": "Parking, Zone de Stationnement, Stationnement" + "name": "Parc de stationnement", + "terms": "Parc de stationnement, parking" }, "amenity/pharmacy": { "name": "Pharmacie", @@ -882,11 +928,11 @@ }, "amenity/place_of_worship": { "name": "Lieu de culte", - "terms": "Edifice Religieux" + "terms": "Édifice religieux" }, "amenity/place_of_worship/buddhist": { - "name": "Temple Boudhiste", - "terms": "Temple Boudhiste" + "name": "Temple boudhiste", + "terms": "Temple boudhiste" }, "amenity/place_of_worship/christian": { "name": "Église", @@ -906,16 +952,20 @@ }, "amenity/post_box": { "name": "Boîte aux lettres", - "terms": "Boîte aux Lettres" + "terms": "Boîte aux lettres" }, "amenity/post_office": { "name": "Bureau de poste", - "terms": "Bureau de Poste" + "terms": "Bureau de poste" }, "amenity/pub": { "name": "Pub", "terms": "Pub" }, + "amenity/ranger_station": { + "name": "Poste de garde", + "terms": "Poste de garde, gardien" + }, "amenity/restaurant": { "name": "Restaurant", "terms": "Restaurant" @@ -929,8 +979,8 @@ "terms": "Piscine" }, "amenity/taxi": { - "name": "Station de Taxi", - "terms": "Station de Taxi" + "name": "Station de taxi", + "terms": "Station de taxi" }, "amenity/telephone": { "name": "Téléphone", @@ -952,6 +1002,10 @@ "name": "Université", "terms": "Université" }, + "amenity/vending_machine": { + "name": "Machine distributrice", + "terms": "Machine distributrice" + }, "amenity/waste_basket": { "name": "Corbeille", "terms": "Corbeille, Poubelle" @@ -965,7 +1019,8 @@ "terms": "Barrière" }, "barrier/block": { - "name": "Bloc" + "name": "Bloc", + "terms": "Bloc de béton" }, "barrier/bollard": { "name": "Poteau", @@ -973,7 +1028,7 @@ }, "barrier/cattle_grid": { "name": "Grille à bétail", - "terms": "Passage Canadien" + "terms": "Passage canadien" }, "barrier/city_wall": { "name": "Mur d'enceinte", @@ -1005,7 +1060,7 @@ }, "barrier/kissing_gate": { "name": "Portillon à chicane mobile", - "terms": "Portillon à Chicanes" + "terms": "Portillon à chicanes" }, "barrier/lift_gate": { "name": "Barrière levante", @@ -1029,7 +1084,7 @@ }, "boundary/administrative": { "name": "Frontière administrative", - "terms": "Frontière Administrative" + "terms": "Frontière administrative" }, "building": { "name": "Bâtiment", @@ -1040,8 +1095,8 @@ "terms": "Appartements" }, "building/commercial": { - "name": "Bâtiment Commercial", - "terms": "Bâtiment Commercial" + "name": "Bâtiment commercial", + "terms": "Bâtiment commercial" }, "building/entrance": { "name": "Entrée", @@ -1060,24 +1115,24 @@ "terms": "Hutte" }, "building/industrial": { - "name": "Bâtiment Industriel", - "terms": "Bâtiment Industriel" + "name": "Bâtiment industriel", + "terms": "Bâtiment industriel" }, "building/residential": { - "name": "Bâtiment Résidentiel", - "terms": "Bâtiment Résidentiel" + "name": "Bâtiment résidentiel", + "terms": "Bâtiment résidentiel" }, "emergency/ambulance_station": { "name": "Station d'ambulance", - "terms": "Station d'ambulances" + "terms": "Station d'ambulance" }, "emergency/fire_hydrant": { "name": "Borne incendie", - "terms": "Borne incendie" + "terms": "Borne incendie, borne-fontaine, borne fontaine, bouche d'incendie" }, "emergency/phone": { "name": "Téléphone d'urgence", - "terms": "Téléphone d'Urgence" + "terms": "Téléphone d'urgence" }, "entrance": { "name": "Entrée", @@ -1089,11 +1144,11 @@ }, "highway/bridleway": { "name": "Sentier équestre", - "terms": "Piste Cavalière, Sentier à Chevaux, Sentier Pour Chevaux" + "terms": "Piste cavalière, Sentier à chevaux, Sentier pour chevaux" }, "highway/bus_stop": { "name": "Arrêt de bus", - "terms": "Arrêt de Bus" + "terms": "Arrêt de bus" }, "highway/crossing": { "name": "Passage piéton", @@ -1101,7 +1156,7 @@ }, "highway/cycleway": { "name": "Voie cyclable", - "terms": "Piste Cyclable" + "terms": "Piste cyclable" }, "highway/footway": { "name": "Voie piétonne", @@ -1109,11 +1164,11 @@ }, "highway/living_street": { "name": "Zone de rencontre", - "terms": "Zone de Rencontre" + "terms": "Zone de rencontre" }, "highway/mini_roundabout": { "name": "Mini rond-point", - "terms": "Mini Rond-Point" + "terms": "Mini rond-point" }, "highway/motorway": { "name": "Autoroute", @@ -1121,11 +1176,11 @@ }, "highway/motorway_junction": { "name": "Bretelle d'autoroute", - "terms": "Echangeur Autoroutier" + "terms": "Échangeur autoroutier" }, "highway/motorway_link": { "name": "Bretelle d'autoroute", - "terms": "Bretelle d'Autoroute" + "terms": "Bretelle d'autoroute" }, "highway/path": { "name": "Chemin non carrossable", @@ -1137,7 +1192,7 @@ }, "highway/primary": { "name": "Route principale", - "terms": "Route Principale" + "terms": "Route principale" }, "highway/primary_link": { "name": "Voie d'accès à une route primaire", @@ -1145,15 +1200,15 @@ }, "highway/residential": { "name": "Route résidentielle", - "terms": "Route Résidentielle" + "terms": "Route résidentielle" }, "highway/road": { "name": "Voie de type inconnu", - "terms": "Route Inconnue" + "terms": "Route inconnue" }, "highway/secondary": { "name": "Route secondaire", - "terms": "Route Secondaire" + "terms": "Route secondaire" }, "highway/secondary_link": { "name": "Voie d'accès à une route secondaire", @@ -1161,7 +1216,7 @@ }, "highway/service": { "name": "Route d'accès", - "terms": "Route de Service" + "terms": "Route de service" }, "highway/service/alley": { "name": "Ruelle", @@ -1177,18 +1232,19 @@ }, "highway/service/emergency_access": { "name": "Accès d'urgence", - "terms": "Accès d'Urgence" + "terms": "Accès d'urgence" }, "highway/service/parking_aisle": { "name": "Allée de parking", - "terms": "Allée de parking" + "terms": "Allée de parking, allée de stationnement" }, "highway/steps": { "name": "Escalier", "terms": "Escalier" }, "highway/stop": { - "name": "Paneau Stop" + "name": "Panneau Stop", + "terms": "Arrêt" }, "highway/tertiary": { "name": "Route tertiaire", @@ -1204,11 +1260,11 @@ }, "highway/traffic_signals": { "name": "Feux tricolores", - "terms": "Feux de circulation, Feux rouges" + "terms": "Feux de circulation, Feux rouges, Lumière rouge" }, "highway/trunk": { "name": "Voie rapide", - "terms": "Voie rapide,voie express" + "terms": "Voie rapide, voie express" }, "highway/trunk_link": { "name": "Voie d'accès à une voie rapide", @@ -1224,14 +1280,15 @@ }, "historic": { "name": "Site historique", - "terms": "Site Historique" + "terms": "Site historique" }, "historic/archaeological_site": { "name": "Site archéologique", - "terms": "Site Archéologique" + "terms": "Site archéologique" }, "historic/boundary_stone": { - "name": "Borne frontière" + "name": "Borne frontière", + "terms": "Borne frontière" }, "historic/castle": { "name": "Château", @@ -1251,19 +1308,19 @@ }, "historic/wayside_cross": { "name": "Croix/Calvaire", - "terms": "Une Croix au bord d'un chemin" + "terms": "Une croix au bord d'un chemin" }, "historic/wayside_shrine": { "name": "Bildstock", - "terms": "tombeau historique, oratoire, autel, calvaire" + "terms": "Tombeau historique, oratoire, autel, calvaire" }, "landuse": { "name": "Type de terrain", - "terms": "Utilisation du Terrain" + "terms": "Utilisation du terrain" }, "landuse/allotments": { "name": "Jardins familiaux", - "terms": "Jardins familiaux, Eco-Jardins" + "terms": "Jardins familiaux, eco-jardins, jardins communautaires, jardin communautaire" }, "landuse/basin": { "name": "Bassin", @@ -1287,7 +1344,7 @@ }, "landuse/farmyard": { "name": "Bâtiments de ferme", - "terms": "Cour de Ferme" + "terms": "Cour de ferme" }, "landuse/forest": { "name": "Forêt", @@ -1329,9 +1386,13 @@ "name": "Loisirs", "terms": "Loisir" }, + "leisure/common": { + "name": "Terrain communal", + "terms": "Terrain communal, bien communal, bois communal, pré communal" + }, "leisure/dog_park": { - "name": "Parc Canin", - "terms": "Parc Canin" + "name": "Parc canin", + "terms": "Parc canin, parc à chiens" }, "leisure/garden": { "name": "Jardin", @@ -1339,7 +1400,7 @@ }, "leisure/golf_course": { "name": "Parcours de golf", - "terms": "Golf, Terrain de Golf, Parcours de Golf" + "terms": "Golf, Terrain de golf, Parcours de golf" }, "leisure/marina": { "name": "Marina", @@ -1351,39 +1412,47 @@ }, "leisure/pitch": { "name": "Terrain de sport", - "terms": "Terrain de Sport" + "terms": "Terrain de sport" }, "leisure/pitch/american_football": { "name": "Terrain de football américain", - "terms": "Terrain de Football Américain" + "terms": "Terrain de football américain" }, "leisure/pitch/baseball": { "name": "Terrain de baseball", - "terms": "Terrain de Base-ball" + "terms": "Terrain de base-ball" }, "leisure/pitch/basketball": { "name": "Terrain de basketball", - "terms": "Terrain de Basket" + "terms": "Terrain de basket, terrain de basketball" + }, + "leisure/pitch/skateboard": { + "name": "Planchodrome", + "terms": "Planchodrome, skate park" }, "leisure/pitch/soccer": { "name": "Terrain de football", - "terms": "Terrain de Football" + "terms": "Terrain de football, terrain de soccer" }, "leisure/pitch/tennis": { "name": "Court de tennis", - "terms": "Court de Tennis" + "terms": "Court de tennis, terrain de tennis" }, "leisure/pitch/volleyball": { "name": "Terrain de volleyball", - "terms": "Terrain de Volleyball" + "terms": "Terrain de volleyball" }, "leisure/playground": { "name": "Jeux pour enfants", - "terms": "Aire de Jeu, Cour de Récréation" + "terms": "Aire de Jeu, Cour de récréation" }, "leisure/slipway": { "name": "Plan incliné", - "terms": "Cale de Lancement" + "terms": "Cale de lancement" + }, + "leisure/sports_center": { + "name": "Centre sportif", + "terms": "Centre sportif" }, "leisure/stadium": { "name": "Stade", @@ -1393,25 +1462,34 @@ "name": "Piscine", "terms": "Piscine" }, + "leisure/track": { + "name": "Piste de course", + "terms": "Piste de course" + }, "line": { "name": "Ligne", "terms": "Ligne" }, "man_made": { "name": "Édifices", - "terms": "Créé par l'Homme" + "terms": "Créé par l'homme" }, "man_made/breakwater": { "name": "Brise-lames", "terms": "Brise-lames" }, "man_made/cutline": { - "name": "Ligne de coupe" + "name": "Ligne de coupe", + "terms": "ligne de coupe forestière" }, "man_made/lighthouse": { "name": "Phare", "terms": "Phare" }, + "man_made/observation": { + "name": "Tour d'observation", + "terms": "Tour d'observation, Mirador" + }, "man_made/pier": { "name": "Jetée", "terms": "Quai" @@ -1421,7 +1499,8 @@ "terms": "Pipeline, Gazoduc, Oleoduc" }, "man_made/survey_point": { - "name": "Poteau de triangulation" + "name": "Poteau de triangulation", + "terms": "Borne géodésique, monument géodésique, repère géodésique" }, "man_made/tower": { "name": "Tour", @@ -1440,10 +1519,12 @@ "terms": "Puits d'eau, Puits" }, "man_made/water_works": { - "name": "Station de pompage d'eau potable" + "name": "Station de pompage d'eau potable", + "terms": "Station de pompage" }, "natural": { - "name": "Nature" + "name": "Nature", + "terms": "Nature" }, "natural/bay": { "name": "Baie", @@ -1459,7 +1540,11 @@ }, "natural/coastline": { "name": "Ligne de côte", - "terms": "Ligne de Côte" + "terms": "Ligne de côte" + }, + "natural/fell": { + "name": "Tunturi (type de montagne)", + "terms": "Tunturi, montagne, colline" }, "natural/glacier": { "name": "Glacier", @@ -1477,6 +1562,10 @@ "name": "Sommet", "terms": "Pic, Mont" }, + "natural/scree": { + "name": "Pierrier", + "terms": "Pierrier" + }, "natural/scrub": { "name": "Friche, garrigue, maquis", "terms": "Broussailles" @@ -1507,7 +1596,7 @@ }, "natural/wetland": { "name": "Zone humide", - "terms": "Zone Humide, Marais, Marécage" + "terms": "Zone humide, Marais, Marécage" }, "natural/wood": { "name": "Bois", @@ -1517,6 +1606,62 @@ "name": "Bureau", "terms": "Bureau" }, + "office/accountant": { + "name": "Comptable", + "terms": "Comptable" + }, + "office/administrative": { + "name": "Bureau administratif", + "terms": "Bureau administratif" + }, + "office/architect": { + "name": "Architecte", + "terms": "Architecte" + }, + "office/company": { + "name": "Bureau d'entreprise", + "terms": "Bureau d'entreprise, Siège social" + }, + "office/educational_institution": { + "name": "Établissement d'enseignement", + "terms": "Établissement d'enseignement" + }, + "office/employment_agency": { + "name": "Agence pour l'emploi", + "terms": "Agence pour l'emploi" + }, + "office/estate_agent": { + "name": "Agence immobilière", + "terms": "Agence immobilière" + }, + "office/insurance": { + "name": "Agence d'assurance", + "terms": "Agence d'assurance" + }, + "office/lawyer": { + "name": "Cabinet d'avocats", + "terms": "Cabinet d'avocats" + }, + "office/physician": { + "name": "Médecin", + "terms": "Médecin, Docteur" + }, + "office/political_party": { + "name": "Parti politique", + "terms": "Parti politique" + }, + "office/telecommunication": { + "name": "Agence télécom", + "terms": "Agence télécom" + }, + "office/therapist": { + "name": "Thérapeute", + "terms": "Thérapeute, Soigneur" + }, + "office/travel_agent": { + "name": "Agence de voyage", + "terms": "Agence de voyage" + }, "place": { "name": "Toponymie", "terms": "Lieu" @@ -1535,7 +1680,7 @@ }, "place/isolated_dwelling": { "name": "Lieu-dit habité", - "terms": "Habitation Isolée" + "terms": "Habitation isolée" }, "place/locality": { "name": "Lieu-dit", @@ -1557,10 +1702,18 @@ "name": "Énergie", "terms": "Electricité" }, + "power/generator": { + "name": "Génératrice", + "terms": "Génératrice" + }, "power/line": { "name": "Câble aérien", "terms": "Ligne électrique" }, + "power/minor_line": { + "name": "Ligne électrique mineure", + "terms": "Ligne électrique mineure" + }, "power/pole": { "name": "Poteau", "terms": "Pylone électrique, Poteau éléctrique" @@ -1571,7 +1724,7 @@ }, "power/tower": { "name": "Pylône haute-tension ", - "terms": "Pylône Haute-Tension" + "terms": "Pylône haute-tension" }, "power/transformer": { "name": "Transformateur", @@ -1579,19 +1732,23 @@ }, "railway": { "name": "Ferroviaire", - "terms": "Voie Ferrée, Chemin de Fer" + "terms": "Voie ferrée, Chemin de fer" }, "railway/abandoned": { "name": "Voie ferrée désaffectée", - "terms": "Voie Ferrée Abandonnée" + "terms": "Voie ferrée abandonnée" }, "railway/disused": { "name": "Voie ferrée désaffectée", - "terms": "Voie Ferrée Non Utilisée" + "terms": "Voie ferrée non utilisée" + }, + "railway/halt": { + "name": "Hall de gare", + "terms": "Halte ferroviaire" }, "railway/level_crossing": { "name": "Passage à niveau", - "terms": "Passage à Niveau" + "terms": "Passage à niveau, traverse de chemin de fer" }, "railway/monorail": { "name": "Monorail", @@ -1599,7 +1756,7 @@ }, "railway/platform": { "name": "Quai de gare", - "terms": "Quai de Gare" + "terms": "Quai de gare" }, "railway/rail": { "name": "Voie ferrée", @@ -1607,7 +1764,7 @@ }, "railway/station": { "name": "Gare", - "terms": "Gare Ferroviaire, Gare" + "terms": "Gare ferroviaire, Gare" }, "railway/subway": { "name": "Métro", @@ -1615,7 +1772,7 @@ }, "railway/subway_entrance": { "name": "Bouche de métro", - "terms": "Entrée de Métro, Bouche de Métro" + "terms": "Entrée de métro, Bouche de métro" }, "railway/tram": { "name": "Tramway", @@ -1623,10 +1780,10 @@ }, "relation": { "name": "Relation", - "terms": "Relatio" + "terms": "Relation" }, "route/ferry": { - "name": "Trajet de Ferry", + "name": "Trajet de ferry", "terms": "Ligne de Ferry" }, "shop": { @@ -1635,28 +1792,31 @@ }, "shop/alcohol": { "name": "Magasin de vente d'alcool", - "terms": "Cave, Caviste, Magasin de Vin, Vins & Spiritueux" + "terms": "Cave, Caviste, Magasin de vin, Vins & Spiritueux" }, "shop/bakery": { "name": "Boulangerie", "terms": "Boulangerie" }, "shop/beauty": { - "name": "Salon de beauté" + "name": "Salon de beauté", + "terms": "Salon de beauté, Institut de beauté" }, "shop/beverages": { - "name": "Vente de boissons alcolisées" + "name": "Vente de boissons alcolisées", + "terms": "Magasin de vins et spiritueux" }, "shop/bicycle": { "name": "Magasin de vélos", - "terms": "Magasin de Vélo" + "terms": "Magasin de vélo" }, "shop/books": { "name": "Librairie", "terms": "Librairie" }, "shop/boutique": { - "name": "Petit magasin de mode" + "name": "Petit magasin de mode", + "terms": "Boutique" }, "shop/butcher": { "name": "Boucher", @@ -1668,11 +1828,11 @@ }, "shop/car_parts": { "name": "Magasin de pièces automobiles", - "terms": "Magasin de Pièces Automobiles" + "terms": "Magasin de pièces automobiles" }, "shop/car_repair": { "name": "Garage", - "terms": "Garage" + "terms": "Garage, atelier de mécanique automobile" }, "shop/chemist": { "name": "Pharmacie", @@ -1680,27 +1840,31 @@ }, "shop/clothes": { "name": "Magasin de vêtements", - "terms": "Magasin de Vêtements" + "terms": "Magasin de vêtements" }, "shop/computer": { "name": "Magasin d'informatique", - "terms": "Magasin d'Informatique" + "terms": "Magasin d'informatique" }, "shop/confectionery": { - "name": "Confiserie" + "name": "Confiserie", + "terms": "Confiserie" }, "shop/convenience": { - "name": "Magasin d'appoint" + "name": "Magasin d'appoint", + "terms": "Dépanneur" }, "shop/deli": { "name": "Épicerie de luxe", - "terms": "Epicerie Fine, Traiteur" + "terms": "Epicerie fine, Traiteur" }, "shop/department_store": { - "name": "Grand magasin" + "name": "Grand magasin", + "terms": "Magasin à rayon, grand magasin, magasin par départements" }, "shop/doityourself": { - "name": "Magasin de bricolage" + "name": "Magasin de bricolage", + "terms": "Magasin pour la fait à la main" }, "shop/dry_cleaning": { "name": "Nettoyage à sec", @@ -1711,7 +1875,8 @@ "terms": "Magasin d'électronique" }, "shop/farm": { - "name": "Étal de Fruits et Légumes" + "name": "Étal de fruits et légumes", + "terms": "Étal de fruits et légumes" }, "shop/fishmonger": { "name": "Poissonnerie", @@ -1722,112 +1887,136 @@ "terms": "Fleuriste" }, "shop/furniture": { - "name": "Magasin de meubles" + "name": "Magasin de meubles", + "terms": "Magasin de meubles" }, "shop/garden_centre": { "name": "Magasin spécialiste du jardin", - "terms": "Jardinerie" + "terms": "Jardinerie, centre de jardinage" }, "shop/gift": { - "name": "Boutique de cadeaux,Boutique de souvenirs", + "name": "Boutique de cadeaux, Boutique de souvenirs", "terms": "Boutique de souvenirs" }, "shop/greengrocer": { - "name": "Primeur", - "terms": "Marchand de fruits et légumes, Maraicher" + "name": "Marchand de fruits et légumes", + "terms": "Fruiterie, Marchand de fruits et légumes, Maraicher, Maraîcher, Primeur" }, "shop/hairdresser": { "name": "Salon de coiffure", "terms": "Coiffeur" }, "shop/hardware": { - "name": "Quincaillerie" + "name": "Quincaillerie", + "terms": "Quincaillerie" }, "shop/hifi": { - "name": "Magasin de matériel hi-fi" + "name": "Magasin de matériel hi-fi", + "terms": "Magasin d'appareils audio-visuel" }, "shop/jewelry": { "name": "Bijouterie", "terms": "Bijoutier" }, "shop/kiosk": { - "name": "Kiosque" + "name": "Kiosque", + "terms": "Kiosque" }, "shop/laundry": { "name": "Laverie", "terms": "Laverie" }, + "shop/locksmith": { + "name": "Serrurier", + "terms": "Serrurier" + }, "shop/mall": { - "name": "Centre commercial" + "name": "Centre commercial", + "terms": "Centre d'achat" }, "shop/mobile_phone": { "name": "Magasin de téléphonie mobile", - "terms": "Vente de téléphone portable" + "terms": "Vente de téléphone portable, magasin de téléphones portables" }, "shop/motorcycle": { - "name": "Vendeur de motos" + "name": "Vendeur de motos", + "terms": "Vendeur de motos" }, "shop/music": { - "name": "Vente d'instruments de musique" + "name": "Vente d'instruments de musique", + "terms": "Magasin de musique" }, "shop/newsagent": { - "name": "Kiosque à journaux" + "name": "Kiosque à journaux", + "terms": "Kiosque à journaux" }, "shop/optician": { "name": "Opticien", "terms": "Opticien" }, "shop/outdoor": { - "name": "Magasin d'équipement de randonnée" + "name": "Magasin de plein air", + "terms": "Magasin d'équipement de randonnée, magasin de plein air" }, "shop/pet": { "name": "Animalerie", "terms": "Animalerie" }, + "shop/photo": { + "name": "Tirage de photos", + "terms": "Photographe, Tirage de photos" + }, "shop/shoes": { "name": "Magasin de chaussures", "terms": "Magasin de chaussures" }, "shop/sports": { - "name": "Magasin d'équipement sportif" + "name": "Magasin d'équipement sportif", + "terms": "Magasin d'équipement sportif" }, "shop/stationery": { - "name": "Papeterie" + "name": "Papeterie", + "terms": "Papeterie" }, "shop/supermarket": { "name": "Supermarché", - "terms": "Supermarché" + "terms": "Supermarché, épicerie" }, "shop/toys": { "name": "Magasin de jouets", - "terms": "Magasin de Jouets" + "terms": "Magasin de jouets" }, "shop/travel_agency": { "name": "Agence de voyages", "terms": "Agence de voyage" }, "shop/tyres": { - "name": "Magasin de pneus" + "name": "Magasin de pneus", + "terms": "Magasin de pneus" }, "shop/vacant": { - "name": "Commerce désaffecté" + "name": "Commerce désaffecté", + "terms": "Espace vacant, lot vacant" }, "shop/variety_store": { - "name": "Magasin à prix unique" + "name": "Magasin à prix unique", + "terms": "Magasin à 1$, magasin à un dollar" }, "shop/video": { - "name": "Vidéo-club" + "name": "Vidéo-club", + "terms": "Club vidéo" }, "tourism": { "name": "Tourisme", "terms": "Tourisme" }, "tourism/alpine_hut": { - "name": "Refuge de montagne" + "name": "Refuge de montagne", + "terms": "Refuge de montagne, cabane" }, "tourism/artwork": { "name": "Œuvre d'art", - "terms": "Oeuvre d'art,Œuvre d'art" + "terms": "Œuvre d'art" }, "tourism/attraction": { "name": "Attraction touristique", @@ -1838,27 +2027,32 @@ "terms": "Camping" }, "tourism/caravan_site": { - "name": "Aire pour caravanes" + "name": "Aire pour caravanes", + "terms": "Aire pour caravanes" }, "tourism/chalet": { - "name": "Chalet" + "name": "Chalet", + "terms": "Chalet" }, "tourism/guest_house": { "name": "Chambre d'hôtes", - "terms": "Chambre d'hôtes,Gîte" + "terms": "Chambre d'hôtes, Gîte" }, "tourism/hostel": { - "name": "Auberge de jeunesse" + "name": "Auberge de jeunesse", + "terms": "Auberge de jeunesse" }, "tourism/hotel": { "name": "Hôtel", - "terms": "Hôtel,Hotel" + "terms": "Hôtel" }, "tourism/information": { - "name": "Office de tourisme" + "name": "Office de tourisme", + "terms": "Renseignements" }, "tourism/motel": { - "name": "Motel" + "name": "Motel", + "terms": "Motel" }, "tourism/museum": { "name": "Musée", @@ -1870,73 +2064,95 @@ }, "tourism/theme_park": { "name": "Parc d'attraction", - "terms": "Parc à thème" + "terms": "Parc à thème, parc d'attractions" }, "tourism/viewpoint": { "name": "Point de vue", - "terms": "Point de vue" + "terms": "Point de vue, observatoire, mirador" }, "tourism/zoo": { "name": "Zoo", "terms": "Zoo" }, "type/boundary": { - "name": "Frontière" + "name": "Frontière", + "terms": "Frontière" }, "type/boundary/administrative": { - "name": "Frontière Administrative" + "name": "Frontière administrative", + "terms": "Frontières administratives, frontière administrative" }, "type/multipolygon": { - "name": "Multi-polygone" + "name": "Multipolygone", + "terms": "Multi-polygone" }, "type/restriction": { - "name": "Restriction" + "name": "Restriction", + "terms": "Restriction" }, "type/route": { - "name": "Route" + "name": "Route", + "terms": "Route, rue, chemin, sentier" }, "type/route/bicycle": { - "name": "Trajet Cyclable" + "name": "Trajet Cyclable", + "terms": "Piste cyclable" }, "type/route/bus": { - "name": "Trajet de Bus" + "name": "Trajet de Bus", + "terms": "Trajet d'autobus" }, "type/route/detour": { - "name": "Trajet de Contournement" + "name": "Trajet de Contournement", + "terms": "Détour" }, "type/route/ferry": { - "name": "Trajet de Ferry" + "name": "Trajet de Ferry", + "terms": "Route de traversier, Ligne de ferry" }, "type/route/foot": { - "name": "Trajet Pédestre" + "name": "Trajet pédestre", + "terms": "Sentier" + }, + "type/route/hiking": { + "name": "Sentier pédestre", + "terms": "Sentier pédestre" }, "type/route/pipeline": { - "name": "Trajet de Pipeline" + "name": "Trajet de pipeline", + "terms": "Pipeline, gazoduc, oléoduc" }, "type/route/power": { - "name": "Trajet Electrique" + "name": "Ligne électrique", + "terms": "Ligne électrique" }, "type/route/road": { - "name": "Trajet Routier" + "name": "Trajet routier", + "terms": "Route, rue, chemin, sentier" }, "type/route/train": { - "name": "Trajet Ferroviaire" + "name": "Trajet ferroviaire", + "terms": "Voie ferrée, chemin de fer" }, "type/route/tram": { - "name": "Trajet de Tramway" + "name": "Trajet de tramway", + "terms": "Route de tramway" }, "type/route_master": { - "name": "Route Parente" + "name": "Route parente", + "terms": "Relation principale, route master" }, "vertex": { - "name": "Autre" + "name": "Autre", + "terms": "Autres" }, "waterway": { - "name": "Eau", - "terms": "Voie d'eau,Cours d'eau" + "name": "Voie navigable", + "terms": "Voie d'eau, Cours d'eau" }, "waterway/canal": { - "name": "Canal" + "name": "Canal", + "terms": "Canal" }, "waterway/dam": { "name": "Barrage", @@ -1947,21 +2163,24 @@ "terms": "Fossé" }, "waterway/drain": { - "name": "Canal d'évacuation d'eau pluviale" + "name": "Canal d'évacuation d'eau pluviale", + "terms": "Drain" }, "waterway/river": { "name": "Rivière", "terms": "Rivière" }, "waterway/riverbank": { - "name": "Berge" + "name": "Berge", + "terms": "Berge" }, "waterway/stream": { "name": "Cours d'eau étroit", "terms": "Ruisseau" }, "waterway/weir": { - "name": "Seuil" + "name": "Seuil", + "terms": "Seuil" } } } diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json index 8b687b9b6..3df65c3c4 100644 --- a/vendor/assets/iD/iD/locales/hr.json +++ b/vendor/assets/iD/iD/locales/hr.json @@ -83,7 +83,8 @@ "annotation": { "line": "Kutovi linije su pod pravim kutom.", "area": "Kutovi područja su pod pravim kutom." - } + }, + "not_squarish": "Ovo se ne može ukvadratičiti jer nije kvadratičastog oblika." }, "straighten": { "title": "Izravnaj", @@ -246,15 +247,18 @@ "back_tooltip": "Promijeni svojstvo", "remove": "Ukloni", "search": "Pretraži", + "multiselect": "Odabrane stavke", "unknown": "Nepoznato", "incomplete": "", "feature_list": "Pretraži svojstva", - "edit": "Uredi svojstvo" + "edit": "Uredi svojstvo", + "none": "Nijedna" }, "background": { "title": "Pozadina", "description": "Postavke pozadine", "percent_brightness": "{opacity}% svjetline", + "none": "Nijedna", "custom": "Podesivo", "custom_prompt": "Unesi predložak za popločavanje. Ispravni znakovi su {z}, {x}, {y} za Z/X/Y shemu i {u} za quadtile shemu.", "fix_misalignment": "Popravi odstupanje", @@ -317,7 +321,9 @@ "cannot_zoom": "Nemoguće smanjiti povećanje u trenutnom môdu.", "gpx": { "local_layer": "Lokalna GPX datoteka", - "drag_drop": "Dovuci i ispusti .gpx datoteku na stranicu" + "drag_drop": "Dovuci i ispusti .gpx datoteku na stranicu ili klikni gumb s desne strane za pretraživanje datoteka.", + "zoom": "Povećaj na GPX putanju", + "browse": "Potraži .gpx datoteku" }, "help": { "title": "Pomoć", @@ -325,9 +331,9 @@ "editing_saving": "# Uređivanje i spremanje promjena\n\nOvaj uređivač je primarno dizajniran za uređivanje na mreži i trenutačno ga\nkoristiÅ¡ kroz internet preglednik kao web stranicu.\n\n### Odabir značajki\n\nZa odabir značajke karte, npr. ceste ili točke od interesa, klikni na nju na karti.\nPojaviti će se obrub oko značajke, otvoriti će se bočno okno koje prikazuje viÅ¡e\ndetalja o značajki i prikazati će se alatni izbornik sa mogućnostima koje možeÅ¡\nnapraviti na značajki.\n\nZa odabir nekoliko značajki istovremeno, drži tipku \"Shift\". Zatim ili klikni na\nznačajke koje želiÅ¡ odabrati ili klikni i povuci za crtanje četverokuta. Time ćeÅ¡\nodabrati sve točke unutar četverokuta.\n\n### Spremanje uređivanja\n\nKada napraviÅ¡ promjene na karti, npr. urediÅ¡ ulice, zgrade i mjesta, one su\nspremljene lokalno sve dok ih ne spremiÅ¡ na server. NemoraÅ¡ se briniti ukoliko\nnapraviÅ¡ pogreÅ¡ku - možeÅ¡ poniÅ¡titi promjene klikom na tipku \"Opovrgni\" i\nponoviti promjene klikom na tipku \"Ponovi\".\n\nKlikni na tipku \"Spremi\" da zavrÅ¡iÅ¡ grupu promjena - na primjer ako si zavrÅ¡io/la\npodručje grada i želiÅ¡ početi uređivati novo područje. Nakon Å¡to stisneÅ¡ \"Spremi\"\nmoći ćeÅ¡ pregledati sve promjene koje si napravio/la i uređivač će ti dati korisne\nprijedloge i upozorenja ako je neÅ¡to neuobičajeno među promjenama.\n\nAko je sve u redu, možeÅ¡ ostaviti kratak komentar u kojem ćeÅ¡ opisati napravljenu\npromjenu na karti. Ponovno klikni \"Spremi\" za postavljanje promjena na\n[OpenStreetMap.org](http://www.openstreetmap.org/), gdje će biti vidljive svim\ndrugim korisnicima i dostupne drugima za dopunu i nadogradnju.\n\nAko ne možeÅ¡ zavrÅ¡iti sve planirane promjene odjednom, možeÅ¡ ugasiti prozor\nuređivača i kasnije se vratiti (na isti internet preglednik i isto računalo) i uređivač\nće ti ponuditi da nastaviÅ¡ gdje si stao/la. \n", "roads": "# Ceste\n\nMožeÅ¡ stvarati, popraviti/urediti i obrisati ceste pomoću ovog uređivača. Ceste\nmogu biti svih vrsta: puteljci, ceste, poljski putovi, biciklističke staze i drugo -\nsve staze preko kojih se često prolazi bi se trebale kartirati.\n\n### Odabir\n\nKlikni na cestu da ju odabereÅ¡. Pojaviti će se obrub oko ceste, zajedno s\nmalim alatnim izbornikom na karti i bočnim oknom koji prikazuje dodatne\ninformacije o selektiranoj cesti.\n\n### Uređivanje\n\nČesto ćeÅ¡ vidjeti ceste koje se ne podudaraju s pozadinskim snimcima ili s\nGNSS tragom. MožeÅ¡ urediti te ceste tako da se nalaze na ispravnom mjestu.\n\nPrvo klikni na cestu koju želiÅ¡ urediti. To će ju označiti i prikazati kontrolne\ntočke unutar nje koje možeÅ¡ premjestiti na točnije lokacije. Ako želiÅ¡ dodati\nnove kontrolne točke za precizniju putanju, klikni dvoklikom na dio ceste gdje\nnema točke kako bi dodao/la novu.\n\nAko se cesta spaja s drugom cestom, ali nije ispravno spojena na karti, možeÅ¡\npovući kontrolnu točku na drugu cestu kako bi ih spojio/la. Spojene ceste su\nvrlo važne za kartu i osnova za omogućavanje uputa za navigaciju.\n\nTakođer možeÅ¡ kliknuti alat \"Premjesti\" ili pritisnuti kraticu - tipku `M` za\npomak cijele ceste odjednom i zatim kliknuti ponovno za spremanje tog\npomaka.\n\n### Brisanje\n\nAko je cesta potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i ako\nsi utvrdio/la da zbilja ne postoji uvidom na terenu možeÅ¡ ju obrisati, Å¡to će ju\nobrisati s karte. Budi oprezan/na kada briÅ¡eÅ¡ značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je cesta nedavno sagrađena.\n\nZa brisanje ceste najprije ju označi, a zatim klikni na ikonicu kante za smeće ili\npritisni tipku \"Delete\".\n\n### Stvaranje\n\nAko si pronaÅ¡ao/la cestu koja bi trebala biti ucrtana ali nije, klikni ikonicu\n\"Linija\" na gornjem lijevom dijelu uređivača ili pritisni kraticu - tipku `2` da\nzapočneÅ¡ crtanje linije.\n\nKlikni na početak ceste na karti da započneÅ¡ crtanje. Ako se cesta odvaja od\npostojeće ceste, klikni na mjesto gdje se spajaju.\n\nZatim klikni na točke duž ceste tako da prate ispravnu putanju ceste, prema\npodacima satelitske snimke ili GNSS traga. Ako se cesta koju crtaÅ¡ križa s\ndrugom cestom, spoji ih klikom na mjestu raskrižja. Kada si zavrÅ¡io/la s\ncrtanjem, klikni dvoklikom sastrane ili pritisni tipku \"Return\" ili \"Enter\" na\ntipkovnici.\n", "gps": "# GNSS\n\nGNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke sa tvog računala.\nTakav oblik GNSS traga možeÅ¡ prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa viÅ¡e informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeÅ¡ također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n", - "imagery": "# Fotografski snimci\n\nZračni snimci su važan izvor za kartiranje. Kombinacija snimaka iz aviona,\nsatelitskih snimaka i drugih besplatno prikupljenih izvornika je dostupna s\ndesne strane u izborniku \"Postavke pozadine\".\n\nPočetno je u pozadini prikazan sloj satelitskih snimaka [karte Bing Maps](http://www.bing.com/maps/). Novi izvornici postaju dostupni pomicanjem\ni povećanjem karte na novo geografsko područje. Neke države,poput SAD-a,\nFrancuske i Danske imaju dostupne vrlo kvalitetne snimke za određena\npodručja.\n\nSnimke su ponekad pomaknute u odnosu na podatke karte zbog pogreÅ¡ke\nna koordinatama izvornih snimaka. Ako vidiÅ¡ puno cesta izmaknutih u\nodnosu na pozadinu, nemoj ih odmahpomicati da se poklope sa pozadinom.\nUmjesto toga, možeÅ¡ podesiti snimke da odgovaraju postojećim podacima\ntako da klikneÅ¡ \"Popravi odstupanje\" na dnu izbornika \"Postavke pozadine\".\n", + "imagery": "# Fotografski snimci\n\nZračni snimci su važan izvor za kartiranje. Kombinacija snimaka iz aviona,\nsatelitskih snimaka i drugih besplatno prikupljenih izvornika je dostupna s\ndesne strane u izborniku \"Postavke pozadine\".\n\nPočetno je u pozadini prikazan sloj satelitskih snimaka [karte Bing Maps](http://www.bing.com/maps/). Novi izvornici postaju dostupni pomicanjem\ni povećanjem karte na novo geografsko područje. Neke države, poput SAD-a,\nFrancuske i Danske imaju dostupne vrlo kvalitetne snimke za određena\npodručja.\n\nSnimke su ponekad pomaknute u odnosu na podatke karte zbog pogreÅ¡ke\nna koordinatama izvornih snimaka. Ako vidiÅ¡ puno cesta izmaknutih u\nodnosu na pozadinu, nemoj ih odmah pomicati da se poklope sa pozadinom.\nUmjesto toga, možeÅ¡ podesiti snimke da odgovaraju postojećim podacima\ntako da klikneÅ¡ \"Popravi odstupanje\" na dnu izbornika \"Postavke pozadine\".\n", "addresses": "# Adrese\n\nAdrese spadaju u najkorisnije informacije na karti.\n\nIako su adrese često prikazane kao dio ulica, na OpenStreetMap karti su zapisane\nkao svojstva građevina i mjesta uzduž ulica.\n\nMožeÅ¡ dodati informacije o adresi na mjesta kartirana kao rub građevine, ali i na\ngrađevine koje su kartirane kao točkasti objekt. Najbolji izvor podataka o adresama\nje prikupljanje podataka na terenu ili iz osobnog znanja - kao i svake druge\nznačajke, kopiranje sa komercijalnih izvora poput Google Maps servisa je strogo\nzabranjeno.\n", - "inspector": "# KoriÅ¡tenje preglednika\n\nPreglednik je element korisničkog sučelja na lijevoj strani stranice koji se pojavljuje\nnakon Å¡to se neka značajka odabere i on omogućava uređivanje detalja značajke.\n\n### Odabir vrste značajke\n\nNakon Å¡to dodaÅ¡ točku, liniju ili područje, možeÅ¡ odabrati koje je vrste ta značajka,\nnpr. je li to državna cesta ili ulica, veletrgovina ili kafić.\n\nPreglednik će prikazati tipke za često koriÅ¡tene vrste značajki, a ostale možeÅ¡\npronaći upisivanjem naziva vrste koju tražiÅ¡ u okvir za pretraživanje.\n\nKlikni na \"i\" na desnoj strani vrste značajke da saznaÅ¡ viÅ¡e o toj značajki. Klikni na\ntipku sa imenom vrste da odabereÅ¡ tu vrstu.\n\n### KoriÅ¡tenje obrazaca i oznaka\n\nNakon Å¡to odabereÅ¡ vrstu značajke ili kada odabereÅ¡ značajku koja već ima\ndefeniranu vrstu, preglednik će ti prikazati polja sa detaljima o značajki, npr.\nnjezino ime i adresu.\n\nIspod polja možeÅ¡ kliknuti na ikone za dodavanje drugih detalja, kao informacije sa\n[Wikipedije](http://www.wikipedia.org/), pristup invalidskim kolicima i drugo.\n\nNa dnu preglednika, klikni na \"Sve oznake\" za dodavanje proizvoljnih drugih\noznaka za značajke. [Taginfo](http://taginfo.openstreetmap.org/) je izvrstan\nizvornik za učenje o popularnim kombinacijama oznaka koje se koriste.\n\nPromjene koje napraviÅ¡ u pregledniku su automatski primijenjene na kartu.\n\nMožeÅ¡ poniÅ¡titi promjene u bilo kojem trenutku pritiskom na tipku \"Opovrgni\".\n\n### Zatvaranje preglednika\n\nPreglednik možeÅ¡ zatvoriti pritiskom na tipku x u gornjem desnom uglu\npreglednika, pritiskom tipke \"Escape\" na tipkovnici ili samo klikom na kartu.\n", + "inspector": "# KoriÅ¡tenje preglednika\n\nPreglednik je element korisničkog sučelja na lijevoj strani stranice koji se pojavljuje\nnakon Å¡to se neka značajka odabere i on omogućava uređivanje detalja značajke.\n\n### Odabir vrste značajke\n\nNakon Å¡to dodaÅ¡ točku, liniju ili područje, možeÅ¡ odabrati koje je vrste ta značajka,\nnpr. je li to državna cesta ili ulica, veletrgovina ili kafić.\n\nPreglednik će prikazati tipke za često koriÅ¡tene vrste značajki, a ostale možeÅ¡\npronaći upisivanjem naziva vrste koju tražiÅ¡ u okvir za pretraživanje.\n\nKlikni na \"i\" na desnoj strani vrste značajke da saznaÅ¡ viÅ¡e o toj značajki. Klikni na\ntipku sa imenom vrste da odabereÅ¡ tu vrstu.\n\n### KoriÅ¡tenje obrazaca i oznaka\n\nNakon Å¡to odabereÅ¡ vrstu značajke ili kada odabereÅ¡ značajku koja već ima\ndefeniranu vrstu, preglednik će ti prikazati polja sa detaljima o značajki, npr.\nnjezino ime i adresu.\n\nIspod polja možeÅ¡ kliknuti na ikone za dodavanje drugih detalja, kao informacije sa\n[Wikipedije](http://www.wikipedia.org/), pristup invalidskim kolicima i drugo.\n\nNa dnu preglednika, klikni na \"Sve oznake\" za dodavanje proizvoljnih drugih\noznaka za značajke. [Taginfo](http://taginfo.openstreetmap.org/) je izvrstan\nizvornik za učenje o popularnim kombinacijama oznaka koje se koriste.\n\nPromjene koje napraviÅ¡ u pregledniku su automatski primijenjene na kartu.\n\nMožeÅ¡ poniÅ¡titi promjene u bilo kojem trenutku pritiskom na tipku \"Opovrgni\".\n", "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. MožeÅ¡\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeÅ¡ odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje viÅ¡e\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premjeÅ¡tanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miÅ¡a namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiÅ¡a.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovrÅ¡ine građevine.\n\nZapočni crtanje građevine kao povrÅ¡ine klikom na tipku \"PovrÅ¡ina\" u gornjem\nlijevom uglu sučelja, a po zavrÅ¡etku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeÅ¡ ju obrisati, Å¡to će\nju obrisati s karte. Budi oprezan/na kada briÅ¡eÅ¡ značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeÅ¡ obrisati građevinu tako da klikneÅ¡ na rub za selektiranje, a zatim\nklikneÅ¡ na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n", "relations": "# Relacije\n\nRelacija je poseban oblik značajki na OpenStreetMap karti koja grupira druge\nznačajke. Na primjer, dvije često koriÅ¡tene relacije su *cestovne relacije*, koje\nmeđusobno grupiraju dijelove cesta koje zajedno pripadaju državnoj ili\nžupanijskoj cesti i *multipoligoni*, koji međusobno grupiraju nekoliko linija\nkoje definiraju složena područja (koja se sastoje od viÅ¡e područja ili ona koja\nimaju rupu u sebi poput krafne).\n\nSkupine značajki u relaciji se nazivaju *članovi*. U bočnom oknu možeÅ¡ vidjeti\nkojim sve relacijama značajka pripada i tamo kliknuti na relaciju kako bi ju\nodabrao/la. Kada je relacija odabrana možeÅ¡ vidjeti sve njezine članove koji su\noznačeni na karti i izlistani u bočnom oknu.\n\niD će uglavnom automatski održavati relacije dok ti uređujeÅ¡ kartu. Glavna\nstvar koje moraÅ¡ biti svjestan/na je da ako obriÅ¡eÅ¡ dio ceste da ju nacrtaÅ¡\npreciznije, trebaÅ¡ provjeriti da je i novi dio član istih relacija kao i originalni\ndio.\n\n## Uređivanje relacija\n\nAko želiÅ¡ uređivati relacije, ovdje su navedene osnove.\n\nZa dodavanje značajke nekoj relaciji, označi značajku, klikni tipku \"+\" u odjeljku\n\"Sve relacije\" na dnu bočnog okna i odaberi ili upiÅ¡i ime relacije.\n\nZa stvaranje nove relacije, odaberi prvu značajku koja bi trebala biti član,\nzatim klikni tipku \"+\" u odjeljku \"Sve relacije\" i odaberi \"Nova relacija...\".\n\nZa odstranjivanje značajke iz relacije, odaberi značajku i klikni ikonu kante za\nsmeće pokraj relacije iz koje ju želiÅ¡ ukloniti.\n\nMožeÅ¡ stvarati viÅ¡estruke poligone - multipoligone sa rupama pomoću alata\n\"Spoji\". Nacrtaj dva područja (unutarnje i vanjsko), drži tipku Shift i klikni na\noba područja kako bi ih selektirao/la i zatim klikni na tipku \"Spoji\" (+).\n" }, @@ -396,9 +402,6 @@ }, "category-route": { "name": "Ruta" - }, - "category-water": { - "name": "Voda" } }, "fields": { @@ -912,10 +915,6 @@ "name": "Tržnica", "terms": "tržnica,pijaca,pijac,pija,plac" }, - "amenity/parking": { - "name": "ParkiraliÅ¡te za automobile", - "terms": "parkiraliÅ¡te,garaža,parkirno mjesto,podzemna garaža,parking" - }, "amenity/pharmacy": { "name": "Ljekarna", "terms": "ljekarna,apoteka,farmacija" @@ -1304,6 +1303,10 @@ "leisure": { "name": "Razonoda" }, + "leisure/common": { + "name": "Zelena povrÅ¡ina po kojoj se može hodati - u UK", + "terms": "zelena povrÅ¡ina,zelena povrÅ¡ina po kojoj se može hodati,zajednička zelena povrÅ¡ina" + }, "leisure/dog_park": { "name": "Park za pse" }, @@ -1385,6 +1388,10 @@ "name": "Svjetionik", "terms": "svjetionik,svjetlosni signal,toranj za svjetlosnu navigaciju" }, + "man_made/observation": { + "name": "Toranj za promatranje", + "terms": "toranj za promatranje,čeka,vidikovački toranj,toranj vidikovac,promatrajući toranj" + }, "man_made/pier": { "name": "Mol", "terms": "pristaniÅ¡te,mol,lukobran,molo,mul,gat" @@ -1733,6 +1740,9 @@ "shop/laundry": { "name": "Praonica rublja" }, + "shop/locksmith": { + "name": "Bravar" + }, "shop/mall": { "name": "Trgovački centar", "terms": "Å¡oping centar,trgovački centar,outlet centar,prodajni centar" @@ -1758,6 +1768,9 @@ "shop/pet": { "name": "Prodavaonica kućnim ljubimcima" }, + "shop/photo": { + "name": "Prodavaonica fotografske opreme" + }, "shop/shoes": { "name": "Prodavaonica obuće" }, @@ -1928,7 +1941,7 @@ "terms": "vodeni tok,vodotok,ispust za vodu,plovni kanal,plovni dio rijeke,kanal,plovni put,vodeni put" }, "waterway/canal": { - "name": "Plovni kanal", + "name": "Kanal", "terms": "kanal,plovni kanal" }, "waterway/dam": { diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json index 3cf2b5543..2820190c7 100644 --- a/vendor/assets/iD/iD/locales/hu.json +++ b/vendor/assets/iD/iD/locales/hu.json @@ -74,10 +74,24 @@ "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok." }, "orthogonalize": { + "title": "Szögletesít", + "description": { + "line": "Vonal sarkainak szögletesítése", + "area": "Terület sarkainak szögletesítése" + }, + "key": "S", "annotation": { "line": "Vonal sarkainak szögletesítése.", "area": "Terület sarkainak szögletesítése." - } + }, + "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes." + }, + "straighten": { + "title": "Kiegyenesít", + "description": "Vonal kiegyenesítése", + "key": "S", + "annotation": "Vonal kiegyenesítve.", + "too_bendy": "Nem lehet kiegyenesíteni, mert túl nagy ívben hajlik." }, "delete": { "title": "Törlés", @@ -137,6 +151,7 @@ }, "rotate": { "title": "Forgatás", + "description": "Objektum elforgatása a középpontja körül.", "key": "R", "annotation": { "line": "Vonal forgatása.", @@ -232,18 +247,20 @@ "back_tooltip": "Elem megváltoztatása", "remove": "Eltávolítás", "search": "Keresés", + "multiselect": "Kiválasztott elemek", "unknown": "Ismeretlen", "incomplete": "", "feature_list": "Elem keresése", - "edit": "Elem szerkesztése" + "edit": "Elem szerkesztése", + "none": "Nincs" }, "background": { "title": "Háttér", "description": "Háttérbeállítások", "percent_brightness": "{opacity}% fényerő", + "none": "Nincs", "custom": "Egyéni", "custom_prompt": "Adj meg egy csempe sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.", - "fix_misalignment": "Elcsúszás korrigálása", "reset": "visszavonás" }, "restore": { @@ -302,15 +319,15 @@ "cannot_zoom": "Nem lehet jobban eltávolítani ebben a módban.", "gpx": { "local_layer": "GPX fájl betöltése", - "drag_drop": "Húzz egy .gpx fájlt a lapra" + "drag_drop": "Húzz egy .gpx fájlt az oldalra, vagy kattints a gombra a tallózáshoz.", + "zoom": "Nagyítás a GPX nyomvonalra", + "browse": ".gpx fájl tallózása" }, "help": { "title": "Súgó", "help": "# Súgó\n\nEz egy szerkesztőprogram az ingyenes és szerkeszthető világtérképhez,\naz [OpenStreetMap](http://www.openstreetmap.org/)-hez. A környékeden lévő\nadatok bővítésére, frissítésére használhatod, ezzel egy szabad forrású\nés szabad adatú térképet előállítva a világról, ami mindenkinek jó.\n\nA térképen végzett szerkesztéseidet minden OpenStreetMap használó látni fogja.\nA szerkesztéshez egy [ingyenes OpenStreetMap regisztrációra](https://www.openstreetmap.org/user/new) lesz szükséged.\n\nAz [iD szerkesztő](http://ideditor.com/) egy kollaboratív projekt,\n[GitHubon elérhető forráskóddal](https://github.com/systemed/iD).\n", "roads": "# Utak\n\nA szerkesztőprogrammal tudsz utakat létrehozni, javítani és törölni. Az utak \nsokfélék lehetnek: ösvények, közutak, kerékpárutak, stb. – minden gyakran \nkeresztezett szakaszt térképezni kell.\n\n### Kiválasztás\n\nÚt kiválasztásához kattints rá. Meg fog jelenni kiemelve, mellette egy kis eszköztár \nmenüvel és egy oldalsávval, ami további információkat mutat az útról.\n\n### Módosítás\n\nGyakran láthatod, hogy az út nincs a mögötte lévő légifelvételhez, vagy GPS \nnyomvonalhoz igazítva. Ha megbizonyosodtál arról, hogy nem a légifelvétel téved, \nhelyreigazíthatod az utakat.\n\nElőször is kattints a módosítandó útra. Ettől kiemelődik az út és megjelennek a\nkezelőpontjai, amiket mozgatni tudsz a megfelelő helyre. Ha új kezelőpontot \nszeretnél hozzáadni, hogy részletesebb utat kapj, kattints duplán az útnak egy \nolyan részére, ahol még nincs pont.\n\nHa egy út egy másik útba csatlakozik, de a térképen nincsenek összekapcsolva, \nhúzd az egyik út kezelőpontját a másik útra, és össze fognak kapcsolódni. \nAz utak megfelelő összekapcsolása a térképen nagyon fontos, útvonaltervezéshez \nlétfontosságú.\n\nHasználhatod a 'Mozgatás' eszközt is, vagy megnyomhatod az 'M' gyorsbillentyűt, ha az \naz egész utat szeretnéd mozgatni. Mozgatás után kattintással rögzítheted az új helyén.\n\n### Törlés\n\nHa egy út teljesen hibás – ha azt látod, hogy egyáltalán nincs rajta a légifelvételen, \nés biztos vagy benne, hogy nem is létezik –, törölheted, amivel eltávolítod a térképről. \nLegyél óvatos elemek törlésekor, akárcsak bármilyen más szerkesztésnél, a mindenki \náltal látható eredmény és a légifelvétel gyakran elavult, lehet, hogy az utat nemrég építették.\n\nAz út törléséhez előbb válaszd ki, majd kattints a kuka ikonra, vagy nyomd meg a Delete \nbillentyűt.\n\n### Létrehozás\n\nTaláltál egy utat, ami még nincs rajta a térképen? Kattints a bal felső eszköztár 'Vonal' \nikonjára vagy nyomd meg a '2'-es billentyűt és kezdd el rajzolni a vonalat.\n\nA rajzolás megkezdéséhez kattints a térképen az út elejére. Ha az út \negy másik meglévő útból ágazik ki, arra a helyre kattints, ahol csatlakoznak.\n\nEzután kattintással hozz létre pontokat a műholdkép vagy GPS nyomvonal alapján, \nhogy a vonal az út középvonalát kövesse. Ha az utad keresztez egy másik utat, kapcsold \nössze őket a metszéspontjukra kattintva. Ha kész vagy a rajzolással, kattints duplán, \nvagy nyomj a billentyűzeten egy 'Enter'-t.\n", - "imagery": "# Légifelvétel\n\nA légifelvétel a térképezés egyik fontos forrása. A repülőgépes ortofotók, műholdképek és szabadon összeállított források kombinációja rendelkezésre áll a szerkesztőben a bal oldali menü 'Háttérbeállítások' gombjára kattintva.\n\nAlapértelmezésként a [Bing Maps](http://www.bing.com/maps/) műholdkép réteg \njelenik meg a szerkesztőben, de ahogy új helyekre görgeted a térképet, új források\n jelennek meg. Néhány országban (Egyesül Államok, Franciaország, Dánia) nagyon jó minőségű légifelvételek érhetőek el egyes területeken.\n\nA légifelvételek gyakran el vannak csúszva a valósághoz képest, a légifelvétel szolgáltatók hibájából. Ha látsz egy csomó utat eltolódva a háttértől, ne húzd őket rögtön a háttérképhez. Ehelyett igazítsd úgy a háttérképet, hogy a meglévő adatok illeszkedjenek rá. Ehhez kattints a Háttérbeállítások menü 'Elcsúszás korrigálása' gombjára.\n", "addresses": "# Lakcímek\n\nA lakcímek a térkép egyik leghasznosabb információi.\n\nHabár a címeket gyakran az utca részeként ábrázolják, az OpenStreetMap\naz utca mentén levő házak és helyek tulajdonságaiként tárolja őket.\n\nCím információkat adhatsz épület körvonalként felrajzolt helyekhez, vagy\nönálló pontokhoz. A címadatok javasolt forrása a helyszíni felmérés, vagy\nszemélyes ismeretek. Mint minden más adatnál, a kereskedelmi források\n(mint Google Maps) másolása szigorúan tilos.\n", - "inspector": "# A címkeszerkesztő használata\n\nA címkeszerkesztő az ablak jobb oldalán jelenik meg, amikor egy elemet \nkiválasztasz,lehetővé téve a részleteinek szerkesztését.\n\n### Elemtípus kiválasztása\n\nMiután létrehoztál egy pontot, vonalat, vagy területet, ki tudod választani, hogy \naz elem milyen típusú, például közút, lakóút, szupermarket, vagy egy kávézó.\nA címkeszerkesztő gombokat jelenít meg a leggyakoribb elemtípussal, a többi \ntípust pedig a keresődobozba írva tudod megtalálni.\n\nKattints az 'i'-re az elemtípus gomb jobb sarkában, hogy többet tudj meg róla. \nA típus kiválasztásához kattints a gombra.\n\n### Å°rlapok használata és a címkék szerkesztése\n\nMiután választottál egy elemtípust, vagy kiválasztottál egy típussal rendelkező \nelemet, a címkeszerkesztő megjelenít egy űrlapot az elem részletes adataival, \nmint a neve, vagy címe.\n\nA mezők alatt egy ikonsort láthatsz, amivel egyéb részleteket adhatsz meg, \npéldául [Wikipedia](http://www.wikipedia.org/) hivatkozás, kerekesszékes \nmegközelíthetőséget, stb.\n\nA címkeszerkesztő legalján találsz egy 'Összes címke' gombot, amivel bármilyen \ntetszőleges címkét megadhatsz. A [Taginfo](http://taginfo.openstreetmap.org/) \negy jó forrás, ha többet akarsz megtudni a népszerű címkekombinációkról.\n\nA címkeszerkesztőben végzett változtatások automatikusan alkalmazva \nlesznek a térképen. Bármikor visszavonhatod őket a 'Visszavonás' gombbal.\n\n### A címkeszerkesztő bezárása\n\nA címkeszerkesztőt be tudod zárni a jobb felső sarokban található X gombra \nkattintva, az Esc billentyűt megnyomva, vagy a térképre kattintással.\n", "buildings": "# Épületek\n\nAz OpenStreetMap a világ legnagyobb épület adatbázisa. Te is bővítheted és \nfejlesztheted ezt az adatbázist.\n\n### Kiválasztás\n\nÉpületet a körvonalára kattintva tudsz kiválasztani. Ez kiemeli az épületet és megnyitja az eszközmenüt és a további információkat mutató oldalsávot.\n\n### Módosítás\n\nAz épületek gyakran pontatlan helyen vannak, vagy pontatlan a címkézésük.\n\nEgy egész épület mozgatásához kattints a 'Mozgatás' eszközre. Mozgasd az \negeret az épület eltolásához, és kattints, ha jó helyre került.\n\nAz épület egyedi alakjának javításához kattints a korvonalának pontjaira és \nhúzd őket jó helyre.\n\n### Létrehozás\n\nAz épületek létrehozása körüli egyik fő kérdés, hogy az OpenStreetMap \naz épületeket alakzatként és pontként is tudja tárolni. Az ökölszabály, hogy \n_az épületet alakzatként kell térképezni, hacsak lehet_ és a cégeket, lakásokat, \nszolgáltatásokat és egyéb a házon belül működő dolgokat a ház körvonalán belüli \npontként kell térképezni.\n\nKezd az épület alakzatként rajzolását a 'Terület' gombra kattintva a bal felső \neszköztáron. Befejezni az 'Enter' billentyűvel, vagy a terület első pontjára kattintva \ntudod, bezárva az alakzatot.\n\n### Törlés\n\nHa egy épület teljesen hibás – például azt látod, hogy nincs rajta a műholdképen és \nbiztos vagy benne, hogy nem létezik – törölheted, ezzel eltávolítva a térképről.\n\nHa egy épület teljesen hibás – ha azt látod, hogy egyáltalán nincs rajta a légifelvételen, \nés biztos vagy benne, hogy nem is létezik –, törölheted, ezzel eltávolítva a térképről.\nLegyél óvatos elemek törlésekor, akárcsak bármilyen más szerkesztésnél, a mindenki \náltal látható eredmény és a légifelvétel gyakran elavult, lehet, hogy a ház egyszerűen új építésű.\n\n\nHáz törléséhez előbb válaszd ki, majd kattints a kuka ikonra, vagy nyomd meg a Delete \nbillentyűt.\n" }, "intro": { @@ -377,9 +394,6 @@ }, "category-route": { "name": "Útvonal" - }, - "category-water": { - "name": "Víz" } }, "fields": { @@ -420,6 +434,9 @@ } } }, + "access_toilets": { + "label": "Hozzáférés" + }, "address": { "label": "Cím", "placeholders": { @@ -448,6 +465,9 @@ "atm": { "label": "Bankautomata" }, + "backrest": { + "label": "Háttámla" + }, "barrier": { "label": "Típus" }, @@ -520,9 +540,21 @@ "fee": { "label": "Fizetős" }, + "fire_hydrant/type": { + "label": "Típus" + }, "fixme": { "label": "JavítsKi" }, + "generator/method": { + "label": "Módszer" + }, + "generator/source": { + "label": "Forrás" + }, + "generator/type": { + "label": "Típus" + }, "highway": { "label": "Típus" }, @@ -563,6 +595,9 @@ "label": "Szintek", "placeholder": "2, 4, 6..." }, + "lit": { + "label": "Világítás" + }, "man_made": { "label": "Típus" }, @@ -678,6 +713,9 @@ "surface": { "label": "Felület" }, + "toilets/disposal": { + "label": "Kezelés" + }, "tourism": { "label": "Típus" }, @@ -690,6 +728,9 @@ "trail_visibility": { "label": "Ösvény láthatósága" }, + "vending": { + "label": "Termékek típusa" + }, "water": { "label": "Típus" }, @@ -745,7 +786,10 @@ "name": "Utasterminál" }, "amenity": { - "name": "Szolgáltatás" + "name": "Ismeretlen típusú szolgáltatás" + }, + "amenity/arts_centre": { + "name": "Művészeti központ" }, "amenity/atm": { "name": "Bankautomata" @@ -765,12 +809,18 @@ "amenity/bicycle_rental": { "name": "Kerékpárkölcsönző" }, + "amenity/boat_rental": { + "name": "Hajókölcsönző" + }, "amenity/cafe": { "name": "Kávézó" }, "amenity/car_rental": { "name": "Autókölcsönző" }, + "amenity/car_sharing": { + "name": "Autómegosztó" + }, "amenity/car_wash": { "name": "Autómosó" }, @@ -816,9 +866,6 @@ "amenity/marketplace": { "name": "Piac" }, - "amenity/parking": { - "name": "Parkoló" - }, "amenity/pharmacy": { "name": "Gyógyszertár" }, @@ -849,6 +896,9 @@ "amenity/pub": { "name": "Kocsma" }, + "amenity/ranger_station": { + "name": "Vadőrház" + }, "amenity/restaurant": { "name": "Étterem" }, @@ -876,6 +926,10 @@ "amenity/university": { "name": "Egyetem" }, + "amenity/vending_machine": { + "name": "Árusító automata", + "terms": "italautomata, italgép" + }, "amenity/waste_basket": { "name": "Szemetes" }, @@ -964,6 +1018,9 @@ "name": "Mentőállomás", "terms": "Mentőautó állomás" }, + "emergency/fire_hydrant": { + "name": "Tűzcsap" + }, "emergency/phone": { "name": "Segélykérő telefon" }, @@ -1048,6 +1105,10 @@ "highway/steps": { "name": "Lépcső" }, + "highway/stop": { + "name": "Stoptábla", + "terms": "stop" + }, "highway/tertiary": { "name": "Bekötőút" }, @@ -1181,6 +1242,9 @@ "leisure/pitch/basketball": { "name": "Kosárlabdapálya" }, + "leisure/pitch/skateboard": { + "name": "Gördeszkapark" + }, "leisure/pitch/soccer": { "name": "Futballpálya" }, @@ -1196,12 +1260,18 @@ "leisure/slipway": { "name": "Sólya" }, + "leisure/sports_center": { + "name": "Sportközpont" + }, "leisure/stadium": { "name": "Stadion" }, "leisure/swimming_pool": { "name": "Úszómedence" }, + "leisure/track": { + "name": "Versenypálya" + }, "line": { "name": "Vonal" }, @@ -1217,6 +1287,10 @@ "man_made/lighthouse": { "name": "Világítótorony" }, + "man_made/observation": { + "name": "Kilátótorony", + "terms": "megfigyelőtorony" + }, "man_made/pier": { "name": "Móló" }, @@ -1256,6 +1330,10 @@ "natural/coastline": { "name": "Partvonal" }, + "natural/fell": { + "name": "Kopár hegyoldal", + "terms": "Fell" + }, "natural/glacier": { "name": "Gleccser" }, @@ -1268,6 +1346,10 @@ "natural/peak": { "name": "Hegycsúcs" }, + "natural/scree": { + "name": "Kőtörmelék", + "terms": "törmeléklejtő, kőfolyás" + }, "natural/scrub": { "name": "Cserjés" }, @@ -1328,6 +1410,10 @@ "power": { "name": "Energia" }, + "power/generator": { + "name": "Áramfejlesztő", + "terms": "generátor, erőmű" + }, "power/line": { "name": "Távvezeték" }, @@ -1352,6 +1438,9 @@ "railway/disused": { "name": "Használaton kívüli vasút" }, + "railway/halt": { + "name": "Vasúti megállóhely" + }, "railway/level_crossing": { "name": "Szintbeli kereszteződés" }, @@ -1383,7 +1472,7 @@ "name": "Kompút" }, "shop": { - "name": "Üzlet" + "name": "Ismeretlen típusú üzlet" }, "shop/alcohol": { "name": "alkoholüzlet" @@ -1487,6 +1576,10 @@ "shop/laundry": { "name": "Mosoda" }, + "shop/locksmith": { + "name": "Lakatos", + "terms": "kulcsmásoló, záras, zárszerelő" + }, "shop/mall": { "name": "Bevásárlóközpont" }, @@ -1622,6 +1715,10 @@ "type/route/foot": { "name": "Gyalogos útvonal" }, + "type/route/hiking": { + "name": "Turistaút", + "terms": "túraút, gyalogtúra" + }, "type/route/pipeline": { "name": "Csővezeték útvonal" }, diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json index 5dc4e48ed..83891dc14 100644 --- a/vendor/assets/iD/iD/locales/id.json +++ b/vendor/assets/iD/iD/locales/id.json @@ -30,7 +30,8 @@ "add": { "annotation": { "point": "Telah ditambahkan sebuah titik.", - "vertex": "Ditambahkan simpul pada jalan." + "vertex": "Ditambahkan simpul pada jalan.", + "relation": "Tambahkan relasi" } }, "start": { @@ -40,6 +41,9 @@ } }, "continue": { + "title": "Lanjutkan", + "description": "Lanjutkan garis ini.", + "not_eligible": "Tidak ada garis yang dapat dilanjutkan disini.", "annotation": { "line": "Dilanjutkan sebuah garis.", "area": "Dilanjutkan sebuah area." @@ -68,10 +72,22 @@ "not_closed": "Ini tidak bisa dibuat berputar karena bukan sebuah garis tertutup." }, "orthogonalize": { + "title": "Persegi", + "description": { + "line": "Kotakkan sudut garis ini.", + "area": "Mengotakkan sudut area ini." + }, "annotation": { "line": "Mengotakkan sudut dari garis", "area": "Mengotakkan sudut sebuah area." - } + }, + "not_squarish": "Tidak bisa dibuat mengkotak karena bukan segi empat." + }, + "straighten": { + "title": "Luruskan", + "description": "Luruskan garis ini.", + "annotation": "Luruskan kembali sebuah garis.", + "too_bendy": "Garis ini tidak dapat diluruskan karena terlalu banyak lekukan." }, "delete": { "title": "Hapus", @@ -197,6 +213,11 @@ "list": "Disunting oleh {users}", "truncated_list": "Disunting oleh {users} dan {count} lainnya" }, + "geocoder": { + "search": "Cari di seluruh dunia...", + "no_results_visible": "Hasil pencarian tidak ditemukan pada peta yang ditampilkan", + "no_results_worldwide": "Hasil pencarian tidak ditemukan" + }, "geolocate": { "title": "Tunjukan Lokasi Saya" }, @@ -208,6 +229,7 @@ "all_tags": "Semua Tags", "all_members": "Semua anggota", "all_relations": "Seluruh relasi", + "new_relation": "Buat relasi baru", "role": "Aturan", "choose": "Pilih Tipe Fitur", "results": "{n}hasil untuk {search}", @@ -217,6 +239,7 @@ "search": "Cari", "unknown": "Tidak diketahui", "incomplete": "", + "feature_list": "Cari fitur", "edit": "Ubah Fitur" }, "background": { @@ -243,7 +266,9 @@ "edited_osm": "OSM tersunting!", "just_edited": "Anda baru saja menyunting OpenStreetMap!", "view_on_osm": "Lihat di OSM", - "facebook": "Bagikan di Facebook" + "facebook": "Bagikan di Facebook", + "twitter": "Berbagi di Twitter", + "google": "Berbagi di Google+" }, "confirm": { "okay": "Baiklah" @@ -277,13 +302,11 @@ }, "cannot_zoom": "Tidak bisa memperbesar tampilan lebih jauh dengan mode ini.", "gpx": { - "local_layer": "File GPX lokal", - "drag_drop": "Geser dan letakkan sebuah file .gpx ke halaman" + "local_layer": "File GPX lokal" }, "help": { "title": "Bantuan", - "help": "#Bantuan\n\nIni adalah penyunting untuk [OpenStreetMap] (http://www.openstreetmap.org/), peta dunia gratis dan bisa disunting. Anda dapat menggunakannya dengan menambahkan dan memperbarui data di area anda, membangun sebuah peta sumber-terbuka dan data-terbuka yang lebih baik untuk semua orang.\n\nPerubahan yang anda buat akan terlihat ke semua orang yang menggunakan OpenStreetMap. Untuk melakukan penyutingan, anda membutuhkan [free OpenStreetMap account] (https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) adalah proyek kolaborasi dengan [kode sumber tersedia di GitHub](http://github.com/systemed/iD).\n", - "imagery": "# Citra⏎\n⏎\nCitra Foto Udara menjadi sumber penting untuk pemetaan. Kombinasi dari⏎\npemotretan pesawat, pandangan satelit, dan sumber gabungan lain yang tersedia⏎\ndi penyunting ada di pilihan 'Pengaturan Latar' di sebelah kiri.⏎\n⏎\nBiasanya lapisan satelit [Bing Maps](http://www.bing.com/maps/) ditampilkan di⏎\ndi penyunting ini, tapi ketika anda geser atau perbesar tampilan di suatu wilayah baru,⏎\nsumber baru lain juga bisa tersedia. Di beberapa negara, seperti Amerika Serikat,⏎\nPerancis, dan Denmark memiliki citra berkualitas tinggi yang tersedia di beberapa area.⏎\n⏎\nCitra kadang melenceng dari data peta karena ada kesalahan pada⏎\npenyedia data citra. Jika anda melihat banyak jalan yang bergeser dari latarnya,⏎\njangan semerta-merta memindahkan mereka semua ke latar yang pas. Namun, anda bisa menyesuaikan⏎\ncitranya agar pas dengan data yang ada dengan mengklik 'Fix alignment' pada⏎\nbagian bawah Pengaturan Latar.⏎\n" + "help": "#Bantuan\n\nIni adalah penyunting untuk [OpenStreetMap] (http://www.openstreetmap.org/), peta dunia gratis dan bisa disunting. Anda dapat menggunakannya dengan menambahkan dan memperbarui data di area anda, membangun sebuah peta sumber-terbuka dan data-terbuka yang lebih baik untuk semua orang.\n\nPerubahan yang anda buat akan terlihat ke semua orang yang menggunakan OpenStreetMap. Untuk melakukan penyutingan, anda membutuhkan [free OpenStreetMap account] (https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) adalah proyek kolaborasi dengan [kode sumber tersedia di GitHub](http://github.com/systemed/iD).\n" }, "intro": { "navigation": { @@ -348,9 +371,6 @@ }, "category-route": { "name": "Rute" - }, - "category-water": { - "name": "Air" } }, "fields": { @@ -728,9 +748,6 @@ "amenity/marketplace": { "name": "Pasar" }, - "amenity/parking": { - "name": "Parkir" - }, "amenity/pharmacy": { "name": "Farmasi" }, @@ -1148,6 +1165,12 @@ "shop/computer": { "name": "Toko Komputer" }, + "shop/convenience": { + "name": "Toko Kelontong" + }, + "shop/department_store": { + "name": "Pasar Swalayan" + }, "shop/electronics": { "name": "Toko Elektronik" }, @@ -1181,6 +1204,9 @@ "shop/music": { "name": "Toko Musik" }, + "shop/newsagent": { + "name": "Agen Koran dan Majalah" + }, "shop/optician": { "name": "Optik" }, diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json index 530ecc722..1b7c2cbe4 100644 --- a/vendor/assets/iD/iD/locales/is.json +++ b/vendor/assets/iD/iD/locales/is.json @@ -234,7 +234,6 @@ "title": "Bakgrunnur", "description": "Bakgrunnsstillingar", "percent_brightness": "{opacity}% birta", - "fix_misalignment": "Laga hliðrun", "reset": "endurstilla" }, "restore": { @@ -290,16 +289,13 @@ }, "cannot_zoom": "Get ekki þysjað lengra út í núverandi ham.", "gpx": { - "local_layer": "Staðvær GPX-skrá", - "drag_drop": "Dragðu og slepptu .gpx skrá á síðuna" + "local_layer": "Staðvær GPX-skrá" }, "help": { "title": "Hjálp", "help": "# Hjálp\n\nÞetta er ritill fyrir [OpenStreetMap](http://www.openstreetmap.org/), \nfrítt og breytanlegt kort af heiminum. Þú getur notað ritilinn til að \nbæta við og breyta gögnum á þínu svæði. Þannig geturðu bætt þetta\nopen-source og open-data verkefni fyrir alla.\n\nBreytingar sem þú gerir á þessu korti verða sýnilegar öllum sem nota\nOpenStreetMap. Til að geta gert breytingar þarftu \n[ókeypis OpenStreetMap notandanafn](https://www.openstreetmap.org/user/new).\n\n[iD ritillinn](http://ideditor.com/) er samstarfsverkefni hvers [frumkóði er \naðgengilegur á GitHub](https://github.com/systemed/iD).\n", "roads": "# Vegir\n\nÞú getur bætt við, lagað og eytt vegum með þessum ritli. \nVegir geta verið af öllum gerðum: slóðar, hraðbrautir, hjólastígar\nog fleira - það á að vera hægt að gera öllu slíku skil hér.\n\n### Velja\n\nSmelltu á veg til að velja hann. Útlína hans verður nú sýnileg, \násamt smá aðgerðavali á kortinu og valmynd til hliðar sem sýnir\nmeiri upplýsingar um veginn.\n\n### Breyta\n\nÞú getur komið auga á vegi sem eru ekki í samræmi við loftmyndina\ná bak við þá eða GPS-slóða. Þú getur breytt veginum þannig að hann\nfari í rétt horf.\n\nFyrst smellirðu á veginn sem þú vilt breyta. Þetta sýnir útlínur hans\nog stjórnhnúta sem þú getur dregið til. Ef þú vilt bæta við fleiri\nstjórnhnútum þá tvísmellirðu á hluta af veginum sem er ekki með \nhnút og þá bætist nýr við.\n\nEf að vegurinn tengist öðrum vegi, en tengist ekki rétt á kortinu,\nþá geturðu dregið stjórnhnút annars vegsins yfir á hinn veginn til\nað tengja þá saman. Að vegamót séu rétt staðsett er mikilvægt \nfyrir kortið og bráðnauðsynlegt fyrir ökuleiðbeiningar.\n\nÞú getur líka smellt á 'Færa' tólið eða ýtt á 'M' á lyklaborðinu\ntil að færa allan veginn í einu og smellt svo aftur til að \nbreytingin taki gildi.\n\n### Eyða\n\nEf að vegurinn er út úr kú - þú sérð á gervihnattamyndinni að \nhann er ekki þar og helst hefurðu séð með eigin augum að hann\ner ekki til - þá er hægt að eyða honum þannig að hann hverfi af \nkortinu. Farðu varlega með að eyða út hlutum - líkt og með aðrar\nbreytingar þá verða allir varir við þær og stundum eru \nloftmyndirnar úreltar, þannig að þetta gæti verið glænýr vegur.\n\nÞú getur eytt vegi með því að smella á hann svo hann sé valinn, \nsmella svo á ruslatunnutáknið eða með því að ýta á 'Delete'\ntakkann.\n\n### Búa til\n\nFannstu stað þar sem vegur ætti að vera til staðar en er ekki á\nkortinu? Smelltu á 'Lína' takkann efst til vinstri eða ýttu á\n'2' á lyklaborðinu til að byrja að teikna línu.\n\nSmelltu þar sem vegurinn hefst á kortinu til að byrja á honum.\nEf að vegurinn tengist öðrum vegi geturðu byrjað á að búa til\nvegamótin með því að smella fyrst á eldri veginn.\n\nSettu svo hnútana þar sem við á svo að vegurinn fari rétta leið,\neftir því sem GPS-slóðin eða loftmyndin sýnir. Ef að vegurinn\ná vegamót við annan veg smelltu á hann þar sem vegamótin eiga að \nvera. Þegar teikningu vegar er lokið tvísmellirðu með músinni á \nlokahnútnum eða ýtir á 'Enter' á lyklaborðinu.\n", - "imagery": "# Loftmyndir\n\nLoftmyndir eru mikilvægt tól við kortagerð. Samblöndu af\nmyndum teknum af flugvélum, gervihnöttum og öðrum aðferðum\ner hægt að sjá í ritlinum undir 'Bakgrunnsstillingar' til vinstri.\n\nSjálfgefin stilling er að sýna [Bing Maps](http://www.bing.com/maps/) \ngervihnattamynd í ritlinum, en þegar þú færir þig til á kortinu\ngeta aðrar gagnalindir bæst við. Sum lönd, til dæmis Bandaríkin,\nFrakkland og Danmörk, eru með mikið safn loftmynda fyrir sum svæði.\n\nLoftmyndir eru stundum hliðraðar frá kortagögnum vegna mistaka\nhjá þeim sem útvega loftmyndir. Ef þú sérð að margir vegir stangast\ná við loftmyndina, ekki færa þá alla svo þeir passi við \nloftmyndina, þess í stað geturðu fært loftmyndina til svo hún \nstemmi við núverandi gögn. Þú smellir þá á 'Laga hliðrun' neðst\ná bakgrunnsstillingavalmyndinni.\n", "addresses": "# Heimilisföng\n\nHeimilisföng eru einhverjar nytsömustu upplýsingarnar sem hægt er að setja á kort.\n\nÞó að heimilisföng tilheyri yfirleitt götum, þá tilheyra þau húsunum sjálfum í\nOpenStreetMap, merkt inn á byggingar og staði meðfram götum.\n\nÞú getur bætt heimimlisföngum við bæði byggingar sem eru merktar inn sem svæði\nsem og byggingar sem eru merktar inn sem punktar. Best er að heimilisföngin\nséu sett inn af þeim sem þekkja staðhætti vel - eins og með annað þá er ekki \nleyfilegt að afrita heimilisföng af öðrum vefjum, til að mynda er bannað að \nafrita af Google Maps.\n", - "inspector": "# Að nota rýninn\n\nRýnirinn er viðmótið sem birtist hægra megin á síðunni þegar hlutur er \nvalinn, hann leyfir þér að breyta upplýsingum viðkomandi hlutar.\n\n### Velja tegund\n\nEftir að þú bætir við punkti, línu eða svæði, þá getur þú valið hverrar\ntegundar viðkomandi hlutur er, hvort það sé þjóðvegur eða húsagata, \nstórmarkaður eða kaffihús. Rýnirinn sýnir algengar tegundir og þú\ngetur fundið fleiri með því að slá inn í leitarboxið.\n\nSmelltu á 'i' neðst í hægra horni tegundartáknsins til að sjá meira um\nviðkomandi tegund. Smelltu á takka til að velja viðkomandi tegund.\n\n### Form og merkingar\n\nEftir að þú velur tegund, eða þegar þú velur hlut sem er þegar búið að \nvelja fyrir, þá mun rýnirinn sýna svæði með merkingum, til dæmis \nnafn fyrirtæki og heimilisfang.\n\nFyrir neðan svæðin sérðu lítil tákn, þú getur smellt á þau til að bæta\nvið frekari upplýsingum, til dæmis tengli á upplýsingar um hlutinn á\n[Wikipediu](http://www.wikipedia.org/), upplýsingar um aðgengi fatlaðra\nog fleira.\n\nNeðst í rýninum geturðu smellt á 'Fleiri merkingar' til að bæta við \nöðrum merkingum. [Taginfo](http://taginfo.openstreetmap.org/) er góður\nstaður til að kynna sér algengar merkingar.\n\nBreytingar sem þú gerir í rýninum taka þegar gildi á kortinu.\nÞú getur afturkallað þær með því að ýta á 'Hætta við' takkann.\n\n### Loka rýninum\n\nÞú getur lokað rýninum með því að smella á x-ið efst til hægri, \nmeð því að ýta á 'Escape' á lyklaborðinu eða smella bara á kortið.\n", "buildings": "# Byggingar\n\nOpenStreetMap er stærsta gagnasafn heims með byggingum. Þú getur\nbætt við þetta gagnasafn.\n\n### Velja\n\nÞú getur valið byggingu með því að ýta á útlínur hennar. Þetta \nlýsir upp bygginguna og opnar tækjaslá sem og valmynd sem hefur\nað geyma frekari upplýsingar um bygginguna.\n\n### Breyta\n\nStundum eru byggingar vitlaust staðsettar eða með vitlausum\nupplýsingum.\n\nTil að færa byggingu í einu lagi er hún valin og svo smellt á 'Færa'\ntólið. Færðu músina til að hliðra byggingunni og smelltu svo þegar\nhún er komin á réttan stað.\n\n### Búa til\n\nÞegar byggingum er bætt við kort er hægt að nota bæði svæði og \npunkta. Þumalputtareglan er sú að nota svæði fyrir byggingu þegar \nhægt er, og merkja svo þau fyrirtæki, stofnanir og annað sem \nstarfa þar sem punkta innan svæðisins.\n\nBúðu til byggingu sem svæði með því að ýta á takkann 'Svæði' efst til vinstri, smelltu svo þar sem byggingin byrjar og merktu\nþannig útlínur hennar. Þú klárar bygginguna svo með því að tengja\nsíðasta hnútinn við fyrsta hnútinn eða með því að ýta á 'Enter'\ná lyklaborðinu.\n\n### Eyða\n\nEf að bygging er út úr kú - þú sérð að hún er ekki til á \nloftmyndinni og hefur helst séð með eigin augum að hún er ekki til\nstaðar - þá geturðu eytt henni af kortinu. Farðu varlega þegar þú\neyðir hlutum - breytingarnar munu sjást hjá öllum sem nota kortið\nog það getur verið að loftmyndin sé bara gömul og byggingin ný.\n\nÞú getur eytt byggingu með því að velja hana, ýta svo á \nruslatunnutáknið eða með því að ýta á 'Delete' á lyklaborðinu.\n" }, "intro": { @@ -365,9 +361,6 @@ }, "category-route": { "name": "Leið" - }, - "category-water": { - "name": "Vatn" } }, "fields": { @@ -803,9 +796,6 @@ "amenity/marketplace": { "name": "Markaður" }, - "amenity/parking": { - "name": "Bílastæði" - }, "amenity/pharmacy": { "name": "Lyfjaverslun" }, diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json index dc2ac3df3..e3d2bbedc 100644 --- a/vendor/assets/iD/iD/locales/it.json +++ b/vendor/assets/iD/iD/locales/it.json @@ -83,7 +83,8 @@ "annotation": { "line": "Gli angoli della linea sono stati resi ortogonali.", "area": "Gli angoli dell'area sono stati resi ortogonali." - } + }, + "not_squarish": "Questo non può essere reso squadrato perché non è squadrabile." }, "straighten": { "title": "Raddrizzare", @@ -246,15 +247,18 @@ "back_tooltip": "Cambia elemento", "remove": "Rimuovere", "search": "Cerca", + "multiselect": "Elementi selezionati", "unknown": "Sconosciuto", "incomplete": "", "feature_list": "Cerca elementi", - "edit": "Modifica elemento" + "edit": "Modifica elemento", + "none": "Nessuno" }, "background": { "title": "Sfondo", "description": "Impostazioni dello sfondo", "percent_brightness": "{opacity}% luminosità", + "none": "Nessuno", "custom": "Personalizzato", "custom_prompt": "Inserisci lo schema dei tasselli. I valori validi sono {z}, {x}, {y} per lo schema Z/X/Y e {u} per lo schema QuadTile.", "fix_misalignment": "Allinea", @@ -317,7 +321,9 @@ "cannot_zoom": "Impossibile fare zooCannot zoom out further in current mode.", "gpx": { "local_layer": "File GPX locale", - "drag_drop": "Trascina e rilascia un file gpx sulla pagina" + "drag_drop": "Trascina e rilascia un file .gpx sulla pagina o clicca il bottone a destra per sceglierne uno", + "zoom": "Zoom su traccia GPX", + "browse": "Scegli un file .gpx" }, "help": { "title": "Aiuto", @@ -325,9 +331,9 @@ "editing_saving": "# Modifica & salvataggio\n\nQuesto editor è stato pensato per funzionare principalmente online\ned anche in questo momento lo stai utilizzando tramite browser web.\n\n### Selezione degli Elementi\n\nPer selezionare un elemento della mappa, come ad esempio una strada o\nun punto di interesse, clicca su di esso sulla mappa. Questo farà in modo\nche l'elemento selezionato venga evidenziato, che si apra un pannello con\ni dettagli e che si apra un menu di azioni che è possibile fare con l'elemento\nstesso.\n\nPer selezionare più elementi tenendo premuto il tasto 'Maiusc' clicca su ogni\nelemento o trascina il mouse disegnando un riquadro sulla mappa. Questo\nfarà sì che tutti gli elementi all'interno del riquadro vengano selezionati\nconsentendo di compiere azioni su più elementi in una volta sola.\n\n### Salvataggio delle modifiche\n\nQuando si fanno dei cambiamenti, come modifiche alle strade, agli edifici e\nai luoghi, queste vengono memorizzate localmente fino a che non si effettua\nil salvataggio sul server. Non preoccuparti se fai un errore, puoi annullare\nla modifica premento il tasto 'Annulla' e rieffettuare la modifica cliccando\nsul tasto 'Ripeti'.\n\nSe ad esempio hai completato un'area della città e vuoi iniziare un'altra\narea clicca su 'Salva' e porre fine ad un gruppo di modifiche. Avrai comunque\nla possibilità di revisionare ciò che hai modificato inoltre l'editor fornirà\nsuggerimenti e avvertimenti se qualcosa nelle tue modifiche non sembra\nandare bene.\n\nSe tutto è a posto puoi aggiungere un piccolo commento per spiegare la\nmodifica effettuata e cliccare su 'Salva' di nuovo per caricare le modifiche su\n[OpenStreetMap.org](http://www.openstreetmap.org/), dove saranno visibili\na tutti gli utenti e disponibili agli altri per consentire di costruirci sopra o\nmigliorarle ulteriormente.\n\nSe non riesci a finire le modifiche in una seduta, puoi abbandonare la\nfinestra dell'editor e tornarci più tardi (utilizzando lo stesso browser e lo\nstesso computer): l'editor ti offrirà infatti la possibiltà di recuperare il tuo lavoro.\n", "roads": "# Strade\n\nE' possibile creare, aggiustare ed eliminare le strade con questo editor. Le strade possono essere di tutti i tipi: percorsi, autostrade, cammini, piste ciclabili o altro. E' possibile mappare ogni segmento calpestabile.\n\n### Selezione\n\nCliccare su una strada per selezionarla. Verranno visualizzati un contorno e un piccolo menu strumenti sulla mappa oltre ad una barra laterale che mostra informazioni dettagliate sulla strada.\n\n### Modifica\n\nVi capiterà spesso di vedere strade non combacianti con le immagini sullo sfondo o con il tracciato GPS. E' possibile allineare queste strada in modo che si trovino nella giusta posizione.\n\nPer prima cosa cliccare sulla strada che si vuole modificare. Questo farà in modo che la strada venga evidenziata e che vengano visualizzati i punti di controllo lungo di essa che possono essere spostati in luoghi più consoni. Se si vuole aggiungere nuovi punti di controllo per aggiungere maggiori dettagli, basta fare doppio clic su parte della strada senza nodi.\n\nSe la strada è connessa ad un'altra strada ma non è ben connessa sulla mappa, è possibile spostare uno di questi punti di controllo sull'altra strada in modo da unirli. E' importante per la mappa che le strade siano correttamente connesse anche per garantire giuste indicazioni di guida.\n\nE' possibile cliccare sullo strumento 'Sposta' o premere il tasto rapido `M` per muovere l'intera strada in una volta sola. Cliccare nuovamente per memorizzare lo spostamento.\n\n### Eliminizione\n\nSe la strada è completamente sbagliata, ovvero non compare sulle immagini satellitari e non viene rilevata nella realtà, è possibile eliminarla eliminandola dalla mappa. Attenzione ad effettuare questa operazione di eliminazione poiché, come per ogni altra modifica, i risultati vengono visti da tutti. Considera che le immagini satellitari sono spesso vecchie quindi è possibile che la strada sia stata costruita solo di recente.\n\nE' possibile eliminare una strada cliccando prima su di essa per selezionarla e poi sull'icona cestino o premendo il tasto 'Canc' della tastiera.\n\n### Creazione\n\nHai notato che in un punto della mappa dovrebbe esserci una strada ma non c'è ? Clicca sull'incona 'Linea' in alto a sinistra nell'editor o premi il tasto `2` per iniziare a disegnare una linea.\n\nCliccare sull'inizio della strada sulla mappa per iniziare a disegnarla. Se la strada è unita ad una strada già esistente, iniziare cliccando nel punto dove sono connesse.\n\nQuindi cliccare i nuovi punti lungo la strada in modo che segua il percorso giusto dettato dall'immagine satellitare o dai dati del GPS. Se la strada che stai disegnando attraversa un'altra strada, collegala cliccando sul punto di intersezione. Quando hai finito di disegnare fai doppio clic o premi 'Invio' o 'Enter' sulla tua tastiera.\n", "gps": "# GPS\n\nI dati provenienti dal GPS sono la sorgente dati più fidata per OpenStreetMap.\nQuesto editor supporta i tracciati locali - i file `.gpx` che si trovano sul tuo\ncomputer. È possibile raccogliere questo tipo di tracciati GPS con un gran\nnumero di applicazioni per smartphone o tramite dispositivi GPS personali.\n\nPer informazioni su come effettuare un rilevamento GPS è possibile leggere\n[Rilevamenti con un GPS](http://learnosm.org/en/beginner/using-gps/).\n\nPer utilizzare un tracciato GPX al fine di effettuare una mappatura, trascina il\nfile GPX sull'editor di mappe. Se viene riconosciuto verrà aggiunto alla mappa\ned evidenziato tramite una linea verde chiaro. Cliccare sul menu 'Impostazioni\nsfondo' che si trova sulla sinitra per abilitare, disabilitare o zoomare il livello creato dal file GPX.\n\nIl tracciato GPX non viene caricato direttamente su OpenStreetMap - il modo\nmigliore di utilizzarlo è quello di disegnare sulla mappa usando il tracciato\ncome guida per i nuovi elementi che vuoi aggiungere e [caricarlo comunque\nsu OpenStreetMap](http://www.openstreetmap.org/trace/create) per renderlo\npoi disponibile agli altri utenti.\n", - "imagery": "# Immagini satellitari\n\nLe immagini satellitari sono una risorsa importante per le lavorare con le mappe. Tramite il menu sulla sinistra 'Impostazioni dello sfondo' sono disponibili varie immagini, ad es. quelle dei voli a bassa quota, le viste satellitari e altre sorgenti combinate liberamente.\n\nNell'editor viene visualizzato, per impostazione predefinita, il livello satellitare di [Bing Maps](http://www.bing.com/maps/) , ma non appena vi muoverete sulla mappa ed effettuerete degli zoom in altre aree, saranno disponibili nuove sorgenti. Alcuni paesi, come ad esempio gli Stati Uniti, la Francia e la Danimarca dispongono di immagini di altissima qualità in alcune aree.\n\nLe immagini talvolta non sono ben allineate ai dati della mappa a causa di errori compiuti dal fornitore di immagini. Se vedete molte strade spostate rispetto allo sfondo, non muovetele immediatamente per allinearle allo sfondo. Piuttosto potete allineare le immagini in modo che combacino con i dati esistenti facendo clic su 'Allinea' nella parte bassa del riquardo delle 'Impostazioni dello sfondo'.\n", + "imagery": "# Immagini\n\nLe immagini aeree sono un'importante risorsa per la mappatura. Una\ncombinazione di foto aeree, immagini satellitari e risorse liberamente\ncompilate sono disponibili nell'editor nel menu 'Impostazioni dello sfondo'\nsulla destra.\n\nLe immagini predefinite presentate nell'editor sono quelle satellitari di\n[Bing Maps](http://www.bing.com/maps/), ma spostando o ingrandendo\nla mappa in specifiche aree geografiche potranno essere disponibili più\nrisorse. Alcune nazioni, come Stati Uniti, Francia e Danimarca, hanno a\ndisposizione, per alcune aree, immagini ad alta definizione.\n\nLe immagini sono a volte disallineate rispetto ai dati della mappa a causa\ndi errori da parte di chi le fornisce. Se vedi numerose strade spostate\nrispetto alle immagini di sfondo non correggerle tutte subito per farle\nnuovamente combaciare. Puoi invece aggiustare l'allineamento delle immagini\nsullo sfondo in modo da ri-allinearle con i dati esistenti cliccando su\n'Allinea' in fondo al menu.\n", "addresses": "# Indirizzi stradali\n\nGli indirizzi sono tra le informazioni più utili per una mappa.\n\nNonostante gli indirizzi siano spesso rappresentati come parte delle strade, in OpenStreetMap\nvengono memorizzati come attributi degli edifici e dei luoghi lungo le strade.\n\nPotrai aggiungere informazioni sull'indirizzo a dei luoghi mappati come contorni di edificio\ncosì come a quelli mappati come singoli punti. La sorgente ottimale dei dati degli indirizzi\nè un rilevamento per strada o la conoscenza personale dato che copiare da sorgenti\ncommerciali come ad es. Google Maps è severamente vietato.\n", - "inspector": "# Utilizzo dell'inspector\n\nL'inspector è quell'elemento dell'interfaccia utente sulla parte destra della pagina che appare quando viene selezionata una funzionalità e che consente di modificarne i dettagli.\n\n### Selezione di un tipo di funzionalità\n\nDopo che è stato aggiunto un punto, una linea o un'area, è possibile scegliere quale tipo di caratteristica abbia, come ad esempio se si tratta di una strada principale o una strada residenziale, di un supermarket o di un caffè.\nL'inspector visualizzerà i pulsanti per le caratteristiche più comuni e sarà possibile trovarne altre semplicemente digitando la caratteristica voluta nella casella di ricerca.\n\nFare clic sulla 'i' che si trova nell'angolo in basso a destra del pulsante per saperne di più. Fare clic su un pulsante per scegliere quel tipo.\n\n### Utilizzo di Form e di Tag di modifica\n\nDopo aver scelto un tipo di caratteristica o quando si è selezionato una caratteristica per la quale è già stato assegnato un tipo, l'inspector mostrerà i campi con i dettagli come ad esempio il nome e l'indirizzo.\n\nAl di sotto dei campi è possibile fare clic sulle icone per aggiungere ulteriori dettagli come ad es. informazioni [Wikipedia](http://www.wikipedia.org/), accesso consentito alle carrozzine, e altro.\n\nSotto l'inspector è possibile fare clic su 'Tag aggiuntivi' per aggiungere arbitrariamente altri tag all'elemento. [Taginfo](http://taginfo.openstreetmap.org/) è una buona risorsa per imparare qualcosa sulle combinazioni di tag più comuni.\n\nLe modifiche effettuate nell'inspector vengono applicate automaticamente alla mappa.\nE' possibile annullarle in ogni momento cliccando semplicemente sul pulsante 'Ripristina'.\n\n### Chiusura dell'inspector\n\nE' possibile chiudere l'inspector sia facendo clic sul pulsante chiudi posizionato in alto a destra, sia premendo il tasto 'Esc', che facendo clic sulla mappa.\n\\n", + "inspector": "# Utilizzo dell'inspector\n\nL'inspector è quell'elemento dell'interfaccia utente sulla parte sinistra della pagina che appare quando viene selezionata una funzionalità e che consente di modificarne i dettagli.\n\n### Selezione di un tipo di funzionalità\n\nDopo che è stato aggiunto un punto, una linea o un'area, è possibile scegliere quale tipo di caratteristica abbia, come ad esempio se si tratta di una strada principale o una strada residenziale, di un supermarket o di un caffè.\nL'inspector visualizzerà i pulsanti per le caratteristiche più comuni e sarà possibile trovarne altre semplicemente digitando la caratteristica voluta nella casella di ricerca.\n\nFare clic sulla 'i' che si trova nell'angolo in basso a destra del pulsante per saperne di più. Fare clic su un pulsante per scegliere quel tipo.\n\n### Utilizzo di Form e di Tag di modifica\n\nDopo aver scelto un tipo di caratteristica o quando si è selezionato una caratteristica per la quale è già stato assegnato un tipo, l'inspector mostrerà i campi con i dettagli come ad esempio il nome e l'indirizzo.\n\nAl di sotto dei campi è possibile fare clic sulle icone per aggiungere ulteriori dettagli come ad es. informazioni [Wikipedia](http://www.wikipedia.org/), accesso consentito alle carrozzine, e altro.\n\nSotto l'inspector è possibile fare clic su 'Tag aggiuntivi' per aggiungere arbitrariamente altri tag all'elemento. [Taginfo](http://taginfo.openstreetmap.org/) è una buona risorsa per imparare qualcosa sulle combinazioni di tag più comuni.\n\nLe modifiche effettuate nell'inspector vengono applicate automaticamente alla mappa.\nE' possibile annullarle in ogni momento cliccando semplicemente sul pulsante 'Ripristina'.\n", "buildings": "# Edifici\n\nOpenStreetMap è il più grande database online di edifici. Puoi creare e migliorare questo database.\n\n### Selezione\n\nPuoi selezionare un edificio cliccando sul suo bordo. Ciò evidenzierà l'edificio e aprirà un piccolo menu degli strumenti ed una barra laterale contenente ulteriori informazioni sull'edificio.\n\n### Modifica\n\nTalvolta gli edifici sono posizionati in maniera errata o hanno tag incorretti.\n\nPer spostare un edificio, selezionalo, quindi clicca sullo strumento 'Sposta'. Sposta il mouse per traslare l'edificio, clicca nuovamente quando è nel posto giusto.\n\nPer migliorare la forma di un edificio, clicca e sposta i nodi che formano il suo contorno in una posizione corretta.\n\n### Creazione\n\nUna delle principali diatribe sulla aggiunta degli edifici alla mappa riguarda il fatto che OpenStreetMap permette di creare edifici come aree o come singoli punti. La regola generale in questi casi è di _mappare un edificio come un'area quando possibile_, e di mappare compagnie, case, amenità e altri oggetti che operano nell'edificio come punti all'interno della forma dell'edificio.\n\nInizia a disegnare un edificio come una forma cliccando sul pulsante 'Area' nella parte alta a sinistra dell'interfaccia, e termina premendo 'Invio' sulla tastiera o cliccando sul primo nodo che hai disegnato per chiudere la forma.\n\n### Eliminazione\n\nSe un edificio è completamente sbagliato - non è presente nelle immagini satellitari e possibilmente hai controllato di persona che esso non esista davvero - puoi eliminarlo, in modo da toglierlo dalla mappa. Sii cauto quando elimini un elemento - come ogni modifica, i risultati sono visibili a tutti e le immagini satellitari sono spesso datate, perciò l'edificio potrebbe essere stato costruito nel frattempo.\n\nPuoi eliminare un edificio cliccandoci sopra per selezionarlo, quindi cliccando sull'icona del cestino o premendo il tasto 'Canc' sulla tastiera.\n\n", "relations": "# Relazioni\n\nUna relazione è un particolare elemento di OpenStreetMap che raggruppa altri\nelementi. Per esempio due tipi comuni di relazione sono le *relazioni percorso*,\nche raggruppano pezzi di strada che appartengono alla stessa via o autostrada,\ne i *multipoligoni*, che raggruppano diverse linee componenti aree complesse\n(un'area con più pezzi o con dei buchi in essa come una ciambella).\n\nGli elementi di una relazione sono chiamati *membri*. Nella barra laterale puoi\nvedere di quale relazione un elemento è membro e cliccare sulla relazione per\nselezionarla. Quando una relazione viene selezionata puoi vedere l'elenco di\ntutti i suoi membri nella barra laterale e gli stessi selezionati nella mappa.\n\nNella maggior parte dei casi iD si occuperà delle relazioni automaticamente\ndurante la modifica. Controlla solo che quando cancelli un elemento per\nridisegnarlo più accuratamente, il nuovo elemento sia un membro della stessa\nrelazione dell'originale.\n\n## Modificare le Relazioni\n\nSe vuoi modificare le relazioni, ecco le basi.\n\nPer aggiungere un elemento ad una relazione seleziona l'elemento, clicca il\ntasto \"+\" nella sezione \"Tutte le relazioni\" della barra laterale e quindi seleziona\nla relazione o digita il suo nome.\n\nPer creare una nuova relazione seleziona il primo elemento che diventerà\nmembro, clicca il tasto \"+\" nella sezione \"Tutte le relazioni\" della barra laterale\ne seleziona \"Nuova relazione...\".\n\nPer rimuovere un elemento da una relazione seleziona l'elemento e clicca sul\ncestino vicino alla relazione da cui vuoi rimuoverlo.\n\nPuoi creare dei multipoligoni con dei buchi usando lo strumento \"Unisci\".\nDisegna due aree (quella esterna e quella interna), tenendo premuto il tasto\nMaiusc della tastiera clicca su ognuno di loro per selezionarli entrambi e quindi\nclicca sul tasto \"Unisci\" (+).\n" }, @@ -382,8 +388,11 @@ }, "presets": { "categories": { + "category-building": { + "name": "Edifici" + }, "category-landuse": { - "name": "Utilizzo del terreno" + "name": "Utilizzi del terreno" }, "category-path": { "name": "Sentiero" @@ -397,8 +406,11 @@ "category-route": { "name": "Percorso" }, - "category-water": { - "name": "Acqua" + "category-water-area": { + "name": "Specchi d'acqua" + }, + "category-water-line": { + "name": "Corsi d'acqua" } }, "fields": { @@ -636,7 +648,7 @@ "label": "Senso unico" }, "opening_hours": { - "label": "Ore" + "label": "Orari" }, "operator": { "label": "Operatore" @@ -696,6 +708,9 @@ "shelter": { "label": "Riparo" }, + "shelter_type": { + "label": "Tipo" + }, "shop": { "label": "Tipo" }, @@ -736,6 +751,9 @@ "trail_visibility": { "label": "Visibilità del Tracciato" }, + "tree_type": { + "label": "Tipo" + }, "vending": { "label": "Beni venduti" }, @@ -917,7 +935,7 @@ }, "amenity/parking": { "name": "Parcheggio", - "terms": "Parcheggio" + "terms": "parcheggio auto,autorimessa" }, "amenity/pharmacy": { "name": "Farmacia", @@ -971,6 +989,10 @@ "name": "Scuola", "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università" }, + "amenity/shelter": { + "name": "Riparo", + "terms": "ricovero,rifugio,tettoia,pensilina,bivacco,grotta" + }, "amenity/swimming_pool": { "name": "Piscina", "terms": "Piscina" @@ -1044,8 +1066,8 @@ "terms": "Entrata" }, "barrier/fence": { - "name": "Recinto", - "terms": "Recinto" + "name": "Recinzione", + "terms": "recinto,recinzione,rete,reticolato" }, "barrier/gate": { "name": "Cancello", @@ -1135,6 +1157,14 @@ "name": "Entrata", "terms": "Entrata" }, + "footway/crossing": { + "name": "Attraversamento", + "terms": "attraversamento pedonale,strisce pedonali,attraversamento,dosso" + }, + "footway/sidewalk": { + "name": "Marciapiede", + "terms": "marciapiedi,passeggio,salvagente,banchina" + }, "highway": { "name": "Strada", "terms": "Strada" @@ -1383,6 +1413,10 @@ "name": "Svago", "terms": "Svago" }, + "leisure/common": { + "name": "Luogo pubblico", + "terms": "beni comuni,comune,pubblico,spazio pubblico,spazio comune,libero accesso" + }, "leisure/dog_park": { "name": "Area per cani", "terms": "Area cani" @@ -1479,6 +1513,10 @@ "name": "Faro", "terms": "Faro" }, + "man_made/observation": { + "name": "Torre di osservazione", + "terms": "torre,osservazione,osservatorio,piattaforma,osservativa,antincendio,panorama" + }, "man_made/pier": { "name": "Molo", "terms": " Passerella " @@ -1595,6 +1633,58 @@ "name": "Uffici", "terms": "Ufficio" }, + "office/architect": { + "name": "Architetto", + "terms": "architetto,studio,design" + }, + "office/employment_agency": { + "name": "Agenzia per l'impiego", + "terms": "interinale,impiego,lavoro,ufficio per l'impiego,ufficio interinale" + }, + "office/financial": { + "name": "Ufficio Finanziario", + "terms": "finanza,finanziaria,fiduciaria,mag" + }, + "office/government": { + "name": "Ufficio governativo", + "terms": "sede,dipartimento,governo,comune,provincia,regione,procura,provveditorato,pretura" + }, + "office/insurance": { + "name": "Assicurazione", + "terms": "assicurativo,sinistri,polizza assicurativa" + }, + "office/it": { + "name": "Ufficio informatico", + "terms": "internet,web,app,applicazioni,siti web,siti internet,rete internet,computer,informatica,programmazione" + }, + "office/lawyer": { + "name": "Studio legale", + "terms": "ufficio legale,legale,avvocato,avvocatura,magistrato,difensore,azzeccagarbugli" + }, + "office/newspaper": { + "name": "Giornale", + "terms": "testata,quotidiano,redazione" + }, + "office/ngo": { + "name": "Organizzazione non governativa", + "terms": "ong,ngo,onu,associazione,non profit,nonprofit,no profit,onlus,non lucrativa,senza fini di lucro,cooperativa,cooperazione" + }, + "office/political_party": { + "name": "Sede di partito", + "terms": "circolo,partito,politica,sezione" + }, + "office/telecommunication": { + "name": "Ufficio di telecomunicazioni", + "terms": "telecomunicazioni,telefonia" + }, + "office/therapist": { + "name": "Terapista", + "terms": "fisioterapista,terapeuta" + }, + "office/travel_agent": { + "name": "Agenzia di viaggi", + "terms": "travel,tour operator,turismo,viaggi,escursionismo" + }, "place": { "name": "Luogo", "terms": "Luogo" @@ -1643,6 +1733,10 @@ "name": "Linea elettrica", "terms": "Elettrodotto" }, + "power/minor_line": { + "name": "Linea elettrica minore", + "terms": "corrente,elettricità,elettrodotto,cavo elettrico" + }, "power/pole": { "name": "Palo della luce", "terms": "Pilone elettricità" @@ -1764,7 +1858,7 @@ "terms": "Officina" }, "shop/chemist": { - "name": "Farm", + "name": "Drogheria", "terms": "Articoli di pulizia e bellezza" }, "shop/clothes": { @@ -1848,13 +1942,17 @@ "terms": "Gioielleria" }, "shop/kiosk": { - "name": "Edicola", + "name": "Chiosco", "terms": "Chiosco" }, "shop/laundry": { "name": "Lavanderia", "terms": "Lavanderia" }, + "shop/locksmith": { + "name": "Fabbro", + "terms": "" + }, "shop/mall": { "name": "Centro commerciale", "terms": " Centro commerciale " @@ -1887,6 +1985,10 @@ "name": "Negozio di animali", "terms": "Negozio di animali" }, + "shop/photo": { + "name": "Fotografo", + "terms": "fotografia,fotografico,fotografo,foto,diapositive,rullini,macchine fotografiche" + }, "shop/shoes": { "name": "Negozio di scarpe", "terms": "Negozio scarpe" diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json index 3318467fa..511fbf3f9 100644 --- a/vendor/assets/iD/iD/locales/ja.json +++ b/vendor/assets/iD/iD/locales/ja.json @@ -83,7 +83,8 @@ "annotation": { "line": "ラインの角を90度に整形", "area": "エリアの角を90度に整形" - } + }, + "not_squarish": "直交にできない辺があるため、角を直角に整形することができません" }, "straighten": { "title": "直線化", @@ -246,15 +247,18 @@ "back_tooltip": "地物の編集", "remove": "削除", "search": "検索", + "multiselect": "選択した項目", "unknown": "不明", "incomplete": "<ダウンロード未完了>", "feature_list": "地物を検索", - "edit": "地物を編集" + "edit": "地物を編集", + "none": "なし" }, "background": { "title": "背景画像", "description": "背景画像設定", "percent_brightness": "明度 {opacity}%", + "none": "なし", "custom": "カスタム", "custom_prompt": "タイル表示のテンプレートを入力。Z/X/Y スキーマに対して {z}, {x}, {y} を与え、 quadtile schemeには {u} を与える記法で記述します。", "fix_misalignment": "背景画像をずらす", @@ -317,7 +321,9 @@ "cannot_zoom": "現在のモードでは、これ以上ズームアウトできません。", "gpx": { "local_layer": "ローカルマシン上のGPXファイル", - "drag_drop": "この場所に .gpxファイルをドラッグ＆ドロップ" + "drag_drop": "ページ上に .gpxファイルをドラッグ＆ドロップするか、画面右側のボタンをクリックしてください", + "zoom": "GPX軌跡へズーム", + "browse": ".gpxファイル追加" }, "help": { "title": "ヘルプ", @@ -325,9 +331,8 @@ "editing_saving": "# データの編集と保存\n\nこのエディタはオンライン環境で使用されることを前提としています、現在あなたはブラウザを通じてアクセスしているはずです。\n\n### 地物の選択\n\nポイント情報や道路といった地物情報は、地図上に表示されている対象をクリックすることで選択ができます。選択された地物はハイライトされ、詳細情報が記載されたパネルが表示されます。このパネル内の情報を編集することで、対象の地物の情報を編集できます。\n\n複数の地物を範囲選択するには、キーボードのShiftキーを押しながら地図上をクリックし、ドラッグしてください。ドラッグした範囲が四角形で表示され、その四角形の内の地物がすべて選択されます。\n\n### 編集内容の保存\n\n道路や建物、特定の場所などの追加/編集結果は、OSMサーバに保存されるまではあなたのローカルPC上に格納されます。間違った編集をしてしまっても慌てないでください。巻き戻しボタン(Undo)をクリックすることで、編集作業を巻き戻すことができます。同じ編集をもう一度実施したい場合は、巻き戻しのキャンセルボタン(redo)をクリックしてください。\n\n編集に区切りがついたら、'保存'をクリックして作業を終了してください。例えば街の一区画の編集が終わり、そこから別の場所の編集に移動する場合などです。データを保存する前に、編集した内容をもう一度見直しましょう。データが間違っている可能性がある場所がエディタ上に表示されますので、必要に応じて修正を行なってください。\n\n編集内容に問題がなければ、そのまま保存を行いましょう。あなたの編集内容を簡潔に表すコメントを記入した後、もう一度'保存'をクリックすると、あなたの編集内容が[OpenStreetMap.org](http://www.openstreetmap.org/)に投稿されます。投稿されたデータはあなた以外のすべての利用者に対しても表示されるようになり、そこに情報を追加したり、編集したりすることができるようになります。\n\n編集を一度に完了させることができない場合は、ブラウザのエディタ表示をそのままにして、いったんブラウザを閉じてしまいましょう。同じブラウザとエディタを使えば、後々、作業の続きを実施することができます。\n", "roads": "# 道路\n\nこのエディタは道路を作成、修正、削除する機能を備えています。小路、自動車道、山道、自転車道等々、編集対象となる道路の種別に制限はありません。交差する道路を細かく地図に描くことも可能です。\n\n### 選択\n\n対象の道路をクリックすることで、選択することができます。選択された道路は強調表示され、ラインに対する操作を行う小さなツール項目がその近くに表示されます。道路の詳細情報は、サイドバーに一覧表示されます。\n\n### 修正\n\n既に描かれている道路の中には、背景画像の衛星写真やGPSトラックと明らかに位置が異なるものがあります。そうした道路を見つけたら、道路を正しい位置に修正しましょう。\n\nまずは変更対象となる道路をクリックして選択します。対象の道路が強調表示され、操作可能なポイントがラインの上に表示されて、位置の変更が可能となります。ラインとポイントを、より正しいと思われる位置に移動させてください。ライン上のポイントを増やすには、ラインの上でダブルクリックすることで、その位置にポイントを作成することが可能です。\n\n道路の接続状態が誤っている場合は、どちらかの道路の上に表示されているポイントをもう一つのラインの上に移動させ、2つのラインを接続してください。道路の接続は地図にとって非常に重要であり、車輌のナビゲーションを行うためには道路が正しく接続されていることが必須となります。\n\n'移動'ツールをクリックするか、キーボードでショートカットキー 'M' を押すことで、道路全体を一度に移動させることができます。もう一度クリックすることで、その位置へ対象が移動します。\n\n### 削除\n\n描かれている道路が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で道路が無いことを確認できた場合 - その道路のデータそのものを削除し、地図から消すことが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、道路が新しく敷設されているかもしれないことを意識してください。\n\n道路を削除するには、対象のラインをクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n\n### 新規作成\n\n道路があるはずなのにまだ描かれていない？ エディタ左上に表示されている'ライン'アイコンをクリックするか、ショートカットキー'2'を押すと、ラインの新規描画を行うことができます。\n\n地図をクリックすることで、その地点からラインの描画が開始されます。もし既に描かれている道路から枝分かれした道路の場合は、既存道路で分岐が行われている部分をクリックして、その位置から描画を始めるようにしてください。\n\n衛星画像やGPSログなどで表示されている道路の形に添ってクリックし、ポイントを作成してください。描画している道路が他の道路と交差している場合は、交差している位置でクリックし、ラインを接続してください。描画を終了するには、終了する位置でダブルクリックするか、キーボードの'Return'、あるいは'Enter'キーを押してください。\n\n", "gps": "# GPS\n\nOpenStreetMapにおいて、GPSデータは最も信用できる情報源です。iDエディタはあなたのPC上にある`.gpx`ファイルのトレース機能をサポートしています。GPSログは、スマートフォンのアプリケーションやGPSロガーを使用することで収集することができます。\n\nGPSを使用した現地調査の詳細な進め方については、[GPSによる調査](http://learnosm.org/jp/beginner/using-gps/)を参照してください。\n\nGPXログファイルをエディタの上にドラッグ＆ドロップすることで、ファイルの内容をエディタ上に表示させることができます。ファイル形式の読み込みが正常に完了すると、ログは明るい緑色の線としてエディタ上に表示されます。エディタの左側に配置されている'背景画像設定'メニューをクリックすると、ログの表示/非表示、GPXが配置されたレイヤーへのズームを設定することができます。\n\nこのGPXログファイルはOpenStreetMapへ直接アップロードされたものではありません。このログを参考情報として地図を描いたり、あなたが追加する地物の配置場所の参考情報とするのがよいでしょう。また、あなた以外のユーザにもGPSログを使ってもらうためには[OpenStreetMapへのアップロード機能](http://www.openstreetmap.org/trace/create)を利用してください。\n", - "imagery": "# 背景画像\n\n地図を作成するにあたって、航空写真は重要なリソースのひとつです。上空からの撮影、衛星写真、自由な利用が認められた情報源などは、画面左側の'背景画像設定'メニューから表示させることが可能です。\n\nデフォルト設定では[Bing Maps](http://www.bing.com/maps/)の衛星写真レイヤーが表示されていますが、地図のズームレベル変更などで新しい場所を表示する際に別のリソースを表示させることが可能です。英国やフランス、デンマークでは、特定の地域に限り非常に細密な画像が利用可能です。\n\n画像提供側の間違いが原因で、背景画像と地図データの位置がずれていることがあります。既存道路の多くが一方向にずれている場合、すべての地物の位置を一度に移動させてしまう前に背景画像の表示位置を調整し、オフセットがされていないか確認を行なってください。位置の調整は、背景画像設定の一番下に表示されている'背景画像をずらす'という項目から行うことができます。\n", + "imagery": "# 背景画像\n\n地図を作成するにあたって、航空写真は重要なリソースのひとつです。上空からの撮影、衛星写真、自由な利用が認められた情報源などは、画面左側の'背景画像設定'メニューから表示させることが可能です。\n\nデフォルト設定では[Bing Maps](http://www.bing.com/maps/)の衛星写真レイヤーが表示されていますが、地図のズームレベル変更などで新しい場所を表示する際に別のリソースを表示させることが可能です。英国やフランス、デンマークでは、特定の地域に限り非常に細密な画像が利用可能です。\n\n画像提供側の間違いが原因で、背景画像と地図データの位置がずれていることがあります。既存道路の多くが一方向にずれている場合、すべての地物の位置を一度に移動させてしまう前に、背景画像の表示位置を調整してみて、オフセットがされていないか確認を行なってください。位置の調整は、背景画像設定の一番下に表示されている'背景画像をずらす'という項目から行うことができます。\n", "addresses": "# 住所\n\n住所情報は地図において最も有用な情報のひとつです。\n\n住所情報は街路の付帯情報として扱われることがほとんどですが、OpenStreetMapにおける住所情報は、街路にそって配置されている建物の属性として記録されます。\n\n住所情報は建物を表す輪郭に付与しても構いませんし、独立したポイントとして配置してもかまいません。また、住所データの最適な情報源は現地調査、あるいは個人の記憶によるものです。GoogleMapsなど、他の地図からの転載は特別な許諾がない限り固く禁止されています。\n\n注: 日本では住所システムの体系が異なるため、街路を基とする上記の方法を適用することはできません。\n", - "inspector": "# 地物情報表示ウィンドウ\n\n地図上の地物を選択すると、画面右側に入力ウィンドウが表示されます。地物に関する詳細情報の編集はこのウィンドウから行います。\n\n### 地物種別の選択\n\nポイントやライン、エリアを描画する際、描いた地物の種別を選択することができます。これによって、ラインが高速道路なのか住宅道路なのか、ポイントがスーパーマーケットなのか喫茶店なのか、などを表現します。地物情報表示ウィンドウには、よく利用される地物が表示されています。その他の地物を表示させたい場合は、検索ボックスから検索を行なってください。\n\n地物種別が表示されている右下にある'i'ボタンをクリックすることで、その種別の詳細情報を表示させることができます。アイコンをクリックすることで、種別を確定させることができます。\n\n### フォームを利用したタグ編集\n\n地物の種別を選択した後、あるいは既になんらかの種別が割り当て済の対象を選択した際には、その地物の名称や住所などの詳細情報がウィンドウ内に表示されます。\n\n表示中のフィールドの下部にあるアイコンをクリックすると、追加の入力フィールドが表示されます。例えば[Wikipedia](http://www.wikipedia.org/)情報や、車椅子の利用可否などです。\n\n入力ウィンドウの一番下に配置されている 'タグ項目を追加'をクリックすると、要素に対する自由記入フォームが表示されます。利用されることが多いタグの組み合わせは[Taginfo](http://taginfo.openstreetmap.org/)から検索が可能です。\n\n入力ウィンドウに記入した内容は、エディタ上の地図に即座に反映されます。'やり直し'ボタンをクリックすることで、いつでも入力内容を取り消すことが可能です。\n\n### 地物情報表示ウィンドウを閉じる\n\nウィンドウを閉じるには、ウィンドウ右上のXボタンをクリックするか、キーボードの'Escape'キーを押すか、地図上のどこかをクリックしてください。\n", "buildings": "# 建物\n\nOpenStreetMapは世界でも有数の建物情報データベースです。このデータベースへの情報追加や改善は誰しもが参加可能です。\n\n### 選択\n\n建物の輪郭をクリックすると、その建物を選択することができます。建物はハイライト表示され、小さなツール項目と、画面右側にその建物の詳細情報が表示されます。\n\n### 修正\n\n建物の位置や、付与されているタグが誤っていることがあります。\n\n建物全体の位置を移動させるには、'移動'ツールのアイコンをクリックしてください。マウスを動かして建物を正しい位置へ移動させ、もう一度クリックして位置を確定させます。\n\n同様に、建物を形成しているポイントをクリックして正しい位置へ移動させることで、建物の形状を修正することができます。\n\n### 新規作成\n\nOpenStreetMapで建物を描く場合によくあがる質問として、建物をエリアとポイントのどちらで描いたほうがよいか、というものがあります。最善の方法では _できる限り、建物はエリアとして描き_ 、会社や個人宅、施設など、建物から独立した情報は別途ポイントとして、エリアとして描かれた建物の内側に配置します。\n\n画面左上に表示されている項目から'エリア'ボタンをクリックして、建物をエリアとして描いてみましょう。エリアの描画を終了するにはキーボードの'Return'キーを押すか、エリアを描き始めたポイントをもう一度クリックしてください。\n\n### 削除\n\nもし建物の情報が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で建物が無いことを確認できた場合 - その建物データそのものを削除し、地図から消去することが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、建物が新しく建設されているかもしれないことを意識してください。\n\n建物を削除するには、対象をクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n", "relations": "# リレーション\n\nリレーションとはOpenStreetMapで地物を表現する際の特殊な記法で、複数の地物をひとつのグループとして扱うことが可能です。例えばリレーションでよく使われるものは、特定の高速道路や有料道路を複数のウェイを使って表現する *route リレーション* 、そして複数のラインをグループ化することによって分割されたエリアやドーナツ型の空洞部分などの複雑な表現を行う *マルチポリゴン* があげられます。\n\nリレーションを構成する地物は *メンバー* と呼ばれます。OSM上の地物がどのリレーションのメンバーになっているかはサイドバーに表示され、選択することが可能です。リレーションを選択するとその所属メンバーがすべてサイドバーにリストアップされ、地図上にその位置がハイライト表示されます。\n\niDでは編集中のリレーション情報はほとんどの場合、自動的に補完されます。ただし、例えば位置が間違っている道路をいったん削除して新しく書き直す際などは、書き直した道路ウェイが削除したウェイと同じリレーションに再度所属するように編集するべきです。\n\n## リレーションの編集\n\nリレーションを編集する場合、基本の形は以下のとおりです。\n\nリレーションに地物を追加してメンバーにする場合、まず対象の地物を選択した状態で、サイドバーの \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックします。クリックしたら、リレーションの名称を入力するか、一覧から選んでください。\n\nリレーションを新しく作成する場合は、メンバーとして所属することになる最初の地物を選択した状態で \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックし、\"新しいリレーション\"を選択してください。\n\nリレーションから地物を除外する場合は、対象の地物を選択し、除外を行いたいリレーションの隣に表示されているゴミ箱アイコンをクリックします。\n\nまた、\"結合\"機能を使うことで、空洞部分をもつマルチポリゴンを作成することができます。2つのエリアを描き、それぞれを内側(inner)と外側(outer)とします。次に、キーボードのShiftキーを押しながらそれぞれの地物をクリックし、両方を選択状態にしてから \"結合\" (+) ボタンをクリックしてください。\n" }, @@ -382,6 +387,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "建物" + }, "category-landuse": { "name": "土地利用" }, @@ -397,8 +405,11 @@ "category-route": { "name": "ルート" }, - "category-water": { - "name": "æ°´è·¯" + "category-water-area": { + "name": "水面" + }, + "category-water-line": { + "name": "水面" } }, "fields": { @@ -470,6 +481,9 @@ "atm": { "label": "ATM" }, + "backrest": { + "label": "背もたれ" + }, "barrier": { "label": "タイプ" }, @@ -693,6 +707,9 @@ "shelter": { "label": "避難所" }, + "shelter_type": { + "label": "タイプ" + }, "shop": { "label": "店舗種別" }, @@ -733,6 +750,9 @@ "trail_visibility": { "label": "道の可視度" }, + "tree_type": { + "label": "タイプ" + }, "vending": { "label": "販売商品の種別" }, @@ -761,7 +781,8 @@ }, "presets": { "address": { - "name": "住所" + "name": "住所", + "terms": "住所,郵便,じゅうしょ" }, "aeroway": { "name": "航空施設" @@ -789,7 +810,8 @@ "name": "航空機誘導路" }, "aeroway/terminal": { - "name": "空港ターミナル" + "name": "空港ターミナル", + "terms": "空港ターミナル,ターミナル,空港" }, "amenity": { "name": "(公共)施設" @@ -798,13 +820,16 @@ "name": "アートセンター" }, "amenity/atm": { - "name": "ATM" + "name": "ATM", + "terms": "atm,ATM,えーてぃーえむ,預貯金,引き出し" }, "amenity/bank": { - "name": "銀行" + "name": "銀行", + "terms": "銀行,ぎんこう,バンク,信用金庫,振り込み" }, "amenity/bar": { - "name": "バー" + "name": "バー", + "terms": "バー,飲み屋,呑み屋,ばー" }, "amenity/bench": { "name": "ベンチ" @@ -917,6 +942,9 @@ "amenity/school": { "name": "学校" }, + "amenity/shelter": { + "name": "避難所" + }, "amenity/swimming_pool": { "name": "プール" }, @@ -1040,6 +1068,9 @@ "entrance": { "name": "エントランス" }, + "footway/crossing": { + "name": "横断歩道" + }, "highway": { "name": "道路" }, @@ -1118,6 +1149,9 @@ "highway/steps": { "name": "階段" }, + "highway/stop": { + "name": "停止標識" + }, "highway/tertiary": { "name": "主要な一般道" }, @@ -1295,6 +1329,9 @@ "man_made/lighthouse": { "name": "灯台" }, + "man_made/observation": { + "name": "監視塔" + }, "man_made/pier": { "name": "桟橋" }, @@ -1382,6 +1419,33 @@ "office": { "name": "オフィス" }, + "office/administrative": { + "name": "市町村役所" + }, + "office/architect": { + "name": "建築家" + }, + "office/company": { + "name": "会社事務所" + }, + "office/employment_agency": { + "name": "人材紹介" + }, + "office/it": { + "name": "ITオフィス" + }, + "office/lawyer": { + "name": "法律事務所" + }, + "office/ngo": { + "name": "NGO事務所" + }, + "office/therapist": { + "name": "心療内科" + }, + "office/travel_agent": { + "name": "旅行代理店" + }, "place": { "name": "地名" }, @@ -1577,6 +1641,9 @@ "shop/laundry": { "name": "コインランドリー" }, + "shop/locksmith": { + "name": "錠前屋" + }, "shop/mall": { "name": "ショッピングセンター" }, @@ -1601,6 +1668,9 @@ "shop/pet": { "name": "ペットショップ" }, + "shop/photo": { + "name": "写真販売" + }, "shop/shoes": { "name": "靴屋" }, diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json index 44102b312..833ad9bef 100644 --- a/vendor/assets/iD/iD/locales/ko.json +++ b/vendor/assets/iD/iD/locales/ko.json @@ -74,10 +74,24 @@ "not_closed": "지역이 닫혀있지 않기 때문에 순환을 만들 수 없습니다." }, "orthogonalize": { + "title": "사각지기", + "description": { + "line": "이 선의 모서리를 사각지게 합니다.", + "area": "이 지역의 모서리를 사각지게 합니다." + }, + "key": "S", "annotation": { - "line": "선의 모서리를 직교로 만들었습니다.", - "area": "지역의 모서리를 직교로 만들었습니다." - } + "line": "선의 모서리를 사각지게 했습니다.", + "area": "지역의 모서리를 사각지게 했습니다." + }, + "not_squarish": "사각 형태가 아니기 때문에 사각지게 할 수 없습니다." + }, + "straighten": { + "title": "곧게 하기", + "description": "이 선을 곧게 합니다.", + "key": "S", + "annotation": "선을 곧게 했습니다.", + "too_bendy": "너무 구부러져 있기 때문에 곧게 할 수 없습니다." }, "delete": { "title": "삭제", @@ -137,6 +151,7 @@ }, "rotate": { "title": "회전", + "description": "중심점을 기준으로 이 개체를 회전합니다.", "key": "R", "annotation": { "line": "선을 회전했습니다.", @@ -232,18 +247,21 @@ "back_tooltip": "기능 바꾸기", "remove": "제거", "search": "찾기", + "multiselect": "선택된 항목", "unknown": "알 수 없음", "incomplete": "<다운로드되지 않음>", "feature_list": "기능 찾기", - "edit": "기능 편집" + "edit": "기능 편집", + "none": "없음" }, "background": { "title": "ë°°ê²½", "description": "ë°°ê²½ 설정", "percent_brightness": "명도 {opacity}%", + "none": "없음", "custom": "사용자 지정", "custom_prompt": "타일 템플릿을 입력하세요. 올바른 토큰은 Z/X/Y scheme에 대해 {z}, {x}, {y}이고 quadtile scheme에 대해 {u}입니다.", - "fix_misalignment": "어긋난 것을 고치기", + "fix_misalignment": "정렬 고치기", "reset": "재설정" }, "restore": { @@ -303,11 +321,21 @@ "cannot_zoom": "현재 모드에서 더 축소할 수 없습니다.", "gpx": { "local_layer": "로컬 GPX 파일", - "drag_drop": "페이지에 .gpx 파일을 끌어서 놓으세요" + "drag_drop": "페이지에 .gpx 파일을 끌어 놓거나 오른쪽에 있는 찾아보기 버튼을 클릭하세요", + "zoom": "GPX 트랙하려면 확대", + "browse": ".gpx 파일 찾아보기" }, "help": { "title": "도움말", - "help": "# 도움말\n\n이 편집기는 세계의 자유롭고 편집 가능한 지도인,\n[OpenStreetMap](http://www.openstreetmap.org/)을 위한 편집기입니다.\n모두를 위한 더 나은 세계의 오픈 소스 및 오픈 데이터 지도를 만들고, 당신의\n지역에서 데이터를 추가하거나 업데이드하려면 이를 사용할 수 있습니다.\n\n이 지도에서 만든 편집은 OpenStreetMap을 사용하는 모두에게\n보여질 수 있습니다. 편집을 하기 위해, [무료 OpenStreetMap\n계정](https://www.openstreetmap.org/user/new)이 필요합니다.\n\n[iD 편집기](http://ideditor.com/)는 [GitHub에 사용할 수 있는 소스\n코드](https://github.com/systemed/iD)로 된 협업 프로젝트입니다.\n" + "help": "# 도움말\n\n이 편집기는 세계의 자유롭고 편집 가능한 지도인,\n[OpenStreetMap](http://www.openstreetmap.org/)을 위한 편집기입니다.\n모두를 위한 더 나은 세계의 오픈 소스 및 오픈 데이터 지도를 만들고, 당신의\n지역에서 데이터를 추가하거나 업데이드하려면 이를 사용할 수 있습니다.\n\n이 지도에서 만든 편집은 OpenStreetMap을 사용하는 모두에게\n보여질 수 있습니다. 편집을 하기 위해, [무료 OpenStreetMap\n계정](https://www.openstreetmap.org/user/new)이 필요합니다.\n\n[iD 편집기](http://ideditor.com/)는 [GitHub에 사용할 수 있는 소스\n코드](https://github.com/systemed/iD)로 된 협업 프로젝트입니다.\n", + "editing_saving": "# 편집 및 저장\n\n이 편집기는 주로 온라인으로 작동하도록 설계되었고, 지금 웹사이트를 통해\n접근할 수 있습니다.\n\n### 기능 선택하기\n\n도로나 관심 있는 지점과 같은 지도 기능을 선택하려면, 지도에\n그것을 클릭하세요. 선택된 기능이 강조되고, 그것에 대한 세부 정보로\n된 패널을 열고, 기능을 수행할 수 있는 메뉴를 보여줍니다.\n\n여러 기능을 선택하려면 'Shift' 키를 누르고 있으세요. 다음 선택하려는\n기능을 클릭하거나, 사각형으로 그리기 위해 지도에 드래그하세요.\n상자가 그려지고 ê·¸ 안에 있는 모든 지점이 선택됩니다.\n\n### 편집 저장하기\n\n도로, 건물과 장소 등을 편집하여 바꿀 때, 서버에 저장할 때까지는\n로컬에 저장됩니다. 실수를 걱정하지 마십시오 - 실행 취소\n버튼을 클릭해 바뀜을 실행 취소할 수 있고, 다시 실행 버튼을 클릭해\n바뀜을 다시 실행할 수 있습니다.\n\n편집의 그룹을 마치려면 '저장'을 클릭하세요 - 예를 들어, 마을의\n지역을 완료했고 새 지역에서 시작하고 싶으면 말입니다. 무엇을\n했는지 검토할 기회가 있을 것이며, 무언가 바꾸는 것에 대한 권한이\n없어 보이면 편집기가 유용한 제안과 경고를 제공합니다.\n\n모든 것이 좋아 보이면, 모든 다른 사용자에게 보여지고 구축하고 개선하기 위해 다른\n사용자가 사용할 수 있는 곳인, [OpenStreetMap.org](http://www.openstreetmap.org/)에\n바뀜을 게시하기 위해 바꾼 것을 설명할 짧은 요약을 입력하고 '저장'을\n다시 클릭할 수 있습니다.\n\n한 번에 앉아서 편집을 마칠 수 없으면, (같은 브라우저와 컴퓨터에서)\n편집기 창을 떠나고 나서 돌아올 수 있으며, 편집기 애플리케이션은\n작업을 되돌리도록 제공합니다.\n", + "roads": "# 도로\n\n이 편집기로 도로를 만들고, 고치고, 삭제할 수 있습니다. 도로는 모든 종류가\n될 수 있습니다: 경로, 고속도로, 산책로, 자전거 도로와 더 많이 - 어떠한 자주 교차되는 세그먼트도 매핑할 수 있어야 합니다.\n\n### 선택하기\n\n도로를 선택하려면 도로를 클릭하세요. 지도와 도로에 대한 자세한\n정보를 보여주는 사이드바가 있는 작은 도구 메뉴와 함께, 외곽선이\n보여져야 합니다.\n\n### 수정하기\n\n때때로 도로 뒤나 GPS 트랙에 있는 영상이 정렬되지 않은 도로를\në³¼ 수 있습니다. 이러한 도로를 조정할 수 있으며 조정하면 올바른\n위치에 있게 됩니다.\n\n먼저 바꾸고 싶은 도로를 클릭하세요. 도로가 강조되고 더 나은 위치로\n드래그할 수 있는 조절 점이 보여집니다. 더 자세하게 하기 위해 새\n조절 점을 추가하고 싶으면, 노드 없이 도로의 부분을 더블 클릭하면\n추가됩니다.\n\n길을 다른 길로 연결하지만, 제대로 지도에 연결되어 있지 않으면,\n그들과 합치기 위해 다른 도로 위에 ê·¸ 도로의 조절 점 중 하나를\n드래그할 수 있습니다. 도로 연결이 있는 것은 지도에 있어서 중요하고\n운전 경로를 제공하는 데 있어서 필수입니다.\n\n또한 한 번에 전체 도로를 옮기려면 '이동' 도구를 클릭하거나 `M` 바로가기 키를 누를 수\n있으며, 해당 움직임을 저장하려면 다시 클릭할 수 있습니다.\n\n### 삭제하기\n\n도로가 전체적으로 잘못되었다면 - 위성 영상에서 존재하지 않는 것을 ë³¼ 수\n있으며 이상적으로는 나타나지 않는 것으로 현지로 확인되었습니다 - 지도에서\n도로를 제거할 수 있습니다. 기능을 삭제할 때 주의하십시오 -\n어떠한 다른 편집, 모두에게 보여지는 결과와 위성 영상 같은 것은 때때로\n오래되었으며, 그래서 도로는 단순히 새로 지어졌을 수 있습니다.\n\n도로를 클릭하여 선택한 다음, 휴지통 아이콘을 클릭하거나 '삭제' 키를\n눌러 도로를 삭제할 수 있습니다.\n\n### 만들기\n\n어딘가에 찾은 도로가 있어야 하지만 없습니까? 선 그리기를 시작하려면\n편집기의 위 왼쪽에 '선' 아이콘을 클릭하거나 `2` 바로가기 키를 누르세요.\n\n그리기를 시작하려면 지도에 도로의 시작 부분을 클릭하세요. 도로가\n기존 도로에서 분기되어 있다면, 연결할 장소를 클릭하여 시작하세요.\n\n다음 위성 영상이나 GPS에 따라, 올바른 경로를 따를 수 있도록 도로를 따라\n점을 클릭하세요. 그리는 도로가 다른 도로와 교차하면, 교차점을 클릭하여\n도로를 연결하세요. 그리기가 완료되면, 더블 클릭하거나\n키보드에 있는 'Return' 또는 'Enter'를 누르세요.\n", + "gps": "# GPS\n\nGPS 데이터는 OpenStreetMap에 대한 데이터의 가장 신뢰할 수 있는 자료입니다.\n이 편집기는 로컬 컴퓨터에 있는 `.gpx` 파일로 로컬 추적을 지원합니다. 스마트폰\n애플리케이션과 개인 GPS 하드웨어와 같은 것으로 GPS 추적을 모을 수 있습니다.\n\nGPS 측량을 수행하는 방법에 대한 자세한 정보는\n[GPS에 의한 측량](http://learnosm.org/en/beginner/using-gps/)을 읽으세요.\n\n매핑에 GPX 트랙을 사용하려면, 지도 편집기 위에 GPX 파일을 끌어 놓으세요.\n인식되면, 밝은 초록 선으로 지도에 추가됩니다. 활성화, 비활성화, 또는 새 GPX가\n배치된 레이어로 확대하려면 오른쪽에 있는 'ë°°ê²½ 설정' 메뉴를 클릭하세요.\n\nGPX 트랙은 OpenStreetMap에 직접 올려지지 않습니다 - 그것을 사용하는 최상의\n방법은 새로운 기능을 추가하기 위한 가이드로 사용하여, 지도를 그리는 것이며,\n다른 사용자가 사용하기 위해 [OpenStreetMap에 그것을 올리는](http://www.openstreetmap.org/trace/create)\n것입니다.\n", + "imagery": "# 영상\n\n항공 영상은 매핑에 있어서 중요한 자료입니다. 비행기 플라이오버, 위성 뷰와\n자유롭게 컴파일된 자료의 조합은 편집기에서 오른쪽에 있는 'ë°°ê²½ 설정' 메뉴에서\n사용할 수 있습니다.\n\n기본적으로 [Bing 지도](http://www.bing.com/maps/) 위성 레이어가 편집기에\n표현되지만, 기존대로 새 지리적 지역으로 지도를 이동하고 확대할 수 있고, 새 자료는\n사용할 수 있게 될 것입니다. 미합중국, 프랑스와 덴마크와 같은 일부 국가는 일부 지역에서\n매우 높은 품질의 영상을 사용할 수 있습니다.\n\n영상은 때때로 영상 제공자 측이 실수하기 때문에 지도 데이터에 오프셋이 있습니다.\n만약 배경에서 도로가 옮겨진 것이 많이 보인다면, 즉시 배경에 맞게 그들 모두를 이동하지\n마십시오. 대신 영상을 조정할 수 있으며 ë°°ê²½ 설정 UI의 아래에 있는 '정렬 고치기'를\n클릭하여 기존 데이터에 맞추면 됩니다.\n", + "addresses": "# 주소\n\n주소는 지도를 위한 가장 유용한 정보의 일부입니다.\n\n주소가 주로 거리의 부분으로 표현되어 있더라도, OpenStreetMap에서 주소는\n거리를 따라 건물과 장소의 특성으로 기록하고 있습니다.\n\n건물 외곽선으로 매핑된 장소뿐만 아니라 단일 지점으로 매핑된 장소에 주소\n정보를 추가할 수 있습니다. 최적의 주소 데이터 자료는 지상에서의 측량이나\n개인 지식에서 있습니다 - 다른 기능과 마찬가지로, Google 지도와 같은 상용\n자료에서 복사하는 행위는 엄격히 금지됩니다.\n", + "inspector": "# 특성 편집기 사용하기\n\n특성 편집기는 선택한 기능의 자세한 내용을 편집할 수 있도록 하는 문서의 왼쪽에\n있는 부분입니다.\n\n### 기능 유형 선택하기\n\n지점, 선이나 지역을 추가하고 나서, 고속도로나 주거 도로, 수퍼마켓이나 카페와\n같은\t어떤 유형인지 선택할 수 있습니다. 특성 편집기는 일반 기능 유형에 대한\n버튼를 보여주며, 찾기 상자에 무엇을 찾고 있는지 입력하여 다른 기능을 찾을\n수 있습니다.\n\n기능에 대해 자세히 알아보려면 기능 유형 버튼의 아래 오른쪽 모서리에 있는\n'i'를 클릭하세요. 해당 유형을 선택하려면 버튼을 클릭하세요.\n\n### 양식을 사용하여 태그 편집하기\n\n기능 유형을 선택하고 나서, 또는 이미 유형이 할당된 기능을 선택할 때,\n특성 편집기는 그것의 이름과 주소와 같은 기능에 대한 자세한 내용으로 된\n필드를 보여줍니다.\n\në³¼ 수 있는 필드 아래에, [위키백과](http://www.wikipedia.org/) 정보,\n휠체어 접근과 ê·¸ 외와 같은, 다른 자세한 내용을 추가하려면 아이콘을\n클릭할 수 있습니다.\n\n특성 편집기 아래에, 요소에 임의의 다른 태그를 추가하려면 '추가적인 태그'를\n클릭하세요. [Taginfo](http://taginfo.openstreetmap.org/)는 인기 있는 태그\n조합에 대한 자세히 알아보기 위한 훌륭한 자료입니다.\n\n특성 편집기에서 바꾼 내용은 자동으로 지도에 적용됩니다. '실행 취소' 버튼을\n클릭하여 언제든지 되돌릴 수 있습니다.\n", + "buildings": "# 건물\n\nOpenStreetMap은 건물의 세계 최대 규모의 데이터베이스입니다. 이 데이터베이스에\n만들고 개선할 수 있습니다.\n\n### 선택하기\n\n건물 경계를 클릭하여 건물을 선택할 수 있습니다. 이것은 건물이 강조되고 작은 도구\n메뉴와 건물에 대한 자세한 정보를 보여주는 사이드바가 열립니다.\n\n### 수정하기\n\n가끔식 건물은 잘못 배치되어 있거나 잘못된 태그가 있습니다.\n\n전체 건물을 이동하려면, 선택하고 나서 '이동' 도구를 클릭하세요. 마우스로\n건물을 옮기고, 올바르게 자리했을 때 클릭하세요.\n\n건물의 특정 모양을 고치려면, 더 나은 장소로의 테두리를 형성하는 노드를\n클릭하고 드래그하세요.\n\n### 만들기\n\n지도에 건물을 추가하는 주변의 주요 질문 중 하나는 OpenStreetMap이 모양과 지점\n둘 다 건물에 기록하는 것입니다. 최선의 규칙은 _가능하면 모양으로 건물을 매핑_하는\n것으로, 회사와 집, 편의 시설을 매핑하고, 건물에서 독립적인 다른 것들은 별도 지점으로,\n건물 모양 안에 배치합니다.\n\n인터페이스의 위 왼쪽에 있는 '지역' 버튼을 클릭하여 모양으로 건물 그리기를 시작하고,\n모양을 닫으려면 키보드에 있는 'Return'을 누르거나 첫 노드를 클릭하여 끝내세요.\n\n### 삭제하기\n\n건물이 전체적으로 잘못되었다면 - 위성 영상에서 존재하지 않는 것을 ë³¼ 수\n있으며 이상적으로는 나타나지 않는 것으로 현지로 확인되었습니다 - 지도에서\n도로를 제거할 수 있습니다. 기능을 삭제할 때 주의하십시오 -\n어떠한 다른 편집, 모두에게 보여지는 결과와 위성 영상 같은 것은 때때로\n오래되었으며, 그래서 건물은 단순히 새로 지어졌을 수 있습니다.\n\n건물을 클릭하여 선택한 다음, 휴지통 아이콘을 클릭하거나 'Delete' 키를\n눌러 건물을 삭제할 수 있습니다.\n", + "relations": "# 관계\n\n관계는 다른 기능을 그룹화하는 OpenStreetMap에 있는 기능의 특수 유형입니다.\n예를 들어, 관계의 일반적인 두 유형은, 특정 프리웨이나 고속도로에 속하는 도로의\n부분을 그룹화하는 *경로 관계*와, 복잡한 지역(도넛처럼 여러 조각이나 구멍이 있는 것)을\n정의하는 여러 선을 그룹화하는 *다중 다각형*입니다.\n\n관계에 있는 기능의 그룹은 *구성원*이라고 부릅니다. 사이드바에서, 기능이\n구성원인 관계를 ë³¼ 수 있으며, 그것을 선택하려면 해당 관계를 클릭하세요.\n관계가 선택되면, 사이드바에 나열된 모든 구성원을 ë³¼ 수 있고 지도에\n강조됩니다.\n\n대부분의 경우, iD는 편집하는 동안 자동으로 관계를 유지하도록 다룰 것입니다.\n여러분이 알고 있어야 하는 중요한 것은 더 정확하게 다시 그리기 위해 도로의\n부분을 삭제한다면, 새 부분은 원래와 같은 관계의 구성원인지 확인해야 합니다.\n\n## 관계 편집하기\n\n관계를 편집하고 싶으면, 여기에 기초가 있습니다.\n\n관계에 기능을 추가하려면, 기능을 선택하고, 사이드바의 \"모든 관계\" 부분에\n있는 \"+\" 버튼을 클릭하고, 관계를 선택하거나 관계의 이름을 입력하세요.\n\n새 관계를 만드려면, 구성원이어야 할 첫 기능을 선택하고, 사이드바의\n\"모든 관계\" 부분에 있는 \"+\" 버튼을 클릭하고, \"새 관계...\"를 선택하세요.\n\n관계에서 기능을 제거하려면, 기능을 선택하고 제거하려는 관계 옆에 있는\n휴지통 버튼을 클릭하세요.\n\n\"병합\" 도구를 사용하여 구명으로 된 다중 다각형을 만들 수 있습니다. 두 지역(안쪽과\n바깥쪽)을 그리고, 그들 둘 다 선택하기 위해 Shift 키를 누른 채로 각각 클릭한 다음,\n\"병합\" (+) 버튼을 클릭하세요.\n" }, "intro": { "navigation": { @@ -341,6 +369,7 @@ }, "lines": { "title": "선", + "add": "선은 도로, 철도와 강과 같은 기능을 표현하는 데 사용됩니다. **새 선을 추가하려면 선 버튼을 클릭하세요.**", "start": "**도로의 끝에 클릭하여 선을 시작하세요.**", "intersect": "선에 더 많은 노드를 추가하려면 클릭하세요. 필요하다면 그리는 동안 지도를 드래그할 수 있습니다. 도로와 선의 다른 많은 유형은 큰 네트워크의 부분입니다. 이 선이 작동하는 애플리케이션을 경로 지정하기 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**", "finish": "선은 마지막 노드를 다시 클릭하여 마칠 수 있습니다. **도로 그리기를 마치세요.**", @@ -359,16 +388,71 @@ }, "presets": { "categories": { + "category-building": { + "name": "건물" + }, + "category-landuse": { + "name": "토지 이용" + }, + "category-path": { + "name": "경로" + }, + "category-rail": { + "name": "선로" + }, "category-road": { "name": "도로" }, "category-route": { "name": "노선" + }, + "category-water-area": { + "name": "물" + }, + "category-water-line": { + "name": "물" } }, "fields": { "access": { - "label": "통행 제한" + "label": "통행 허가 여부", + "placeholder": "알 수 없음", + "types": { + "access": "일반", + "foot": "보행자", + "motor_vehicle": "이륜차", + "bicycle": "자전거", + "horse": "주택" + }, + "options": { + "yes": { + "title": "허가됨", + "description": "통행이 법적으로 허가됨; 정당한 이용" + }, + "no": { + "title": "제한됨", + "description": "통행이 일반 대중에게 허가되지 않음" + }, + "permissive": { + "title": "소유자 허가 필요", + "description": "소유자가 권한을 해제할 때까지 통행이 허가됨" + }, + "private": { + "title": "사유", + "description": "개별적으로 소유자의 허가로만 통행이 허가됨" + }, + "designated": { + "title": "지정 차종만 통행 허가", + "description": "표지판이나 특정 지역 법률에 따라 통행이 허가됨" + }, + "destination": { + "title": "목적 외 통행 금지", + "description": "목적지에 갈 때에만 통행이 허가됨" + } + } + }, + "access_toilets": { + "label": "사용 허가 여부" }, "address": { "label": "주소", @@ -376,7 +460,8 @@ "housename": "건물 이름", "number": "123", "street": "거리", - "city": "도시" + "city": "도시", + "postcode": "우편 번호" } }, "admin_level": { @@ -388,12 +473,18 @@ "amenity": { "label": "유형" }, + "artist": { + "label": "예술가" + }, "artwork_type": { "label": "유형" }, "atm": { "label": "ATM" }, + "backrest": { + "label": "등받이" + }, "barrier": { "label": "유형" }, @@ -413,7 +504,18 @@ "label": "건물" }, "capacity": { - "label": "수용 가능한 수" + "label": "수용 가능한 수", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "방향" + }, + "clock_direction": { + "label": "방향", + "options": { + "clockwise": "시계 방향", + "anticlockwise": "시계 반대 방향" + } }, "collection_times": { "label": "모은 시간" @@ -436,17 +538,21 @@ "denotation": { "label": "명시" }, + "description": { + "label": "설명" + }, "elevation": { "label": "고도" }, "emergency": { - "label": "응급 의료" + "label": "긴급 의료" }, "entrance": { "label": "유형" }, "fax": { - "label": "팩스" + "label": "팩스", + "placeholder": "+31 42 123 4567" }, "fee": { "label": "요금" @@ -454,6 +560,15 @@ "fire_hydrant/type": { "label": "유형" }, + "fixme": { + "label": "고치기" + }, + "generator/method": { + "label": "방식" + }, + "generator/source": { + "label": "참조 정보" + }, "generator/type": { "label": "유형" }, @@ -463,6 +578,15 @@ "historic": { "label": "유형" }, + "iata": { + "label": "IATA" + }, + "icao": { + "label": "ICAO" + }, + "incline": { + "label": "경사" + }, "internet_access": { "label": "인터넷 액세스", "options": { @@ -474,6 +598,10 @@ "landuse": { "label": "유형" }, + "lanes": { + "label": "차선 수", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "레이어" }, @@ -481,13 +609,25 @@ "label": "유형" }, "levels": { - "label": "수준" + "label": "수준", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "조명" + }, + "location": { + "label": "위치" }, "man_made": { "label": "유형" }, "maxspeed": { - "label": "제한 속도" + "label": "제한 속도", + "placeholder": "40, 50, 60..." + }, + "name": { + "label": "이름", + "placeholder": "일반적인 이름 (있으면)" }, "natural": { "label": "자연" @@ -502,7 +642,10 @@ "label": "유형" }, "oneway": { - "label": "일방 통행" + "label": "일방통행" + }, + "oneway_yes": { + "label": "일방통행" }, "opening_hours": { "label": "이용할 수 있는 시간" @@ -510,11 +653,15 @@ "operator": { "label": "운영자" }, + "park_ride": { + "label": "파크 앤드 라이드" + }, "parking": { "label": "유형" }, "phone": { - "label": "전화" + "label": "전화", + "placeholder": "+31 42 123 4567" }, "place": { "label": "유형" @@ -552,6 +699,9 @@ "route_master": { "label": "유형" }, + "sac_scale": { + "label": "통행의 어려움" + }, "service": { "label": "유형" }, @@ -562,20 +712,30 @@ "label": "유형" }, "source": { - "label": "원본" + "label": "참조 정보" }, "sport": { "label": "스포츠" }, "structure": { + "label": "구조물", + "placeholder": "알 수 없음", "options": { "bridge": "다리", - "tunnel": "터널" + "tunnel": "터널", + "embankment": "제방", + "cutting": "절토" } }, + "supervised": { + "label": "감독 장소" + }, "surface": { "label": "노면" }, + "toilets/disposal": { + "label": "처분" + }, "tourism": { "label": "유형" }, @@ -585,6 +745,15 @@ "tracktype": { "label": "유형" }, + "trail_visibility": { + "label": "도로의 가시성" + }, + "tree_type": { + "label": "유형" + }, + "vending": { + "label": "상품 종류" + }, "water": { "label": "유형" }, @@ -592,11 +761,15 @@ "label": "유형" }, "website": { - "label": "웹사이트" + "label": "웹사이트", + "placeholder": "http://example.com/" }, "wetland": { "label": "유형" }, + "wheelchair": { + "label": "휠체어 접근" + }, "wikipedia": { "label": "위키백과" }, @@ -605,18 +778,45 @@ } }, "presets": { + "address": { + "name": "주소" + }, "aeroway": { "name": "항공 시설" }, "aeroway/aerodrome": { "name": "공항" }, + "aeroway/apron": { + "name": "에이프런" + }, + "aeroway/gate": { + "name": "공항 게이트" + }, + "aeroway/hangar": { + "name": "격납고" + }, "aeroway/helipad": { "name": "헬기 착륙장" }, + "aeroway/runway": { + "name": "활주로" + }, + "aeroway/taxiway": { + "name": "유도로" + }, + "aeroway/terminal": { + "name": "공항 터미널" + }, "amenity": { "name": "시설" }, + "amenity/arts_centre": { + "name": "예술 회관" + }, + "amenity/atm": { + "name": "ATM" + }, "amenity/bank": { "name": "은행" }, @@ -630,17 +830,43 @@ "name": "자전거 주차장" }, "amenity/bicycle_rental": { - "name": "자전거 대여소" + "name": "자전거 대여", + "terms": "자전거 대여소,자전거 렌탈" + }, + "amenity/boat_rental": { + "name": "보트 대여", + "terms": "보트 대여소,보트 렌탈" }, "amenity/cafe": { "name": "카페" }, + "amenity/car_rental": { + "name": "자동차 대여", + "terms": "자동차 대여소,자동차 렌탈" + }, + "amenity/car_sharing": { + "name": "ì¹´ 셰어링", + "terms": "자동차 셰어링,자동차 공유" + }, + "amenity/car_wash": { + "name": "세차장" + }, + "amenity/childcare": { + "name": "보육원", + "terms": "보육 시설" + }, "amenity/cinema": { "name": "영화관" }, + "amenity/college": { + "name": "전문대학" + }, "amenity/courthouse": { "name": "법원" }, + "amenity/drinking_water": { + "name": "식수" + }, "amenity/embassy": { "name": "대사관" }, @@ -650,12 +876,21 @@ "amenity/fire_station": { "name": "소방서" }, + "amenity/fountain": { + "name": "분수대" + }, "amenity/fuel": { "name": "주유소" }, + "amenity/grave_yard": { + "name": "묘지" + }, "amenity/hospital": { "name": "병원" }, + "amenity/kindergarten": { + "name": "유치원" + }, "amenity/library": { "name": "도서관" }, @@ -663,7 +898,7 @@ "name": "시장" }, "amenity/parking": { - "name": "주차장" + "name": "자동차 주차장" }, "amenity/pharmacy": { "name": "약국" @@ -671,6 +906,9 @@ "amenity/place_of_worship": { "name": "예배당" }, + "amenity/place_of_worship/buddhist": { + "name": "사찰" + }, "amenity/place_of_worship/christian": { "name": "교회" }, @@ -690,7 +928,12 @@ "name": "우체국" }, "amenity/pub": { - "name": "술집" + "name": "술집", + "terms": "주점" + }, + "amenity/ranger_station": { + "name": "관리소", + "terms": "레인저 스테이션" }, "amenity/restaurant": { "name": "음식점" @@ -701,6 +944,10 @@ "amenity/swimming_pool": { "name": "수영장" }, + "amenity/taxi": { + "name": "택시 승차장", + "terms": "택시 정류장,택시 타는 ê³³" + }, "amenity/telephone": { "name": "전화" }, @@ -716,21 +963,57 @@ "amenity/university": { "name": "대학교" }, + "amenity/vending_machine": { + "name": "자동 판매기" + }, + "amenity/waste_basket": { + "name": "쓰레기통" + }, "area": { "name": "지역" }, + "barrier": { + "name": "ë°©ë²½" + }, + "barrier/block": { + "name": "기둥" + }, + "barrier/bollard": { + "name": "볼라드" + }, + "barrier/cattle_grid": { + "name": "가축 격자" + }, "barrier/city_wall": { "name": "성벽" }, + "barrier/cycle_barrier": { + "name": "자전거 ë°©ë²½" + }, "barrier/ditch": { "name": "구거" }, "barrier/entrance": { "name": "입구" }, + "barrier/fence": { + "name": "울타리" + }, "barrier/gate": { "name": "문" }, + "barrier/hedge": { + "name": "산 울타리" + }, + "barrier/kissing_gate": { + "name": "목장 문" + }, + "barrier/lift_gate": { + "name": "리프트 문" + }, + "barrier/retaining_wall": { + "name": "옹벽" + }, "barrier/stile": { "name": "회전식 문" }, @@ -740,39 +1023,101 @@ "barrier/wall": { "name": "ë²½" }, + "boundary/administrative": { + "name": "행정 경계" + }, "building": { "name": "건물" }, + "building/apartments": { + "name": "아파트먼트" + }, + "building/commercial": { + "name": "상업 건물" + }, "building/entrance": { "name": "입구" }, + "building/garage": { + "name": "차고" + }, + "building/house": { + "name": "주택" + }, + "building/hut": { + "name": "오두막" + }, + "building/industrial": { + "name": "산업 건물" + }, + "building/residential": { + "name": "주거 건물" + }, + "emergency/ambulance_station": { + "name": "구급차 스테이션", + "terms": "앰뷸런스 스테이션" + }, + "emergency/fire_hydrant": { + "name": "소화전" + }, + "emergency/phone": { + "name": "긴급 전화" + }, "entrance": { "name": "입구" }, + "footway/crossing": { + "name": "횡단보도" + }, + "footway/sidewalk": { + "name": "보도" + }, "highway": { "name": "고속도로" }, + "highway/bridleway": { + "name": "승마로" + }, "highway/bus_stop": { "name": "버스 정류장" }, "highway/crossing": { - "name": "건널목" + "name": "교차" }, "highway/cycleway": { - "name": "자전거 경로" + "name": "자전거로" }, "highway/footway": { "name": "보도" }, + "highway/living_street": { + "name": "주택가" + }, + "highway/mini_roundabout": { + "name": "작은 회전교차로" + }, "highway/motorway": { "name": "고속도로" }, + "highway/motorway_junction": { + "name": "고속도로 교차점" + }, + "highway/motorway_link": { + "name": "고속도로 연결도" + }, "highway/path": { "name": "경로" }, + "highway/pedestrian": { + "name": "보행로", + "terms": "보행자 도로" + }, "highway/primary": { "name": "주요 도로" }, + "highway/primary_link": { + "name": "주요 연결도" + }, "highway/residential": { "name": "주거 도로" }, @@ -782,24 +1127,56 @@ "highway/secondary": { "name": "ë³´ì¡° 도로" }, + "highway/secondary_link": { + "name": "ë³´ì¡° 연결도" + }, "highway/service": { "name": "취부 도로" }, + "highway/service/alley": { + "name": "골목" + }, + "highway/service/drive-through": { + "name": "드라이브 스루" + }, + "highway/service/driveway": { + "name": "사설 차도" + }, + "highway/service/emergency_access": { + "name": "긴급 접근" + }, + "highway/service/parking_aisle": { + "name": "주차장 통로" + }, "highway/steps": { "name": "계단" }, + "highway/stop": { + "name": "멈춤 신호", + "terms": "정지 신호" + }, "highway/tertiary": { "name": "3ì°¨ 도로" }, + "highway/tertiary_link": { + "name": "3ì°¨ 연결도" + }, "highway/track": { "name": "트랙" }, "highway/traffic_signals": { - "name": "교통 신호" + "name": "신호등", + "terms": "교통 신호" }, "highway/trunk": { "name": "간선 도로" }, + "highway/trunk_link": { + "name": "간선 연결도" + }, + "highway/turning_circle": { + "name": "원 돌기" + }, "highway/unclassified": { "name": "분류하지 않은 도로" }, @@ -830,6 +1207,9 @@ "historic/wayside_shrine": { "name": "길가의 신사" }, + "landuse": { + "name": "토지 이용" + }, "landuse/allotments": { "name": "텃밭" }, @@ -872,12 +1252,22 @@ "landuse/residential": { "name": "주거" }, + "landuse/retail": { + "name": "소매점" + }, "landuse/vineyard": { "name": "포도밭" }, "leisure": { "name": "여가" }, + "leisure/common": { + "name": "일반", + "terms": "공통" + }, + "leisure/dog_park": { + "name": "개 공원" + }, "leisure/garden": { "name": "정원" }, @@ -885,7 +1275,8 @@ "name": "골프장" }, "leisure/marina": { - "name": "마리나" + "name": "마리나", + "terms": "항구,선착장" }, "leisure/park": { "name": "공원" @@ -902,18 +1293,27 @@ "leisure/pitch/basketball": { "name": "농구장" }, + "leisure/pitch/skateboard": { + "name": "스케이트 공원" + }, "leisure/pitch/soccer": { "name": "축구장" }, "leisure/pitch/tennis": { "name": "테니스장" }, + "leisure/pitch/volleyball": { + "name": "배구장" + }, "leisure/playground": { "name": "놀이터" }, "leisure/slipway": { "name": "슬립 웨이" }, + "leisure/sports_center": { + "name": "스포츠 센터" + }, "leisure/stadium": { "name": "경기장" }, @@ -923,18 +1323,51 @@ "leisure/track": { "name": "경주로" }, + "line": { + "name": "선" + }, "man_made": { - "name": "사람에 의한" + "name": "인공물" + }, + "man_made/breakwater": { + "name": "방파제" + }, + "man_made/cutline": { + "name": "숲 경계선" }, "man_made/lighthouse": { "name": "등대" }, + "man_made/observation": { + "name": "전망대", + "terms": "관찰탑,감시탑" + }, "man_made/pier": { "name": "부두" }, + "man_made/pipeline": { + "name": "파이프 라인", + "terms": "관로,도관" + }, + "man_made/survey_point": { + "name": "조사/관측 지점" + }, + "man_made/tower": { + "name": "탑", + "terms": "타워" + }, + "man_made/wastewater_plant": { + "name": "하수 처리 시설" + }, "man_made/water_tower": { "name": "급수탑" }, + "man_made/water_well": { + "name": "우물" + }, + "man_made/water_works": { + "name": "물 시설" + }, "natural": { "name": "자연" }, @@ -950,6 +1383,9 @@ "natural/coastline": { "name": "해안선" }, + "natural/fell": { + "name": "황야" + }, "natural/glacier": { "name": "빙하" }, @@ -962,6 +1398,9 @@ "natural/peak": { "name": "정상" }, + "natural/scree": { + "name": "급사면" + }, "natural/scrub": { "name": "우거진 숲" }, @@ -990,28 +1429,118 @@ "name": "산림" }, "office": { - "name": "사무실" + "name": "사무실", + "terms": "사무소" + }, + "office/accountant": { + "name": "회계 사무소" + }, + "office/administrative": { + "name": "행정 사무소", + "terms": "행정 사무실" + }, + "office/architect": { + "name": "건축사" + }, + "office/company": { + "name": "회사 사무실", + "terms": "회사 사무소" + }, + "office/educational_institution": { + "name": "교육 기관" + }, + "office/employment_agency": { + "name": "직업 소개소" + }, + "office/estate_agent": { + "name": "부동산 사무소", + "terms": "부동산 사무실,부동산 중개" + }, + "office/financial": { + "name": "금융 사무소", + "terms": "금융 사무실" + }, + "office/government": { + "name": "관청", + "terms": "관공서,정부 청사" + }, + "office/insurance": { + "name": "보험 사무소", + "terms": "보험 사무실" + }, + "office/it": { + "name": "IT 사무실", + "terms": "IT 사무소" + }, + "office/lawyer": { + "name": "법률 사무소", + "terms": "법률 사무실" + }, + "office/newspaper": { + "name": "신문" + }, + "office/ngo": { + "name": "NGO 사무실", + "terms": "비정부기구 사무실" + }, + "office/physician": { + "name": "내과의원" + }, + "office/political_party": { + "name": "정당" + }, + "office/research": { + "name": "연구 사무실", + "terms": "연구 사무소" + }, + "office/telecommunication": { + "name": "통신 사무실", + "terms": "통신 사무소,통신 지사,전화국" + }, + "office/therapist": { + "name": "치료원" + }, + "office/travel_agent": { + "name": "여행사" }, "place": { "name": "장소" }, + "place/city": { + "name": "도시" + }, "place/hamlet": { "name": "작은 마을" }, "place/island": { "name": "섬" }, + "place/isolated_dwelling": { + "name": "독립 주택" + }, "place/locality": { "name": "지역" }, + "place/town": { + "name": "마을" + }, "place/village": { "name": "마을" }, + "point": { + "name": "지점" + }, "power": { "name": "전력" }, + "power/generator": { + "name": "발전소" + }, "power/line": { - "name": "전력선" + "name": "송전선" + }, + "power/minor_line": { + "name": "작은 송전선" }, "power/pole": { "name": "전봇대" @@ -1022,12 +1551,36 @@ "power/tower": { "name": "송전탑" }, + "power/transformer": { + "name": "변압 시설" + }, "railway": { "name": "철도" }, + "railway/abandoned": { + "name": "폐지된 철도" + }, + "railway/disused": { + "name": "폐선된 철도" + }, + "railway/halt": { + "name": "철도 정거장" + }, "railway/level_crossing": { "name": "건널목" }, + "railway/monorail": { + "name": "모노레일" + }, + "railway/platform": { + "name": "철도 플랫폼" + }, + "railway/rail": { + "name": "선로" + }, + "railway/station": { + "name": "철도역" + }, "railway/subway": { "name": "지하철" }, @@ -1037,29 +1590,188 @@ "railway/tram": { "name": "노면 전차" }, + "relation": { + "name": "관계" + }, "route/ferry": { "name": "페리 노선" }, "shop": { "name": "상점" }, + "shop/alcohol": { + "name": "주류 상점" + }, "shop/bakery": { "name": "제과점" }, + "shop/beauty": { + "name": "미용실" + }, + "shop/beverages": { + "name": "음료 가게" + }, + "shop/bicycle": { + "name": "자전거 가게" + }, + "shop/books": { + "name": "서점" + }, + "shop/boutique": { + "name": "부티크" + }, "shop/butcher": { "name": "정육점" }, + "shop/car": { + "name": "자동차 대리점" + }, + "shop/car_parts": { + "name": "자동차 부품점" + }, + "shop/car_repair": { + "name": "자동차 수리점" + }, + "shop/chemist": { + "name": "화학품점" + }, + "shop/clothes": { + "name": "옷 가게" + }, + "shop/computer": { + "name": "컴퓨터 상점" + }, + "shop/confectionery": { + "name": "과자 가게" + }, + "shop/convenience": { + "name": "편의점" + }, + "shop/deli": { + "name": "델리" + }, + "shop/department_store": { + "name": "백화점" + }, + "shop/doityourself": { + "name": "DIY 상점" + }, + "shop/dry_cleaning": { + "name": "드라이 클리닝" + }, + "shop/electronics": { + "name": "전자 제품 가게" + }, + "shop/farm": { + "name": "산지 직매" + }, + "shop/fishmonger": { + "name": "생선 가게" + }, + "shop/florist": { + "name": "꽃집" + }, + "shop/furniture": { + "name": "가구점" + }, + "shop/garden_centre": { + "name": "원예 용품점" + }, + "shop/gift": { + "name": "선물 가게" + }, + "shop/greengrocer": { + "name": "청과상" + }, + "shop/hairdresser": { + "name": "이발소" + }, + "shop/hardware": { + "name": "철물점" + }, + "shop/hifi": { + "name": "고급 오디오 상점" + }, + "shop/jewelry": { + "name": "보석 상점" + }, + "shop/kiosk": { + "name": "키오스크" + }, + "shop/laundry": { + "name": "세탁소" + }, + "shop/locksmith": { + "name": "열쇠 제조공", + "terms": "자물쇠 제조공" + }, + "shop/mall": { + "name": "쇼핑몰" + }, + "shop/mobile_phone": { + "name": "휴대폰 가게" + }, + "shop/motorcycle": { + "name": "모터사이클 대리점" + }, + "shop/music": { + "name": "음반 가게" + }, + "shop/newsagent": { + "name": "신문 판매소" + }, + "shop/optician": { + "name": "안경점" + }, + "shop/outdoor": { + "name": "아웃도어 상점" + }, + "shop/pet": { + "name": "애완 동물 가게" + }, + "shop/photo": { + "name": "사진 가게" + }, + "shop/shoes": { + "name": "신발 가게" + }, + "shop/sports": { + "name": "스포츠 상품 상점" + }, + "shop/stationery": { + "name": "문구점" + }, "shop/supermarket": { "name": "수퍼마켓" }, + "shop/toys": { + "name": "완구점" + }, + "shop/travel_agency": { + "name": "여행사" + }, + "shop/tyres": { + "name": "타이어 상점" + }, + "shop/vacant": { + "name": "빈 가게" + }, + "shop/variety_store": { + "name": "잡화점" + }, + "shop/video": { + "name": "비디오 가게" + }, "tourism": { - "name": "관광 여행" + "name": "관광", + "terms": "관광 여행" }, "tourism/alpine_hut": { "name": "고산장" }, "tourism/artwork": { - "name": "예술 작품" + "name": "예술품", + "terms": "예술 작품" }, "tourism/attraction": { "name": "관광 명소" @@ -1067,11 +1779,14 @@ "tourism/camp_site": { "name": "캠프장" }, + "tourism/caravan_site": { + "name": "RV 공원" + }, "tourism/chalet": { "name": "별장" }, "tourism/guest_house": { - "name": "게스트 하우스" + "name": "민박" }, "tourism/hostel": { "name": "호스텔" @@ -1100,6 +1815,18 @@ "tourism/zoo": { "name": "동물원" }, + "type/boundary": { + "name": "경계" + }, + "type/boundary/administrative": { + "name": "행정 경계" + }, + "type/multipolygon": { + "name": "다중 다각형" + }, + "type/restriction": { + "name": "제한" + }, "type/route": { "name": "노선" }, @@ -1118,8 +1845,12 @@ "type/route/foot": { "name": "보도 노선" }, + "type/route/hiking": { + "name": "하이킹 노선" + }, "type/route/pipeline": { - "name": "파이프 라인 노선" + "name": "파이프 라인 노선", + "terms": "관로 노선;도관 노선" }, "type/route/power": { "name": "전력 노선" @@ -1136,6 +1867,9 @@ "type/route_master": { "name": "노선 마스터" }, + "vertex": { + "name": "기타" + }, "waterway": { "name": "수로" }, diff --git a/vendor/assets/iD/iD/locales/lt.json b/vendor/assets/iD/iD/locales/lt.json index 4099b7ee5..91e87368e 100644 --- a/vendor/assets/iD/iD/locales/lt.json +++ b/vendor/assets/iD/iD/locales/lt.json @@ -82,12 +82,16 @@ "deleted": "IÅ¡trinta", "created": "Sukurta" }, + "geocoder": { + "search": "IeÅ¡koti visam pasaulyje..." + }, "geolocate": { "title": "Rodyti mano vietą" }, "inspector": { "all_members": "Visi nariai", "all_relations": "Visi ryÅ¡iai", + "results": "{n} paieÅ¡kos {search} rezultatai", "remove": "PaÅ¡alinti", "search": "IeÅ¡koti", "unknown": "Nežinoma" @@ -114,9 +118,53 @@ } }, "presets": { + "categories": { + "category-road": { + "name": "Kelias" + }, + "category-route": { + "name": "MarÅ¡rutas" + } + }, "fields": { "access": { - "label": "Prieiga" + "label": "Prieiga", + "placeholder": "Nežinoma", + "types": { + "foot": "Pėstieji", + "motor_vehicle": "Motorinis transportas", + "bicycle": "Dviračiai", + "horse": "Arkliai" + }, + "options": { + "yes": { + "title": "Leidžiamas", + "description": "Priėjimas leidžiamas įstatymų; pirmumo teisė" + }, + "no": { + "title": "Draudžiamas", + "description": "Priėjimas draudžiamas plačiajai visuomenei" + }, + "permissive": { + "title": "Leistinas", + "description": "Priėjimas leistinas, kai savininkas konkrečiu laiku panaikina draudimą" + }, + "private": { + "title": "Privatus", + "description": "Priėjimas leistinas tik su savininko leidimu" + }, + "designated": { + "title": "Skirtas", + "description": "Priėjimas galimas remiantis ženklais ir savitais vietos įstatymais" + }, + "destination": { + "title": "Tikslinis", + "description": "Priėjimas leistinas tik atvykti į tikslą" + } + } + }, + "access_toilets": { + "label": "Priėjimas" }, "address": { "label": "Adresas", @@ -124,7 +172,8 @@ "housename": "Namo pavadinimas", "number": "123", "street": "Gatvė", - "city": "Miestas" + "city": "Miestas", + "postcode": "PaÅ¡to kodas" } }, "aeroway": { @@ -142,6 +191,9 @@ "bicycle_parking": { "label": "Tipas" }, + "boundary": { + "label": "Tipas" + }, "building": { "label": "Pastatas" }, @@ -152,7 +204,18 @@ "label": "Pastatas" }, "capacity": { - "label": "Talpumas" + "label": "Talpumas", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "Kryptis" + }, + "clock_direction": { + "label": "Kryptis", + "options": { + "clockwise": "Pagal laikrodžio rodyklę", + "anticlockwise": "PrieÅ¡ laikrodžio rodyklę" + } }, "collection_times": { "label": "Surinkimo laikas" @@ -160,6 +223,9 @@ "construction": { "label": "Tipas" }, + "country": { + "label": "Å alis" + }, "crossing": { "label": "Tipas" }, @@ -169,15 +235,34 @@ "denomination": { "label": "Pavadinimas" }, + "description": { + "label": "ApraÅ¡ymas" + }, "entrance": { "label": "Tipas" }, "fax": { - "label": "Faksas" + "label": "Faksas", + "placeholder": "+31 42 123 4567" }, "fee": { "label": "Mokestis" }, + "fire_hydrant/type": { + "label": "Tipas" + }, + "fixme": { + "label": "Sutvarkyk Mane" + }, + "generator/method": { + "label": "Metodas" + }, + "generator/source": { + "label": "Å altinis" + }, + "generator/type": { + "label": "Tipas" + }, "highway": { "label": "Tipas" }, @@ -195,6 +280,10 @@ "landuse": { "label": "Tipas" }, + "lanes": { + "label": "Juostos", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "Sluoksnis" }, @@ -202,16 +291,25 @@ "label": "Tipas" }, "levels": { - "label": "Lygiai" + "label": "Lygiai", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "ApÅ¡vietimas" + }, + "location": { + "label": "Vieta" }, "man_made": { "label": "Tipas" }, "maxspeed": { - "label": "Greičio limitas" + "label": "Greičio limitas", + "placeholder": "40, 50, 60..." }, "name": { - "label": "Pavadinimas" + "label": "Pavadinimas", + "placeholder": "Pagrindinis pavadinimas (jeigu yra)" }, "natural": { "label": "Normalus" @@ -225,14 +323,27 @@ "office": { "label": "Tipas" }, + "oneway": { + "label": "Vienpusis eismas" + }, + "oneway_yes": { + "label": "Vienpusis eismas" + }, "opening_hours": { "label": "Valandos" }, "operator": { "label": "Operatorius" }, + "park_ride": { + "label": "Palik automobilį ir važiuok" + }, + "parking": { + "label": "Tipas" + }, "phone": { - "label": "Telefonas" + "label": "Telefonas", + "placeholder": "+31 42 123 4567" }, "place": { "label": "Tipas" @@ -243,6 +354,12 @@ "railway": { "label": "Tipas" }, + "ref": { + "label": "Å altinis" + }, + "relation": { + "label": "Tipas" + }, "religion": { "label": "Religija", "options": { @@ -255,6 +372,15 @@ "taoist": "Daoistas" } }, + "restriction": { + "label": "Tipas" + }, + "route": { + "label": "Tipas" + }, + "route_master": { + "label": "Tipas" + }, "service": { "label": "Tipas" }, @@ -271,6 +397,7 @@ "label": "Sportas" }, "structure": { + "placeholder": "Nežinoma", "options": { "bridge": "Tiltas", "tunnel": "Tunelis" @@ -282,6 +409,12 @@ "tourism": { "label": "Tipas" }, + "towertype": { + "label": "BokÅ¡to tipas" + }, + "tracktype": { + "label": "Tipas" + }, "water": { "label": "Tipas" }, @@ -289,7 +422,8 @@ "label": "Tipas" }, "website": { - "label": "Interneto svetainė" + "label": "Interneto svetainė", + "placeholder": "http://pavyzdys.lt/" }, "wetland": { "label": "Tipas" @@ -302,24 +436,66 @@ } }, "presets": { + "address": { + "name": "Adresas" + }, + "aeroway/aerodrome": { + "name": "Oro uostas" + }, + "aeroway/gate": { + "name": "Oro uosto vartai" + }, + "aeroway/hangar": { + "name": "Angaras" + }, + "aeroway/runway": { + "name": "Pakilimo takas" + }, + "amenity/arts_centre": { + "name": "Menų centras" + }, "amenity/bank": { "name": "Bankas" }, "amenity/bar": { "name": "Baras" }, + "amenity/bench": { + "name": "Suolas" + }, "amenity/bicycle_parking": { "name": "Dviračių stovėjimo aikÅ¡telė" }, "amenity/bicycle_rental": { "name": "Dviračių nuoma" }, + "amenity/boat_rental": { + "name": "Laivų nuoma" + }, "amenity/cafe": { "name": "Kavinė" }, + "amenity/car_rental": { + "name": "Automobilių nuoma" + }, + "amenity/car_sharing": { + "name": "Automobilių dalinimasis" + }, + "amenity/car_wash": { + "name": "Automobilių plovykla" + }, "amenity/cinema": { "name": "Kino teatras" }, + "amenity/college": { + "name": "Kolegija" + }, + "amenity/courthouse": { + "name": "Teismo rÅ«mai" + }, + "amenity/drinking_water": { + "name": "Geriamas vanduo" + }, "amenity/embassy": { "name": "Ambasada" }, @@ -329,17 +505,26 @@ "amenity/fire_station": { "name": "Gaisrinė" }, + "amenity/fountain": { + "name": "Fontanas" + }, + "amenity/fuel": { + "name": "Degalinė" + }, "amenity/grave_yard": { "name": "Kapinės" }, "amenity/hospital": { "name": "Ligoninė" }, + "amenity/kindergarten": { + "name": "Vaikų darželis" + }, "amenity/library": { "name": "Biblioteka" }, - "amenity/parking": { - "name": "Automobilių stovėjimo aikÅ¡telė" + "amenity/marketplace": { + "name": "Prekyvietė" }, "amenity/pharmacy": { "name": "Vaistinė" @@ -347,6 +532,9 @@ "amenity/place_of_worship": { "name": "Maldos namai" }, + "amenity/place_of_worship/buddhist": { + "name": "Budistų Å ventykla" + }, "amenity/place_of_worship/christian": { "name": "Bažnyčia" }, @@ -368,6 +556,9 @@ "amenity/pub": { "name": "Aludė" }, + "amenity/ranger_station": { + "name": "Girininkų stotis" + }, "amenity/restaurant": { "name": "Restoranas" }, @@ -377,9 +568,15 @@ "amenity/swimming_pool": { "name": "Baseinas" }, + "amenity/taxi": { + "name": "Taksi stendas" + }, "amenity/telephone": { "name": "Telefonas" }, + "amenity/theatre": { + "name": "Teatras" + }, "amenity/toilets": { "name": "Tualetas" }, @@ -389,12 +586,54 @@ "amenity/university": { "name": "Universitetas" }, + "amenity/vending_machine": { + "name": "Prekių automatas" + }, + "amenity/waste_basket": { + "name": "Å iukÅ¡liadėžė" + }, + "area": { + "name": "Plotas" + }, + "barrier": { + "name": "Barjeras" + }, + "barrier/city_wall": { + "name": "Miesto siena" + }, "barrier/entrance": { "name": "Įėjimas" }, + "barrier/fence": { + "name": "Tvora" + }, + "barrier/gate": { + "name": "Vartai" + }, + "barrier/lift_gate": { + "name": "Pakeliami vartai" + }, + "barrier/wall": { + "name": "Siena" + }, "building": { "name": "Pastatas" }, + "building/apartments": { + "name": "Apartamentai" + }, + "building/garage": { + "name": "Garažas" + }, + "building/house": { + "name": "Namas" + }, + "emergency/fire_hydrant": { + "name": "Hidrantas" + }, + "emergency/phone": { + "name": "Pagalbos telefonas" + }, "entrance": { "name": "Įėjimas" }, @@ -413,6 +652,12 @@ "highway/footway": { "name": "Pėsčiųjų takas" }, + "highway/living_street": { + "name": "Gyvenamoji gatvė" + }, + "highway/mini_roundabout": { + "name": "Mini žiedas" + }, "highway/motorway": { "name": "Greitkelis" }, @@ -422,27 +667,51 @@ "highway/primary": { "name": "Pagrindinis kelias" }, + "highway/road": { + "name": "Nežinomas kelias" + }, "highway/secondary": { "name": "Nepagrindinis kelias" }, + "highway/service": { + "name": "Aptarnaujantis kelias" + }, + "highway/service/emergency_access": { + "name": "Pagalbos priėjimas" + }, "highway/steps": { "name": "Žingsniai" }, + "highway/stop": { + "name": "Stop ženklas" + }, "highway/traffic_signals": { "name": "Eismo signala" }, "highway/trunk": { "name": "Magistralinis kelias" }, + "highway/turning_circle": { + "name": "Apsisukimo žiedas" + }, "historic": { "name": "Istorinė vietovė" }, + "historic/archaeological_site": { + "name": "Archeologinių kasinėjimų vieta" + }, "historic/castle": { "name": "Pilis" }, + "historic/memorial": { + "name": "Memorialas" + }, "historic/monument": { "name": "Paminklas" }, + "historic/ruins": { + "name": "Griuvėsiai" + }, "landuse/allotments": { "name": "Žemės sklypai" }, @@ -482,21 +751,93 @@ "landuse/quarry": { "name": "Karjeras" }, + "landuse/residential": { + "name": "Gyvenamosios vietos" + }, + "landuse/vineyard": { + "name": "Vynuogynas" + }, + "leisure": { + "name": "Laisvalaikis" + }, "leisure/garden": { "name": "Sodas" }, + "leisure/golf_course": { + "name": "Golfo aikÅ¡tynas" + }, + "leisure/park": { + "name": "Parkas" + }, + "leisure/pitch": { + "name": "Sporto aikÅ¡telė" + }, + "leisure/pitch/american_football": { + "name": "AmerikoniÅ¡ko futbolo aikÅ¡tė" + }, + "leisure/pitch/basketball": { + "name": "KrepÅ¡inio aikÅ¡telė" + }, + "leisure/pitch/soccer": { + "name": "Futbolo aikÅ¡tė" + }, + "leisure/pitch/tennis": { + "name": "Teniso aikÅ¡telė" + }, + "leisure/pitch/volleyball": { + "name": "Tinklinio aikÅ¡telė" + }, + "leisure/playground": { + "name": "Žaidimų aikÅ¡telė" + }, + "leisure/sports_center": { + "name": "Sporto centras" + }, "leisure/stadium": { "name": "Stadionas" }, "leisure/swimming_pool": { "name": "Baseinas" }, + "leisure/track": { + "name": "Lenktynių trasa" + }, + "line": { + "name": "Linija" + }, + "man_made/lighthouse": { + "name": "Å vyturys" + }, + "man_made/pier": { + "name": "Prieplauka" + }, + "man_made/pipeline": { + "name": "Vamzdynas" + }, + "man_made/tower": { + "name": "BokÅ¡tas" + }, "man_made/water_tower": { "name": "Vandens bokÅ¡tas" }, + "natural/bay": { + "name": "Ä®lanka" + }, + "natural/beach": { + "name": "PaplÅ«dimys" + }, "natural/cliff": { "name": "Uola" }, + "natural/coastline": { + "name": "Pakrantė" + }, + "natural/grassland": { + "name": "Pieva" + }, + "natural/peak": { + "name": "VirÅ¡Å«nė" + }, "natural/tree": { "name": "Medis" }, @@ -506,15 +847,189 @@ "natural/water/lake": { "name": "Ežeras" }, + "natural/water/pond": { + "name": "KÅ«dra" + }, + "natural/water/reservoir": { + "name": "Rezervuaras" + }, + "place": { + "name": "Vieta" + }, + "place/city": { + "name": "Miestas" + }, + "place/hamlet": { + "name": "Kaimelis" + }, + "place/island": { + "name": "Sala" + }, + "place/isolated_dwelling": { + "name": "Izoliuota gyvenvietė" + }, + "place/locality": { + "name": "Vietovė" + }, + "place/town": { + "name": "Miestelis" + }, "place/village": { "name": "Kaimas" }, + "point": { + "name": "TaÅ¡kas" + }, + "power/generator": { + "name": "Jėgainė" + }, "railway": { "name": "Geležinkelis" }, + "railway/abandoned": { + "name": "Apleistas geležinkelis" + }, + "railway/disused": { + "name": "Nebenaudojamas geležinkelis" + }, + "railway/monorail": { + "name": "Vienbėgis geležinkelis" + }, + "railway/station": { + "name": "Geležinkelio stotis" + }, + "railway/subway": { + "name": "Metro" + }, + "railway/subway_entrance": { + "name": "Metro įėjimas" + }, + "route/ferry": { + "name": "Kelto marÅ¡rutas" + }, + "shop": { + "name": "Parduotuvė" + }, + "shop/alcohol": { + "name": "Alkoholinių gėrimų parduotuvė" + }, + "shop/bakery": { + "name": "Kepykla" + }, + "shop/beauty": { + "name": "Grožio salonas" + }, + "shop/beverages": { + "name": "Gėrimų parduotuvė" + }, + "shop/bicycle": { + "name": "Dviračių parduotuvė" + }, + "shop/books": { + "name": "Knygynas" + }, + "shop/butcher": { + "name": "Mėsinė" + }, + "shop/car_parts": { + "name": "Auto dalių parduotuvė" + }, + "shop/car_repair": { + "name": "Auto taisykla" + }, + "shop/clothes": { + "name": "Drabužių parduotuvė" + }, + "shop/computer": { + "name": "Kompiuterių parduotuvė" + }, + "shop/confectionery": { + "name": "Konditerija" + }, + "shop/convenience": { + "name": "Savitarnos parduotuvė" + }, + "shop/department_store": { + "name": "Universalinė parduotuvė" + }, + "shop/electronics": { + "name": "Elektronikos parduotuvė" + }, + "shop/fishmonger": { + "name": "Žuvų pardavėjas" + }, + "shop/florist": { + "name": "Gėlės" + }, + "shop/furniture": { + "name": "Baldų parduotuvė" + }, + "shop/gift": { + "name": "Dovanų parduotuvė" + }, + "shop/hairdresser": { + "name": "Kirpykla" + }, + "shop/hardware": { + "name": "Techninės įrangos parduotuvė" + }, + "shop/jewelry": { + "name": "Juvelyrikos parduotuvė" + }, "shop/kiosk": { "name": "Kioskas " }, + "shop/laundry": { + "name": "Skalbykla" + }, + "shop/mall": { + "name": "Prekybos centras" + }, + "shop/mobile_phone": { + "name": "Mobiliųjų telefonų parduotuvė" + }, + "shop/music": { + "name": "Muzikos parduotuvė" + }, + "shop/optician": { + "name": "Optika" + }, + "shop/pet": { + "name": "Augintinių parduotuvė" + }, + "shop/shoes": { + "name": "Batų parduotuvė" + }, + "shop/sports": { + "name": "Sporto reikmenų parduotuvė" + }, + "shop/stationery": { + "name": "Kanceliarinių prekių parduotuvė" + }, + "shop/supermarket": { + "name": "Prekybos centras" + }, + "shop/toys": { + "name": "Žaislų parduotuvė" + }, + "shop/travel_agency": { + "name": "Kelionių agentÅ«ra" + }, + "shop/tyres": { + "name": "Padangų parduotuvė" + }, + "shop/vacant": { + "name": "Tuščia parduotuvė" + }, + "tourism": { + "name": "Turizmas" + }, + "tourism/artwork": { + "name": "Meno kÅ«rinys" + }, + "tourism/attraction": { + "name": "Turistų traukos vieta" + }, "tourism/camp_site": { "name": "Stovyklavietė" }, @@ -536,14 +1051,62 @@ "tourism/museum": { "name": "Muziejus" }, + "tourism/picnic_site": { + "name": "Pikniko stovyklavietė" + }, "tourism/zoo": { "name": "Zoologijos sodas" }, + "type/boundary": { + "name": "Siena" + }, + "type/boundary/administrative": { + "name": "Administracinė siena" + }, + "type/restriction": { + "name": "Apribojimas" + }, + "type/route": { + "name": "MarÅ¡rutas" + }, + "type/route/bicycle": { + "name": "Dviračių marÅ¡rutas" + }, + "type/route/bus": { + "name": "Autobusų marÅ¡rutas" + }, + "type/route/detour": { + "name": "Apvažiavimo marÅ¡rutas" + }, + "type/route/ferry": { + "name": "Kelto marÅ¡rutas" + }, + "type/route/foot": { + "name": "Pėsčiųjų marÅ¡rutas" + }, + "type/route/hiking": { + "name": "Žygių marÅ¡rutas" + }, + "type/route/pipeline": { + "name": "Vamzdyno marÅ¡rutas" + }, + "vertex": { + "name": "Kita" + }, + "waterway": { + "name": "Vandens kelias" + }, "waterway/canal": { "name": "Kanalas" }, + "waterway/dam": { + "name": "Užtvanka" + }, "waterway/river": { "name": "Upė" + }, + "waterway/stream": { + "name": "Upelis" } } } diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json index 52d1ac12b..4a8d59f31 100644 --- a/vendor/assets/iD/iD/locales/lv.json +++ b/vendor/assets/iD/iD/locales/lv.json @@ -182,7 +182,6 @@ "title": "Fons", "description": "Fona iestatÄ«jumi", "percent_brightness": "{opacity}% caurspÄ«dÄ«gums", - "fix_misalignment": "Labot fona nobÄ«di", "reset": "AtiestatÄ«t" }, "restore": { @@ -233,8 +232,7 @@ "out": "Attālināt" }, "gpx": { - "local_layer": "Vietējais GPX fails", - "drag_drop": "Uzvelc uz atlaid .gpx failu uz Å¡Ä«s lapas" + "local_layer": "Vietējais GPX fails" }, "help": { "title": "PalÄ«dzÄ«ba", @@ -262,11 +260,6 @@ } }, "presets": { - "categories": { - "category-water": { - "name": "Ūdens" - } - }, "fields": { "access": { "label": "Piekļuve", @@ -576,9 +569,6 @@ "amenity/marketplace": { "name": "Tirgus" }, - "amenity/parking": { - "name": "Stāvvieta" - }, "amenity/pharmacy": { "name": "Aptieka" }, diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json index 659ea1a03..31a74006c 100644 --- a/vendor/assets/iD/iD/locales/nl.json +++ b/vendor/assets/iD/iD/locales/nl.json @@ -74,10 +74,24 @@ "not_closed": "Dit kan niet rond worden gemaakt omdat het geen lus is." }, "orthogonalize": { + "title": "Vierkant maken", + "description": { + "line": "Maak de hoeken van deze lijn haaks.", + "area": "Maak de hoeken van dit vlak haaks." + }, + "key": "S", "annotation": { "line": "Hoeken van een lijn zijn haaks gemaakt.", "area": "Hoeken van een vlak zijn haaks gemaakt." - } + }, + "not_squarish": "Dit kan niet vierkant gemaakt worden omdat het niet vierkantig is." + }, + "straighten": { + "title": "Rechttrekken", + "description": "Trek deze lijn recht.", + "key": "S", + "annotation": "Een lijn is rechtgetrokken.", + "too_bendy": "Dit kan niet rechtgetrokken worden omdat het te veel kromt." }, "delete": { "title": "Verwijderen", @@ -137,6 +151,7 @@ }, "rotate": { "title": "Roteer", + "description": "Roteer dit object rond zijn middelpunt.", "key": "R", "annotation": { "line": "Lijn geroteerd.", @@ -232,18 +247,21 @@ "back_tooltip": "Wijzig het object", "remove": "Verwijderen", "search": "Zoeken", + "multiselect": "Geselecteerde items", "unknown": "Onbekend", "incomplete": "", "feature_list": "Zoek objecttype", - "edit": "Wijzig het object" + "edit": "Wijzig het object", + "none": "Geen" }, "background": { "title": "Achtergrond", "description": "Achtergrondinstellingen", "percent_brightness": "{opacity}% doorzichtigheid", + "none": "Geen", "custom": "Aangepast", "custom_prompt": "Voer een tegelschema in. Geldige waarden zijn {z}, {x}, {y} voor Z/X/Y schema en {u} voor het quadtile schema.", - "fix_misalignment": "Repareer de verkeerde ligging", + "fix_misalignment": "Repareer de ligging", "reset": "Standaard herstellen" }, "restore": { @@ -303,16 +321,21 @@ "cannot_zoom": "Kan niet verder uitzoomen in huidige modus", "gpx": { "local_layer": "Lokaal GPX-bestand", - "drag_drop": "Sleep een .gpx-bestand op de pagina" + "drag_drop": "Sleep een .gpx bestand op de pagina of klik op de knop rechts om te bladeren", + "zoom": "Zoom de GPX-route", + "browse": "Blader naar een .gpx bestand" }, "help": { "title": "Help", "help": "# Help\n\nDit is een editor voor [OpenStreetMap](http://www.openstreetmap.org/), de\nvrije en aanpasbare wereldkaart. Je kan het gebruiken om gegevens in je \nomgeving toe te voegen of bij te werken, waarmee je een open source en open\ndata wereldkaart voor iedereen beter maakt.\n\nAanpassingen die je op deze kaart maakt zullen voor iedereen te zien zijn die\ngebruik maakt van OpenStreetMap. Om een aanpassing te maken, heb je een \n[gratis OpenStreetMap account](https://www.openstreetmap.org/user/new) nodig.\n\nDe [iD editor](http://ideditor.com/) is een samenwerkingsproject waarvan de \n[broncode beschikbaar is op GitHub](https://github.com/systemed/iD).\n", + "editing_saving": "# Bewerken & Opslaan\n\nDeze editor is ontworpen om voornamelijk online te gebruiken, en je via de website hebt er toegang toe op dit moment.\n\n### Objecten selecteren\n\nOm objecten in een kaart te selecteren, zoals een weg of interessant punt, moet je op de kaart erop kikken. Het geselecteerde object zal dan oplichten, er zal een paneel met details geopend worden en een menu zal getoond worden dat je met dit object kan doen.\n\nHoud de 'Shift'-toets vast om meerdere objecten te kunnen selecteren. Klik daarna of op objecten die je wil selecteren of op de kaart wil verslepen of teken een rechthoek. Dit laatste zal een alle punten die erin vallen selecteren.\n\n### Opslaan van bewerkingen\n\nAls je wijzigingen maakt aan bestaande wegen, gebouwen en andere plaatsen worden deze eerst lokaal opgeslagen totdat je ze op de server opslaat. Maak je geen zorgen als je een fout maakt - je kan wijzigingen altijd ongedaan maken door op de undo-knop te klikken en ze weer herstellen door op de redo-knop te klikken.\n\nKlik op 'Opslaan' om een groep van bewerkingen op te slaan. - bijvoorbeeld als je een gebied of dorp hebt afgerond en je aan een ander gebied wil beginnen. Je krijgt de mogelijkheid om te herzien wat je hebt aangepast en de editor geeft je suggesties voor verbeteringen en waarschuwingen als er iets mis lijkt te zijn.\n\nAls alles er goed uit ziet kun je kort commentaar toevoegen die de wijziging die je hebt gemaakt beschrijft en klik daarna nogmaals op 'Opslaan' om de wijzigingen op te sturen aan [OpenStreetMap.org](http://www.openstreetmap.org/), waar ze zichtbaar zijn voor alle gebruikers en voor anderen om op voort te bouwen of uit te verbeteren.\n\nAls je in een sessie niet al je bewerkingen door kan voeren kun je het bewerkwindow open laten en later terugkomen (in dezelfde browser op dezelfde computer) en de bewerkapplicatie zal je aanbieden je werk weer terug te zetten.\n", "roads": "# Wegen\n\nJe kan met deze editor wegen maken, verbeteren en verwijderen. Wegen zijn er in\nallerlei soorten en maten: landweggetjes, snelwegen, paadjes, fietspaden en veel\nmeer - ieder stukje dat vaak wordt gebruikt kan in kaart worden gebracht.\n\n### Selecteren\n\nKlik op een weg om deze te selecteren. De omtrek verschijnt samen met een klein\nmenu op de kaart en een schermpje met informatie over de weg.\n\n### Aanpassen\n\nVaak kom je wegen tegen, die niet precies over het beeldmateriaal of de GPS-route\nerachter lopen. Je kan deze wegen aanpassen, zodat ze op de juiste plek komen te\nliggen.\n\nKlik eerst op de weg die je wilt aanpassen. Deze zal dan oplichten en er verschijnen\npuntjes langs de lijn die je kan verslepen naar een betere plek. Als je nieuwe\npuntjes wilt toevoegen voor meer detaillering, dubbelklik op een weggedeelte\nzonder een knooppunt en een nieuwe wordt toegevoegd.\n\nAls een weg is verbonden met een andere weg, maar niet in de kaart dan versleep\nje een van de puntjes op de andere weg om ze te verbinden. Dat wegen met elkaar\nzijn verbonden is belangrijk voor de kaart en essentieel om een routebeschrijving\nte kunnen maken.\n\nJe kan bovendien het 'Verplaats' gereedschap aanklikken of de 'V' snelkoppeling om\nde gehele weg in een keer te verplaatsen en opnieuw aanklikken om deze verplaatsing\nop te slaan.\n\n### Verwijderen\n\nAls een weg helemaal verkeerd is - je ziet dat het niet op het satellietbeeld te zien is\nen je hebt idealiter ter plaatse gecontroleerd, dat de weg er niet is - dan kan je het\nverwijderen, zodat het van de kaart verdwijnt. Wees voorzichtig met het verwijderen\nvan objecten - zoals bij iedere aanpassing is het resultaat voor iedereen zichtbaar en\nsatellietbeelden zijn vaak verouderd, dus de weg zou gewoon nieuw kunnen zijn aangelegd.\n\nJe kan een weg verwijderen door er op te klikken om het te selecteren, waarna je op het\nprullenbakicoon drukt of de 'Verwijderen' toets.\n\n### Aanmaken\n\nHeb je ergens een weg gevonden die nog niet op de kaart staat? Klik op het 'Lijn'\ngereedschap in de linker bovenhoek van de editor of druk op de snelkoppeling '2' om\neen lijn te tekenen.\n\nKlik op het begin van de weg op de kaart en begin te tekenen. Als de weg zich vertakt\nvan de bestaande weg, begin dan op de plek waar ze elkaar kruisen.\n\nKlik dan de punten langs de weg, zodat deze het juiste tracé volgt, volgens het\nsatellietbeeld of de GPS-route. Als de weg die je aan het tekenen bent een andere weg\nkruist, verbindt deze door op het kruispunt te klikken. Als je klaar met tekenen bent,\ndubbelklik of druk op 'Return' of 'Enter' op je toetsenbord.\n", - "imagery": "# Beeldmateriaal\n\nLuchtfoto's vormen een belangrijke bron voor het karteren. Een combinatie van\nluchtfoto's, satellietbeelden en vrij-beschikbare bronnen is beschikaar\nin de editor onder het menu 'Achtergrondinstellingen' aan de linkerkant.\n\nStandaard wordt een [Bing Maps](http://www.bing.com/maps/) satellietbeeld in\nde editor getoond, maar als je de kaart verschaalt of verplaatst naar andere gebieden,\nworden nieuwe bronnen getoond. Sommige landen, zoals de Verenigde Staten, Frankrijk\nen Denemarken hebben beeldmateriaal van zeer hoge kwaliteit in sommige gebieden.\n\nSoms is het beeldmateriaal ten opzichte van de kaart verschoven door een fout\nvan de leverancier van het beeldmateriaal. Als je ziet, dat een heleboel wegen\nzijn verschoven ten opzichte van de achtergrond, ga deze dan niet meteen \nallemaal verplaatsen zodat de ligging overeenkomt met de achtergrond. In plaats\ndaarvan kan je het beeldmateriaal aanpassen, zodat de ligging overeenkomt met\nde bestaande gegevens door op de knop 'Verbeter de ligging' te klikken onderaan\nde 'Achtergrondinstellingen'.\n", + "gps": "# GPS\n\nGP- gegevens vormen voor OpenStreetMap de meest betrouwbare bron voor gegevens. Deze editor\nondersteunt lokale routes - '.gpx' bestanden op je lokale computer. Je kan dit soort\nGPS-routes vastleggen met allerlei smartphoneapplicaties of\nmet je eigen GPS-apparatuur.\n\nVoor meer informatie over het doen van een GPS-veldwerk, lees\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)\n\nOm een GPS-route te gebruiken om te karteren, sleep een '.gpx.' bestand in je editor\nAls het wordt herkend, wordt het aan de kaart toegevoegd als een heldergroene\nlijn. Klik op het menu 'Achtergondinstellingen' aan de linkerkant om deze nieuwe kaartlaag\naan te zetten, uit te zetten of ernaar toe te zoomen.\n\nDe GPS-route wordt niet meteen naar OpenStreetMap verstuurd - de beste manier om\nhet te gebruiken is als een sjabloon voor het nieuwe objecten dat\nje toevoegt en ook om [het te uploaden naar OpenStreetMap](http://www.openstreetmap.org/trace/create)\nzodat andere gebruikers het ook kunnen gebruiken.\n", + "imagery": "# Beeldmateriaal\n\nLuchtfoto's vormen een belangrijke bron voor het karteren. Een combinatie van luchtfoto's, satellietbeelden en vrij-beschikbare bronnen is beschikbaar in de editor onder het menu 'Achtergrondinstellingen' aan de linkerzijde.\n\nStandaard wordt een [Bing Maps](http://www.bing.com/maps/) satellietbeeld in de editor getoond, maar als je de kaart verschaalt of verplaatst naar andere gebieden, worden nieuwe bronnen getoond. Sommige landen, zoals de Verenigde Staten, Frankrijk en Denemarken hebben beeldmateriaal van zeer hoge kwaliteit in sommige gebieden.\n\nSoms is het beeldmateriaal ten opzichte van de kaart verschoven door een fout van de leverancier van het beeldmateriaal. Als je ziet, dat een heleboel wegen zijn verschoven ten opzichte van de achtergrond, ga deze dan niet meteen allemaal verplaatsen zodat de ligging overeenkomt met de achtergrond. In plaats daarvan kan je het beeldmateriaal aanpassen, zodat de ligging overeenkomt met de bestaande gegevens door op de knop 'Verbeter de ligging' te klikken onderaan de 'Achtergrondinstellingen'.\n", "addresses": "# Adressen\n\nAdressen zijn één van de meest nuttige informatie-elementen voor de kaart.\n\nHoewel adressen vaak als deel van een straat worden weergegeven, worden zij\nin OpenstreetMap vastgelegd als eigenschap van gebouwen en plaatsen langs\nde straten.\n\nJe kan adresgegevens toevoegen aan plaatsen die als gebouwcontouren\nzijn gekarteerd, maar ook aan plaatsen die als een enkel punt zijn gekarteerd.\nDe meest betrouwbare bron voor adresgegevens is een veldonderzoek ter\nplaatse of eigen bekendheid - zoals met ieder ander object is kopiëren uit\ncommerciële bronnen zoals Google Maps strict verboden\n", - "inspector": "# Het inspectiegereedschap\n\nHet inspectiegereedschap is het schermelement rechts op de pagina dat verschijnt\nals een object wordt geselecteerd en maakt het je mogelijk om zijn eigenschappen\naan te passen.\n\n### Een objecttype selecteren\n\nNadat je een punt, lijn of vlak hebt toegevoegd, kan je kiezen wat voor type object\nhet is, bijvoorbeeld of het een snelweg of woonerf is, een supermarkt of een café.\nHet inspectiegereedschap toont knoppen voor veelvoorkomende objecttypen en je kan\nandere vinden door een term in het zoekscherm in te vullen.\n\nKlik op de 'i' in de rechter onderhoek van een objecttypeknop om\nmeer te weten te komen. Klik op een knop om het type te selecteren.\n\n### Formulieren en tags gebruiken\n\nNadat je een objecttype hebt gekozen, of wanneer je een object selecteert, dat\nal een type toegekend heeft gekregen, dan toont het inspectiegereedschap allerlei\neigenschappen van het object, zoals zijn naam en adres.\n\nOnder de getoonde eigenschappen, kan je op icoontjes klikken om meer \neigenschappen toe te voegen, zoals informatie uit [Wikipedia](http://www.wikipedia.org/), toegankelijkheid, etc.\n\nOnderaan het inspectiegereedschap klik je op 'Extra tags' om willekeurig andere\ntags toe te voegen. [Taginfo](http://taginfo.openstreetmap.org/) biedt een prachtig \noverzicht om meer te weten te komen over veelgebruikte combinaties van tags.\nAanpasingen die je in het inspectiegereedschap maakt zijn meteen zichtbaar in de kaart.\nJe kan ze op ieder moment ongedaan maken, door op de knop 'Ongedaan maken' te klikken.\n\n### Het inspectiegereedschap suiten\n\nJe kan het inspectiegereedschap sluiten door op de sluitknop in de rechter bovenhoek te klikken,\ndoor op de 'Escape' toets te klikken, of op de kaart.\n", - "buildings": "# Gebouwen\n\nOpenStreetMap is 's werelds grootste gebouwendatabase. Jij kan deze\ndatabase maken en verbeteren.\n\n### Selecteren\n\nJe kan een gebouw selecteren door op de omtrek te klikken. Dit doet het\ngebouw oplichten en opent een klein menu en een scherm met meer\n informatie over het gebouw.\n\n### Aanpassen\n\nSoms staan gebouwen niet op de juiste plaats of hebben ze onjuiste tags.\n\nOm een heel gebouw te verplaatsen, selecteer het en klik dan op het knop 'Verplaats'.\nBeweeg je muis om het gebouw te verplaatsen en klik als het op de goede plek staat.\n\nOm de vorm van een gebouw te verbeteren klik en versleep je de punten die samen\nde omtrek vormen naar de juiste plek.\n\n### Toevoegen\n\nEen van de onduidelijkheden over het toevoegen van gebouwen is dat in\nOpenStreetMap de gebouwen als vlakken en als punten kunnen worden vastgelegd.\nDe vuistregel is dat gebouwen zoveel mogelijk als een vlak worden ingetekend en\ndat bedrijven, woningen en voorzieningen die in die gebouwen zijn gevestigd als\npunt worden ingetekend binnen de omtrek.\n\nBegin om een gebouw als een vlak in te tekenen door op de knop 'Vlak' te klikken\nin de linker bovenhoek van het scherm en beëindig het tekenen door de 'Return' toets\nin te drukken of door op het eerste, getekende punt te klikken om de omtrek te sluiten.\n\n### Verwijderen\n\nAls een gebouw helemaal verkeerd is - je kan zien, dat het niet in het satellietbeeld\nzichtbaar is en idealiter heb je ter plekke geconstateerd dat het niet bestaat - dan\nkan je het verwijderen. Wees voorzichtig bij het verwijderen van objecten - zoals\nalle andere aanpassigen, is het resultaat voor iedereen zichtbaar en satellietbeelden\nzijn vaak verouderd, dus het gebouw kan simpelweg onlangs zijn gebouwd.\n\nJe kan een gebouw verwijderen door erop te klikken om het te selecteren en dan\nop het prullenbakicoon te klikken of op de 'Verwijderen' toets te drukken.\n" + "inspector": "# Het inspectiegereedschap\n\nHet inspectiegereedschap is het schermelement links op de pagina dat verschijnt als een object wordt geselecteerd en maakt het je mogelijk om eigenschappen aan te passen.\n\n### Een objecttype selecteren\n\nNadat je een punt, lijn of vlak hebt toegevoegd, kan je kiezen wat voor type object het is, bijvoorbeeld of het een snelweg of woonerf is, een supermarkt of een café. Het inspectiegereedschap toont knoppen voor veelvoorkomende objecttypen en je kan andere vinden door een term in het zoekscherm in te vullen.\n\nKlik op de 'i' in de rechter onderhoek van een objecttypeknop om meer te weten te komen. Klik op een knop om het type te selecteren.\n\n### Formulieren gebruiken en tags bewerken\n\nNadat je een objecttype hebt gekozen, of wanneer je een object selecteert, dat al een type toegekend heeft gekregen, dan toont het inspectiegereedschap allerlei eigenschappen van het object, zoals naam en adres.\n\nOnder de getoonde eigenschappen, kan je op icoontjes klikken om meer eigenschappen toe te voegen, zoals informatie uit [Wikipedia](http://www.wikipedia.org/), toegankelijkheid, etc.\n\nOnderaan het inspectiegereedschap klik je op 'Extra tags' om willekeurig andere tags toe te voegen. [Taginfo](http://taginfo.openstreetmap.org/) biedt een prachtig overzicht om meer te weten te komen over veelgebruikte combinaties van tags.\n\nAanpassingen die je in het inspectiegereedschap maakt zijn meteen zichtbaar in de kaart. Je kan ze op ieder moment ongedaan maken, door op de knop 'Ongedaan maken' te klikken.\n", + "buildings": "# Gebouwen\n\nOpenStreetMap is 's werelds grootste gebouwendatabase. Jij kan deze\ndatabase maken en verbeteren.\n\n### Selecteren\n\nJe kan een gebouw selecteren door op de omtrek te klikken. Dit doet het\ngebouw oplichten en opent een klein menu en een scherm met meer\n informatie over het gebouw.\n\n### Aanpassen\n\nSoms staan gebouwen niet op de juiste plaats of hebben ze onjuiste tags.\n\nOm een heel gebouw te verplaatsen, selecteer het en klik dan op het knop 'Verplaats'.\nBeweeg je muis om het gebouw te verplaatsen en klik als het op de goede plek staat.\n\nOm de vorm van een gebouw te verbeteren klik en versleep je de punten die samen\nde omtrek vormen naar de juiste plek.\n\n### Toevoegen\n\nEen van de onduidelijkheden over het toevoegen van gebouwen is dat in\nOpenStreetMap de gebouwen als vlakken en als punten kunnen worden vastgelegd.\nDe vuistregel is dat gebouwen zoveel mogelijk als een vlak worden ingetekend en\ndat bedrijven, woningen en voorzieningen die in die gebouwen zijn gevestigd als\npunt worden ingetekend binnen de omtrek.\n\nBegin om een gebouw als een vlak in te tekenen door op de knop 'Vlak' te klikken\nin de linker bovenhoek van het scherm en beëindig het tekenen door de 'Return' toets\nin te drukken of door op het eerste, getekende punt te klikken om de omtrek te sluiten.\n\n### Verwijderen\n\nAls een gebouw helemaal verkeerd is - je kan zien, dat het niet in het satellietbeeld\nzichtbaar is en idealiter heb je ter plekke geconstateerd dat het niet bestaat - dan\nkan je het verwijderen. Wees voorzichtig bij het verwijderen van objecten - zoals\nalle andere aanpassigen, is het resultaat voor iedereen zichtbaar en satellietbeelden\nzijn vaak verouderd, dus het gebouw kan simpelweg onlangs zijn gebouwd.\n\nJe kan een gebouw verwijderen door erop te klikken om het te selecteren en dan\nop het prullenbakicoon te klikken of op de 'Verwijderen' toets te drukken.\n", + "relations": "# Relaties\n\nEen relatie is een speciaal type object in OpenStreetMap die andere objecten\ngroepeert. Twee vaak voorkomende type relaties zijn, bijvoorbeeld, *route relatie*,\ndie delen van een weg die tot eenzelfde snelweg behoren groepeert, en\n*multipolygonen*, die verschillende lijnen groeperen die samen een complex vlak\ndefiniëren (een van verschillende delen met gaten erin als een donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Relaties bewerken\n\nAls je relaties wilt bewerken, zijn hier de basisvaardigheden.\n\nOm een object aan een relatie toe te voegen, selecteer het object, klik op de \"+\" knop in het\n\"Alle relaties\" gedeelte van de sidebar en selecteer of type de naam van de relatie.\n\nOm een nieuwe relatie te creëren, selecteer het eerste object dat er deel uit moet maken,\nklik de \"+\" knop in het \"Alle relaties\" gedeelte en kies \"Nieuwe relatie...\".\n\nOm een object van een relatie ver verwijderen, selecteer het object en klik op de\nvuilnisbak knop naast de relatie van welke die verwijdert dient te worden.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) knop.\n" }, "intro": { "navigation": { @@ -346,6 +369,7 @@ }, "lines": { "title": "Lijnen", + "add": "Lijnen worden gebruikt om objecten zoals wegen, spoorlijnen en rivieren weer te geven. **Klik op de Lijn knop om een nieuwe lijn toe te voegen.**", "start": "**Begin de lijn door te klikken op het eindpunt van de weg.**", "intersect": "Klik om meer knooppunten aan de lijn toe te voegen. Je kan de kaart verslepen tijdens het tekenen als dat nodig mocht zijn. Wegen en veel andere lijnen zijn onderdeel van een groter netwerk. Het is belangrijk, dat deze lijnen juist aan elkaar zijn verbonden, zodat je een route kan laten berekenen. **Klik op 'Flower Street' om een kruising te maken waar de twee lijnen worden verbonden.**", "finish": "Lijnen kunnen worden beëindigd door nogmaals op het laatste knooppunt te klikken. **Beëindig het tekenen van de weg.**", @@ -378,9 +402,6 @@ }, "category-route": { "name": "Route" - }, - "category-water": { - "name": "Water" } }, "fields": { @@ -421,6 +442,9 @@ } } }, + "access_toilets": { + "label": "Toegang" + }, "address": { "label": "Adres", "placeholders": { @@ -440,9 +464,18 @@ "amenity": { "label": "Type" }, + "artist": { + "label": "Kunstenaar" + }, + "artwork_type": { + "label": "Type" + }, "atm": { "label": "Pinautomaat" }, + "backrest": { + "label": "Rugleuning" + }, "barrier": { "label": "Type" }, @@ -515,9 +548,21 @@ "fee": { "label": "Tarief" }, + "fire_hydrant/type": { + "label": "TYpe" + }, "fixme": { "label": "Repareer me" }, + "generator/method": { + "label": "Methode" + }, + "generator/source": { + "label": "Bron" + }, + "generator/type": { + "label": "Type" + }, "highway": { "label": "Type" }, @@ -676,6 +721,9 @@ "surface": { "label": "Oppervlak" }, + "toilets/disposal": { + "label": "Afvoer" + }, "tourism": { "label": "Type" }, @@ -688,6 +736,9 @@ "trail_visibility": { "label": "Zichtbaarheid van de weg" }, + "vending": { + "label": "Soort goederen" + }, "water": { "label": "Type" }, @@ -756,6 +807,9 @@ "name": "Voorziening", "terms": "Voorziening" }, + "amenity/arts_centre": { + "name": "Kunstencentrum" + }, "amenity/atm": { "name": "Pinautomaat", "terms": "Pinautomaat" @@ -780,6 +834,9 @@ "name": "Fietsverhuur", "terms": "Fietsverhuur" }, + "amenity/boat_rental": { + "name": "Bootverhuur" + }, "amenity/cafe": { "name": "Café", "terms": "Café, bar" @@ -856,8 +913,7 @@ "terms": "Markt" }, "amenity/parking": { - "name": "Parkeren", - "terms": "Parkeerplaats" + "name": "Parkeerplaats" }, "amenity/pharmacy": { "name": "Apotheek", @@ -899,6 +955,9 @@ "name": "Café", "terms": "Café, bar" }, + "amenity/ranger_station": { + "name": "Boswachtershut" + }, "amenity/restaurant": { "name": "Restaurant", "terms": "Restaurant" @@ -935,6 +994,9 @@ "name": "Universiteit", "terms": "Universtiteit, academie" }, + "amenity/vending_machine": { + "name": "Automaat" + }, "amenity/waste_basket": { "name": "Prullenbak", "terms": "Prullenbak, afvalbak" @@ -1003,12 +1065,33 @@ "building/apartments": { "name": "Apartementen" }, + "building/commercial": { + "name": "Kantoorgebouw" + }, "building/entrance": { "name": "Ingang" }, + "building/garage": { + "name": "Garage" + }, "building/house": { "name": "Huis" }, + "building/hut": { + "name": "Hut" + }, + "building/industrial": { + "name": "Industrieel gebouw" + }, + "building/residential": { + "name": "Woongebouw" + }, + "emergency/ambulance_station": { + "name": "Ambulancestandplaats" + }, + "emergency/fire_hydrant": { + "name": "Brandkraan" + }, "emergency/phone": { "name": "Praatpaal" }, @@ -1093,6 +1176,9 @@ "highway/steps": { "name": "Trap" }, + "highway/stop": { + "name": "Stopbord" + }, "highway/tertiary": { "name": "Tertiare weg" }, @@ -1163,7 +1249,7 @@ "name": "Bouwterrein" }, "landuse/farm": { - "name": "Boerderij" + "name": "Landbouwgrond" }, "landuse/farmyard": { "name": "Boerenerf" @@ -1187,7 +1273,7 @@ "name": "Mijnbouw" }, "landuse/residential": { - "name": "Woningen" + "name": "Woongebied" }, "landuse/retail": { "name": "Detailhandel" @@ -1198,6 +1284,12 @@ "leisure": { "name": "Vrijetijd" }, + "leisure/common": { + "name": "Gemeenschappelijk" + }, + "leisure/dog_park": { + "name": "Hondenpark" + }, "leisure/garden": { "name": "Tuin" }, @@ -1222,6 +1314,9 @@ "leisure/pitch/basketball": { "name": "Basketbalveld" }, + "leisure/pitch/skateboard": { + "name": "Skatepark" + }, "leisure/pitch/soccer": { "name": "Voetbalveld" }, @@ -1237,12 +1332,18 @@ "leisure/slipway": { "name": "Botenhelling" }, + "leisure/sports_center": { + "name": "Sportcentrum" + }, "leisure/stadium": { "name": "Stadion" }, "leisure/swimming_pool": { "name": "Zwembad" }, + "leisure/track": { + "name": "Racebaan" + }, "line": { "name": "Lijn" }, @@ -1258,6 +1359,9 @@ "man_made/lighthouse": { "name": "Vuurtoren" }, + "man_made/observation": { + "name": "Uitkijktoren" + }, "man_made/pier": { "name": "Pier" }, @@ -1339,6 +1443,18 @@ "office": { "name": "Kantoor" }, + "office/newspaper": { + "name": "Krant" + }, + "office/political_party": { + "name": "Politieke Partij" + }, + "office/therapist": { + "name": "Therapeut" + }, + "office/travel_agent": { + "name": "Reisbureau" + }, "place": { "name": "Plaats" }, @@ -1369,11 +1485,14 @@ "power": { "name": "Stroomvoorziening" }, + "power/generator": { + "name": "Elektriciteitsgenerator" + }, "power/line": { - "name": "Electriciteitsdraad" + "name": "Elektriciteitsdraad" }, "power/pole": { - "name": "Electriciteitspaal" + "name": "Elektriciteitspaal" }, "power/sub_station": { "name": "Klein onderstation" @@ -1393,6 +1512,9 @@ "railway/disused": { "name": "In onbruik geraakte spoorbaan" }, + "railway/halt": { + "name": "Treinhalte" + }, "railway/level_crossing": { "name": "Gelijkvloerse spoorwegovergang" }, @@ -1528,6 +1650,9 @@ "shop/laundry": { "name": "Wasserette" }, + "shop/locksmith": { + "name": "Slotenmaker" + }, "shop/mall": { "name": "Winkelcentrum" }, @@ -1663,11 +1788,14 @@ "type/route/foot": { "name": "Wandelroute" }, + "type/route/hiking": { + "name": "Wandelpad" + }, "type/route/pipeline": { "name": "Pijpleidingstraject" }, "type/route/power": { - "name": "Electriciteitsleidingstraject" + "name": "Elektriciteitsleidingstraject" }, "type/route/road": { "name": "Autoroute" diff --git a/vendor/assets/iD/iD/locales/no.json b/vendor/assets/iD/iD/locales/no.json index fa6d48013..0e44b1e9b 100644 --- a/vendor/assets/iD/iD/locales/no.json +++ b/vendor/assets/iD/iD/locales/no.json @@ -156,7 +156,6 @@ "title": "Bakgrunn", "description": "Bakgrunnsinnstillinger", "percent_brightness": "{opacity}% lysstyrke", - "fix_misalignment": "Rett opp skjevstilling", "reset": "tilbakestill" }, "restore": { @@ -198,8 +197,7 @@ "out": "Forminsk" }, "gpx": { - "local_layer": "Lokal GPX-fil", - "drag_drop": "Dra og slipp en .gpx-fil pÃ¥ denne siden" + "local_layer": "Lokal GPX-fil" }, "help": { "title": "Hjelp" @@ -225,9 +223,6 @@ }, "category-route": { "name": "Rute" - }, - "category-water": { - "name": "Vann" } }, "fields": { @@ -636,9 +631,6 @@ "amenity/marketplace": { "name": "Markedsplass" }, - "amenity/parking": { - "name": "Parkering" - }, "amenity/pharmacy": { "name": "Apotek" }, diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json index c6003fccd..d9f3d4876 100644 --- a/vendor/assets/iD/iD/locales/pl.json +++ b/vendor/assets/iD/iD/locales/pl.json @@ -43,8 +43,8 @@ "continue": { "key": "A", "title": "Kontynuuj", - "description": "Kontynuuj tą linię", - "not_eligible": "Å»adna linia nie może być w tym miejscu kontyuowana", + "description": "Kontynuuj tę linię.", + "not_eligible": "Å»adna linia nie może być w tym miejscu kontynuowana.", "multiple": "Kilka linii może być tutaj kontynuowanych. Aby wybrać linię, kliknij w nią przytrzymując klawisz Shift.", "annotation": { "line": "Kontynuowano rysowanie linii.", @@ -71,7 +71,7 @@ "line": "Stworzono okrąg z linii.", "area": "Stworzono koło z obszaru." }, - "not_closed": "Z tego nie można zrobić okręgu, bo nie jest pętlą." + "not_closed": "Z tego obiektu nie można zrobić okręgu, gdyż nie jest pętlą." }, "orthogonalize": { "title": "Koryguj prostopadłość", @@ -83,7 +83,8 @@ "annotation": { "line": "Stworzono kąty proste z narożników linii.", "area": "Stworzono kąty proste obszaru." - } + }, + "not_squarish": "Nie można stworzyć kątów prostych, gdyż obiekt nie posiada czterech boków." }, "straighten": { "title": "Prostowanie", @@ -146,7 +147,7 @@ "area": "Przesunięto obszar.", "multiple": "Przesunięto wiele obiektów." }, - "incomplete_relation": "Tego obiektu nie można przesunąć, gdyż nie jest całkiem pobrany." + "incomplete_relation": "Tego obiektu nie można przesunąć, gdyż nie został całkiem pobrany." }, "rotate": { "title": "Obróć", @@ -246,15 +247,18 @@ "back_tooltip": "Zmień rodzaj obiektu", "remove": "Usuń", "search": "Szukaj", + "multiselect": "Zaznaczone obiekty", "unknown": "Nieznane", "incomplete": "", "feature_list": "Wyszukiwanie rodzaju obiektu", - "edit": "Edytuj obiekt" + "edit": "Edytuj obiekt", + "none": "Brak" }, "background": { "title": "Tło", "description": "Ustawienia tła", "percent_brightness": "jasność {opacity}%", + "none": "Brak", "custom": "Własne", "custom_prompt": "Wpisz adres kafelków w formacie {z}, {x}, {y} dla schematu Z/X/Y lub {u} dla schematu QuadTile.", "fix_misalignment": "Wyrównaj podkład", @@ -317,7 +321,9 @@ "cannot_zoom": "Nie można bardziej oddalić widoku w obecnym trybie.", "gpx": { "local_layer": "Lokalny plik GPX", - "drag_drop": "Przeciągnij i upuść plik .gpx na stronę" + "drag_drop": "Przeciągnij i upuść plik .gpx na stronę lub kliknij przycisk po prawej by go wybrać", + "zoom": "Pokaż ślad GPX", + "browse": "Otwórz plik .gpx" }, "help": { "title": "Pomoc", @@ -325,9 +331,9 @@ "editing_saving": "# Edycja i zapis\n\nTen edytor został zaprojektowany do pracy w trybie online i już go używasz poprzez stronę\ninternetową.\n\n### Wybieranie obiektów\n\nAby wybrać obiekt na mapie, na przykład droga, czy POI, kliknij go na mapie.\nSpowoduje to podświetlenie wybranego obiektu, otworzenie panelu zawierającego szczegóły\no nim i wyświetlenie menu z poleceniami, które możesz wykonać na obiekcie.\n\nWiele obiektów może zostać wybranych przez przytrzymanie wciśniętego klawisza 'Shift' i lewego klawisza myszy, z jednoczesnym przeciągnięciem zaznaczając interesujący nas obszar mapy. Spowoduje to wybór wszystkich obiektów zawartych w narysowanym prostokącie, umożliwiając Tobie wykonywanie działań na kilku obiektach naraz.\n\n### Zapisywanie modyfikacji\n\nGdy wprowadzisz zmiany, na przykład przez modyfikacje dróg, budynków i miejsc, są one\nprzechowywane lokalnie aż zapiszesz je na serwerze. Nie martw się, gdy popełnisz błąd - możesz\ncofnąć zmiany przez kliknięcie na przycisk cofnij i powtórzyć je poprzez kliknięcie na przycisk powtórz.\n\nKliknij 'Zapisz' aby skończyć grupę modyfikacji - na przykład, gdy skończyłeś pewien obszar miasta i\nchcesz zacząć następny. Będziesz miał wtedy szansę przejrzeć, co zrobiłeś, a edytor dostarczy pomocne\nsugestie i ostrzeżenia w razie, gdyby coś było nie tak z twoimi zmianami.\n\nJeśli wszystko dobrze wygląda, możesz podać krótki komentarz opisujący zmianę, którą wprowadziłeś\ni kliknąć 'Zapisz' ponownie, aby wysłać zmiany do [OpenStreetMap.org](http://www.openstreetmap.org/),\ngdzie będą one widoczne dla wszystkich użytkowników i dostępne dla innych do bazowania na nich i\ndalszego ulepszania.\n\nJeżeli nie możesz skończyć swoich modyfikacji w czasie jednej sesji, możesz opuścić okno edytora i\nwrócić później (na tym samym komputerze i w tej samej przeglądarce), a edytor zaoferuje ci przywrócenie\ntwojej pracy.\n", "roads": "# Drogi\n\nMożesz tworzyć, poprawiać i usuwać drogi używając tego edytora. Drogi mogą być wszelkiego rodzaju:\nścieżki, ulice, szlaki, ścieżki rowerowe i tak dalej - każdy często uczęszczany odcinek powinien dać się\nprzedstawić.\n\n### Zaznaczanie\n\nKliknij drogę, aby ją zaznaczyć. Obwiednia powinna stać się widoczna, wraz z małym menu\nnarzędziowym na mapie oraz panelem bocznym pokazującym więcej informacji na temat drogi.\n\n### Modyfikowanie\n\nCzęsto będziesz widział drogi, które nie są wyrównane ze zdjęciami satelitarnymi lub śladami GPS.\nMożesz dopasować te drogi tak, aby były we właściwym miejscu.\n\nNajpierw kliknij drogę, którą chcesz zmienić. Podświetli ją to oraz pokaże punkty kontrolne, które\nmożesz przesunąć w lepsze miejsce. Jeżeli chcesz dodać nowe punkty kontrolne, aby droga\nbyła bardziej szczegółowa, dwukrotnie kliknij część drogi bez punktu, a w tym miejscu nowy się\npojawi.\n\nJeżeli droga łączy się z inną drogą, ale nie jest prawidłowo połączona z nią na mapie, możesz\nprzeciągnąć jeden z puntów kontrolnych na drugą drogę w celu ich połączenia. Prawidłowe połączenia\ndróg są ważne dla mapy i kluczowe dla wyznaczania tras.\n\nMożesz też kliknąć narzędzie 'Przesuń' lub nacisnąć klawisz `M` aby przesunąć jednocześnie całą\ndrogę, a następnie kliknąć ponownie, aby zachować to przesunięcie.\n\n### Usuwanie\n\nGdy droga jest całkiem błędna - widzisz, że nie istnieje na zdjęciach satelitarnych (a najlepiej sam\nsprawdziłeś w terenie, że jej nie ma) - możesz usunąć ją. Uważaj, gdy usuwasz obiekty - wyniki usunięcia,\ntak jak każdej modyfikacji, są widoczne dla wszystkich, a zdjęcie satelitarne często nie są aktualne,\nwięc droga może być po prostu nowo wybudowana.\n\nMożesz usunąć drogę przez zaznaczenie jej, a następnie kliknięcie ikony kosza lub wciśnięcie\nklawisza 'Delete'.\n\n### Tworzenie\n\nGdzieś tam powinna być droga, ale jej nie ma? Kliknij przycisk 'Linia' w górnym lewym rogu edytora\nlub naciśnij klawisz '2' na klawiaturze, aby zacząć rysować linię.\n\nKliknij początek drogi na mapie, aby zacząć rysować. Jeżeli droga odchodzi od już istniejącej, zacznij\nprzez kliknięcie w miejscu, w którym się łączą.\n\nNastępnie klikaj na punktach wzdłuż drogi tak, aby biegła ona odpowiednio według zdjęć satelitarnych\nlub GPS. Jeżeli droga, którą rysujesz, krzyżuje się z inną, połącz je, klikając na punkcie przecięcia. Gdy\nskończysz rysować, dwukrotnie kliknij ostatni punkt lub naciśnij klawisz 'Enter' na klawiaturze.\n", "gps": "# GPS\n\nDane GPS są najbardziej zaufanym źródłem dla OpenStreetMap. Ten edytor obsługuje lokalne ślady -\npliki `.gpx` na twoim komputerze. Możesz zbierać tego rodzaju ślady GPS używając aplikacji na\nsmartfony lub sprzętu GPS.\n\nInformacje jak używać GPS-u do zbierania informacji o okolicy możesz znaleźć pod\n[Zbieranie informacji z GPS](http://learnosm.org/en/beginner/using-gps/).\n\nAby użyć śladu GPX do rysowania mapy, przeciągnij i upuść plik GPX na edytor. Jeżeli zostanie\nrozpoznany, zostanie dodany na mapę w postaci jaskrawej linii. Kliknij menu 'Ustawienia tła'\npo prawej stronie, aby włączyć, wyłączyć lub powiększyć do nowej warstwy GPX.\n\nŚlad GPX nie jest bezpośrednio wysyłany do OpenStreetMap - najlepiej użyć go do rysowania mapy,\nużywając go jako wzoru dla nowych obiektów, które dodasz. Aby wysłać ślad na serwer odwiedź stronę \n [Publiczne ślady GPS](http://www.openstreetmap.org/trace/create), będziesz mógł go udostępnić\ninnym użytkownikom.\n", - "imagery": "# Zdjęcia\n\nZdjęcia lotnicze/satelitarne są ważnym zasobem w rysowaniu map. Kolekcja zdjęć lotniczych,\nsatelitarnych i innych wolnodostępnych źródeł jest dostępna w edytorze w menu 'Ustawienia tła' po\nlewej stronie.\n\nDomyślnie wyświetlana jest warstwa zdjęć satelitarnych z [Bing Maps](http://www.bing.com/maps/),\nale w miarę przybliżania i pojawiają się nowe źródła. Niektóre kraje, takie jak Stany Zjednoczone, Francja\nczy Dania mają w pewnych miejscach dostępne zdjęcia bardzo wysokiej jakości.\n\nZdjęcia są czasem przesunięte względem danych na mapie z powodu błędu dostawcy zdjęć. Jeżeli\nwidzisz dużo dróg przesuniętych względem tła, zastanów się, zanim je wszystkie wyrównasz względem\ntła. Zamiast tego może dostosować przesunięcie zdjęć tak, aby zgadzały się z istniejącymi danymi przez\nnaciśnięcie przycisku 'Wyrównaj podkład' na dole Ustawień tła.\n", + "imagery": "# Zdjęcia\n\nZdjęcia lotnicze/satelitarne są ważnym zasobem w rysowaniu map. Kolekcja zdjęć lotniczych,\nsatelitarnych i innych wolnodostępnych źródeł jest dostępna w edytorze w menu 'Ustawienia tła' po\nprawej stronie.\n\nDomyślnie wyświetlana jest warstwa zdjęć satelitarnych z [Bing Maps](http://www.bing.com/maps/),\nale w miarę przybliżania i pojawiają się nowe źródła. Niektóre kraje, takie jak Stany Zjednoczone, Francja\nczy Dania mają w pewnych miejscach dostępne zdjęcia bardzo wysokiej jakości.\n\nZdjęcia są czasem przesunięte względem danych na mapie z powodu błędu dostawcy zdjęć. Jeżeli\nwidzisz dużo dróg przesuniętych względem tła, zastanów się, zanim je wszystkie wyrównasz względem\ntła. Zamiast tego możesz dostosować przesunięcie zdjęć tak, aby zgadzały się z istniejącymi danymi przez\nnaciśnięcie przycisku 'Wyrównaj podkład' na dole Ustawień tła.\n", "addresses": "# Adresy\n\nAdresy są jedną z najbardziej użytecznych informacji na mapie.\n\nMimo że adresy są często reprezentowane jako części ulic, w OpenStreetMap są one\nzapisywane jako atrybuty budynków i miejsc wzdłuż ulicy.\n\nMożesz dodać nową informację adresową do miejsc narysowanych w postaci\nobwiedni budynków jak również do tych narysowanych w postaci pojedynczych punktów.\nNajlepszym źródłem danych adresowych jest jak zwykle zwiedzanie okolicy\nlub własna wiedza - tak jak z każdym innym obiektem, kopiowanie danych z komercyjnych\nźródeł takich jak Google Maps jest zabronione.\n", - "inspector": "# Używanie Inspektora\n\nInspektor jest elementem interfejsu po prawej stronie strony, który pojawia się po zaznaczeniu obiektu\ni który pozwala ci modyfikować jego szczegóły.\n\n### Zaznaczanie typu obiektu\n\nPo dodaniu punktu, linii lub obszaru, możesz wybrać, jakiego rodzaju to jest obiekt, na przykład czy jest\nto autostrada czy droga lokalna, kawiarnia czy supermarket. Inspektor wyświetli przyciski dla\npopularnych typów obiektów, a ty możesz znaleźć inne przez wpisanie tego, czego szukasz do pola\nszukania.\n\nKliknij 'i' w prawym dolnym rogu przycisku typu obiektu, aby dowiedzieć się o nim więcej.\nKliknij przycisk, aby wybrać ten typ.\n\n### Używanie formularzy i edycja tagów\n\nPo wybraniu typu obiektu lub gdy wybierzesz obiekt, który ma już nadany typ, inspektor wyświetli pola\nzawierające szczegóły na temat obiektu, takie jak nazwa i adres.\n\nPoniżej pól, które widzisz, możesz kliknąć ikony w celu dodania innych szczegółów, jak na przykład\ninformacja z [Wikipedii](http://www.wikipedia.org/), dostęp dla wózków inwalidzkich i innych.\n\nNa dole inspektora kliknij 'Dodatkowe tagi', aby dodać dowolne inne tagi do elementu.\n[Taginfo](http://taginfo.openstreetmap.org/) jest świetnym źródłem informacji o popularnych\nkombinacjach tagów.\n\nZmiany, które wprowadzisz w inspektorze, są automatycznie nanoszone na mapę. Możesz je cofnąć w\nkażdym momencie przez wciśnięcie przycisku 'Cofnij'.\n\n### Zamykanie Inspektora\n\nMożesz zamknąć inspektora przez kliknięcie na przycisk zamknij w górnym prawym rogu, wciśnięcie\nklawisza 'Escape' lub kliknięcie mapy.\n", + "inspector": "# Używanie Inspektora\n\nInspektor jest elementem interfejsu po lewej stronie strony, który pojawia się po zaznaczeniu obiektu\ni który pozwala ci modyfikować jego szczegóły.\n\n### Zaznaczanie typu obiektu\n\nPo dodaniu punktu, linii lub obszaru, możesz wybrać, jakiego rodzaju to jest obiekt, na przykład czy jest\nto autostrada czy droga lokalna, kawiarnia czy supermarket. Inspektor wyświetli przyciski dla\npopularnych typów obiektów, a ty możesz znaleźć inne przez wpisanie tego, czego szukasz do pola\nszukania.\n\nKliknij 'i' w prawym dolnym rogu przycisku typu obiektu, aby dowiedzieć się o nim więcej.\nKliknij przycisk, aby wybrać ten typ.\n\n### Używanie formularzy i edycja tagów\n\nPo wybraniu typu obiektu lub gdy wybierzesz obiekt, który ma już nadany typ, inspektor wyświetli pola\nzawierające szczegóły na temat obiektu, takie jak nazwa i adres.\n\nPoniżej pól, które widzisz, możesz kliknąć ikony w celu dodania innych szczegółów, jak na przykład\ninformacja z [Wikipedii](http://www.wikipedia.org/), dostęp dla wózków inwalidzkich i innych.\n\nNa dole inspektora kliknij 'Dodatkowe tagi', aby dodać dowolne inne tagi do elementu.\n[Taginfo](http://taginfo.openstreetmap.org/) jest świetnym źródłem informacji o popularnych\nkombinacjach tagów.\n\nZmiany, które wprowadzisz w inspektorze, są automatycznie nanoszone na mapę. Możesz je cofnąć w\nkażdym momencie przez wciśnięcie przycisku 'Cofnij'.\n\n### Zamykanie Inspektora\n\nMożesz zamknąć inspektora przez kliknięcie na przycisk zamknij w górnym prawym rogu, wciśnięcie\nklawisza 'Escape' lub kliknięcie mapy.\n", "buildings": "# Budynki\n\nOpenStreetMap jest największą na świecie bazą budynków. Możesz\nprzyczynić się do rozwoju owej bazy.\n\n### Zaznaczanie\n\nMożesz zaznaczyć budynek przez kliknięcie jego obwodu. Podświetli\nto obiekt i otworzy małe menu narzędziowe oraz pasek boczny zawierający\ninformacje o budynku.\n\n### Modyfikowanie\n\nZdarza się, że budynki są umieszczone w nieprawidłowych miejscach\nlub mają nieodpowiednie tagi.\n\nAby przesunąć cały budynek, zaznacz go, a następnie wybierz narzędzie\nprzesuwania. Przesuń kursor myszy, aby zmienić pozycję obiektu, a następnie\nkliknij, gdy już będzie w odpowiednim miejscu.\n\nAby poprawić kształt budynku, kliknij i przeciągnij węzły, które tworzą obwód\nobiektu, w lepiej usytuowane miejsce.\n\n### Tworzenie\n\nJednym z głównych problemów podczas tworzenia budynków jest to,\nże OpenStreetMap przechowuje budynki zarówno w postaci punktów\njak i obszarów. Przyjęło się rysowanie budynków w postaci obszarów, a rysowanie\nfirm, domów czy innej infrastruktury w postaci punktów w obszarze budynku.\n\nZacznij rysować budynek w postaci obszaru przez kliknięcie przycisku 'Obszar'\nw górnym lewym rogu edytora i zakończ go przez naciśnięcie klawisza 'Enter'\nna klawiaturze lub przez kliknięcie na pierwszym rysowanym punkcie w celu\nzamknięcia obszaru.\n\n### Usuwanie\n\nJeżeli budynek jest całkiem błędny - widzisz, że nie ma go na zdjęciach satelitarnych,\na najlepiej sprawdziłeś w terenie, że nie istnieje - możesz go usunąć. Bądź ostrożny\nusuwając obiekty - tak jak po każdej innej modyfikacji, rezultaty są widoczne dla wszystkich,\na zdjęcia satelitarne często nie są aktualne, więc budynek może być po prostu nowo\nwybudowany.\n\nMożesz usunąć budynek przez kliknięcie na nim, a następnie na ikonie\nśmietnika lub wciśnięcie klawisza 'Delete'. \n", "relations": "# Relacje\n\nRelacja to specjalny rodzaj obiektu w OpenStreetMap, który grupuje razem\ninne obiekty. Na przykład dwa powszechne rodzaje relacji to *relacje trasy*\nktóre grupują odcinki drogi należące do konkretnej autostrady lub drogi oraz\n*wielokąty* łączące razem kilka linii, które definiują bardziej złożony obszar\n(na przykład las z polaną w środku).\n\nKażdy element relacji nazywany jest *członkiem*. W pasku bocznym możesz\nzobaczyć do której relacji należy obiekt i kliknąć aby ją zaznaczyć. Gdy relacja\njest zaznaczona, ukaże nam się lista jej członków, które jednocześnie zostaną \npodświetlone na mapie.\n\nPrzeważnie edytor iD automatycznie sprawdza relacje podczas twoich edycji.\nTrzeba pamiętać o ważnej rzeczy, gdy kasujesz jakiś fragment linii (np. aby\ndokładniej go narysować), sprawdź wcześniej do jakich relacji należy oraz\njakie pełni w nich role aby uzupełnić te dane po wyrysowaniu linii.\n\n## Edycja relacji\n\nJeśli chcesz edytować relacje, oto podstawy wiedzy.\n\nAby dodać obiekt do relacji, zaznacz obiekt i wciśnij \"+\" w sekcji \"Wszystkie relacje\"\ni wybierz relację lub wpisz jej nazwę.\n\nAby utworzyć nową relację, zaznacz pierwszy obiekt, który ma być członkiem\nrelacji i wciśnij \"+\" w sekcji \"Wszystkie relacje\" i wybierz \"Nowa relacja...\"\n\nAby usunąć obiekt z relacji, zaznacz obiekt i kliknij ikonkę kosza obok\nrelacji, z której chcesz go usunąć.\n\nMożesz stworzyć wielokąt złożony z otworem używając narzędzia Scalanie.\nNarysuj dwa obszary, gdzie jeden znajduje się wewnątrz drugiego, zaznacz\noba przytrzymując klawisz Shift i kliknij przycisk \"Scal te linie\" (+).\n" }, @@ -396,9 +402,6 @@ }, "category-route": { "name": "Trasa" - }, - "category-water": { - "name": "Woda" } }, "fields": { @@ -470,6 +473,9 @@ "atm": { "label": "Bankomat" }, + "backrest": { + "label": "Oparcie" + }, "barrier": { "label": "Typ" }, @@ -733,6 +739,9 @@ "trail_visibility": { "label": "Widoczność szlaku" }, + "vending": { + "label": "Rodzaje towarów" + }, "water": { "label": "Typ" }, @@ -827,6 +836,9 @@ "name": "Wypożyczalnia rowerów", "terms": "wypożyczalnia" }, + "amenity/boat_rental": { + "name": "Wpożyczalnia łodzi" + }, "amenity/cafe": { "name": "Kawiarnia", "terms": "kawa,herbata,kawiarnia" @@ -867,7 +879,8 @@ "terms": "ambasada" }, "amenity/fast_food": { - "name": "Fast food" + "name": "Fast food", + "terms": "kebab, hot dog, fast food, McDonald's, McDonald" }, "amenity/fire_station": { "name": "Straż pożarna", @@ -901,10 +914,6 @@ "name": "Targowisko", "terms": "targowisko,targ,rynek,giełda" }, - "amenity/parking": { - "name": "Parking", - "terms": "parking,postój" - }, "amenity/pharmacy": { "name": "Apteka", "terms": "apteka,leki" @@ -981,6 +990,9 @@ "name": "Uniwersytet", "terms": "college,uniwersytet,szkoła wyższa" }, + "amenity/vending_machine": { + "name": "Automat sprzedający" + }, "amenity/waste_basket": { "name": "Kosz na śmieci", "terms": "kosz,kubeł,śmietnik" @@ -1013,64 +1025,83 @@ "name": "Przegroda dla rowerzystów" }, "barrier/ditch": { - "name": "Rów" + "name": "Rów", + "terms": "rów,wykop" }, "barrier/entrance": { - "name": "Wejście" + "name": "Wejście", + "terms": "wejście,przejście" }, "barrier/fence": { - "name": "Płot" + "name": "Płot", + "terms": "ogrodzenie,płot" }, "barrier/gate": { - "name": "Brama" + "name": "Brama", + "terms": "brama,bramka,przejście,furtka" }, "barrier/hedge": { - "name": "Å»ywopłot" + "name": "Å»ywopłot", + "terms": "żywopłot" }, "barrier/kissing_gate": { "name": "Kissing Gate" }, "barrier/lift_gate": { - "name": "Szlaban" + "name": "Szlaban", + "terms": "szlaban" }, "barrier/retaining_wall": { - "name": "Mur oporowy" + "name": "Mur oporowy", + "terms": "mur,oporowy" }, "barrier/stile": { - "name": "Przełaz" + "name": "Przełaz", + "terms": "przełaz" }, "barrier/toll_booth": { - "name": "Punkt poboru opłat" + "name": "Punkt poboru opłat", + "terms": "punkt,poboru,opłat" }, "barrier/wall": { - "name": "Mur" + "name": "Mur", + "terms": "ściana,mur" }, "boundary/administrative": { - "name": "Granica administracyjna" + "name": "Granica administracyjna", + "terms": "granica,administracyjna,granice,administracyjne" }, "building": { - "name": "Budynek" + "name": "Budynek", + "terms": "budynek,budowla,dom" }, "building/apartments": { - "name": "Apartamenty" + "name": "Apartamenty", + "terms": "blok,kamienica" }, "building/commercial": { - "name": "Nieruchomość komercyjna" + "name": "Nieruchomość komercyjna", + "terms": "sklep,komercyjny,sprzedaż,handlowy" }, "building/entrance": { - "name": "Wejście" + "name": "Wejście", + "terms": "wejście,drzwi" }, "building/garage": { - "name": "Garaż" + "name": "Garaż", + "terms": "garaż" }, "building/house": { - "name": "Dom" + "name": "Dom", + "terms": "dom,domek,chata" }, "building/hut": { - "name": "Chata" + "name": "Chata", + "terms": "chata,szałas,schronienie,koliba" }, "building/industrial": { - "name": "Budynek przymysłowy" + "name": "Budynek przymysłowy", + "terms": "przemysłowy,produkcyjny,fabryczny,industrialny" }, "building/residential": { "name": "Budynek mieszkalny", @@ -1083,36 +1114,44 @@ "name": "Hydrant" }, "emergency/phone": { - "name": "Telefon alarmowy" + "name": "Telefon alarmowy", + "terms": "telefon,alarmowy,alarm" }, "entrance": { - "name": "Wejście" + "name": "Wejście", + "terms": "wejście,przejście" }, "highway": { - "name": "Droga" + "name": "Droga", + "terms": "droga,szlak,ulica" }, "highway/bridleway": { "name": "Ścieżka do jazdy konnej", "terms": "jazda konna,szlak jeździecki,szlak konny" }, "highway/bus_stop": { - "name": "Przystanek autobusowy" + "name": "Przystanek autobusowy", + "terms": "przystanek,stacja,postój" }, "highway/crossing": { - "name": "Przejście dla pieszych" + "name": "Przejście dla pieszych", + "terms": "skrzyżowanie,krzyżówka" }, "highway/cycleway": { - "name": "Ścieżka rowerowa" + "name": "Ścieżka rowerowa", + "terms": "droga,rowerowa,ścieżka,rowerów" }, "highway/footway": { "name": "Ścieżka dla pieszych", "terms": "pobocze,bulwar,ścieżka,deptak,szosa,spacer" }, "highway/living_street": { - "name": "Strefa zamieszkania" + "name": "Strefa zamieszkania", + "terms": "strefa,zamieszkania,zamieszkała,droga,ulica" }, "highway/mini_roundabout": { - "name": "Mini-rondo" + "name": "Mini-rondo", + "terms": "mini,rondo,małe,skrzyżowanie" }, "highway/motorway": { "name": "Autostrada", @@ -1127,17 +1166,19 @@ "terms": "rampa,wjazd,wyjazd,zjazd" }, "highway/path": { - "name": "Ścieżka" + "name": "Ścieżka", + "terms": "ścieżka,dróżka" }, "highway/pedestrian": { - "name": "Deptak" + "name": "Deptak", + "terms": "piesi,pieszych,deptak,droga" }, "highway/primary": { "name": "Droga pierwszorzędna", "terms": "główna droga, droga krajowa, główna, pierwszorzędna, DK, ważna" }, "highway/primary_link": { - "name": "Droga pierwszorzędna - wjazd/zjazd", + "name": "Łącznik dróg pierwszorzędnych", "terms": "rampa,wjazd,wyjazd,zjazd" }, "highway/residential": { @@ -1145,20 +1186,24 @@ "terms": "lokalna, osiedlowa, zamieszkała" }, "highway/road": { - "name": "Nieokreślona droga" + "name": "Nieokreślona droga", + "terms": "droga,nieznana,niewiadoma" }, "highway/secondary": { - "name": "Droga drugorzędna" + "name": "Droga drugorzędna", + "terms": "droga,drugorzędna,wojewódzka" }, "highway/secondary_link": { - "name": "Droga drugorzędna - wjazd/zjazd", + "name": "Łącznik dróg drugorzędnych", "terms": "rampa,wjazd,wyjazd,zjazd" }, "highway/service": { - "name": "Droga serwisowa" + "name": "Droga serwisowa", + "terms": "droga,serwisowa,wewnętrzna" }, "highway/service/alley": { - "name": "Alejka" + "name": "Alejka", + "terms": "alejka" }, "highway/service/drive-through": { "name": "Drive-through" @@ -1173,13 +1218,19 @@ "name": "Uliczka parkingowa" }, "highway/steps": { - "name": "Schody" + "name": "Schody", + "terms": "schody" + }, + "highway/stop": { + "name": "Znak stop", + "terms": "znak,stop,zatrzymania" }, "highway/tertiary": { - "name": "Droga trzeciorzędna" + "name": "Droga trzeciorzędna", + "terms": "droga,trzeciorzędna,powiatowa" }, "highway/tertiary_link": { - "name": "Droga trzeciorzędna - wjazd/zjazd", + "name": "Łącznik dróg trzeciorzędnych", "terms": "rampa,wjazd,wyjazd,zjazd" }, "highway/track": { @@ -1199,89 +1250,111 @@ "terms": "rampa,wjazd,wyjazd,zjazd" }, "highway/turning_circle": { - "name": "Miejsce do zawracania" + "name": "Miejsce do zawracania", + "terms": "miejsce,zawracania,zawracanie" }, "highway/unclassified": { - "name": "Droga niesklasyfikowana" + "name": "Droga czwartorzędna", + "terms": "droga,niesklasyfikowana,klasyfikacji,bez" }, "historic": { - "name": "Miejsce historyczne" + "name": "Miejsce historyczne", + "terms": "miejsce,historyczne,historia,zwiedzanie" }, "historic/archaeological_site": { "name": "Wykopalisko archeologiczne" }, "historic/boundary_stone": { - "name": "Kamień graniczny" + "name": "Kamień graniczny", + "terms": "kamień,graniczny" }, "historic/castle": { - "name": "Zamek" + "name": "Zamek", + "terms": "zamek,gród" }, "historic/memorial": { - "name": "Miejsce pamięci" + "name": "Miejsce pamięci", + "terms": "miejsce,pamięci,pamiątkowy,memoriał,pomnik" }, "historic/monument": { - "name": "Pomnik" + "name": "Pomnik", + "terms": "monument,pomnik" }, "historic/ruins": { - "name": "Ruiny" + "name": "Ruiny", + "terms": "ruiny,ruina" }, "historic/wayside_cross": { - "name": "Przydrożny krzyż" + "name": "Przydrożny krzyż", + "terms": "krzyż,przydrożny" }, "historic/wayside_shrine": { - "name": "Przydrożna kapliczka" + "name": "Przydrożna kapliczka", + "terms": "kapliczka,przydrożna" }, "landuse": { - "name": "Użytkowanie gruntów" + "name": "Użytkowanie gruntów", + "terms": "teren,zagospodarowanie,terenu,użytkowanie,wykorzystanie" }, "landuse/allotments": { - "name": "Ogródki działkowe" + "name": "Ogródki działkowe", + "terms": "działki,ogródki,ogródek" }, "landuse/basin": { - "name": "Zbiornik wodny" + "name": "Zbiornik wodny", + "terms": "zbiornik,wodny,retencyjny" }, "landuse/cemetery": { - "name": "Cmentarz" + "name": "Cmentarz", + "terms": "cmentarz" }, "landuse/commercial": { "name": "Handlowy" }, "landuse/construction": { - "name": "Budowa" + "name": "Budowa", + "terms": "budowa,teren,budowy" }, "landuse/farm": { - "name": "Teren rolny" + "name": "Teren rolny (orny)", + "terms": "Farma, gospodarstwo, zagroda" }, "landuse/farmyard": { - "name": "Podwórze gospodarskie" + "name": "Zabudowa rolnicza", + "terms": "podwórze gospodarskie" }, "landuse/forest": { - "name": "Las" + "name": "Las", + "terms": "Las" }, "landuse/grass": { - "name": "Trawa" + "name": "Trawa", + "terms": "trawa, trawnik, " }, "landuse/industrial": { "name": "Obszar przemysłowy" }, "landuse/meadow": { - "name": "Łąka" + "name": "Łąka", + "terms": "Łąka" }, "landuse/orchard": { - "name": "Sad" + "name": "Sad", + "terms": "Sad" }, "landuse/quarry": { "name": "Kamieniołom" }, "landuse/residential": { - "name": "Zabudowa mieszkaniowa", + "name": "Zabudowa mieszkalna", "terms": "mieszkalny, zamieszkany, mieszkaniowy" }, "landuse/retail": { "name": "Obszar handlowy" }, "landuse/vineyard": { - "name": "Winnica" + "name": "Winnica", + "terms": "winnica" }, "leisure": { "name": "Rozrywka i wypoczynek" @@ -1290,13 +1363,16 @@ "name": "Park dla psów" }, "leisure/garden": { - "name": "Ogród" + "name": "Ogród", + "terms": "ogród" }, "leisure/golf_course": { - "name": "Pole golfowe" + "name": "Pole golfowe", + "terms": "pole golfowe" }, "leisure/marina": { - "name": "Przystań" + "name": "Przystań", + "terms": "przystań" }, "leisure/park": { "name": "Park", @@ -1314,6 +1390,10 @@ "leisure/pitch/basketball": { "name": "Boisko do koszykówki" }, + "leisure/pitch/skateboard": { + "name": "Skate park", + "terms": "skate,park,rolki,deskorolka,bmx" + }, "leisure/pitch/soccer": { "name": "Boisko do piłki nożnej" }, @@ -1329,6 +1409,10 @@ "leisure/slipway": { "name": "Pochylnia okrętowa" }, + "leisure/sports_center": { + "name": "Centrum sportowe", + "terms": "centrum,sportowe,rekreacji,rekreacja,sport,boisko,stadion" + }, "leisure/stadium": { "name": "Stadion" }, @@ -1354,6 +1438,9 @@ "man_made/lighthouse": { "name": "Latarnia morska" }, + "man_made/observation": { + "name": "Wieża obserwacyjna" + }, "man_made/pier": { "name": "Molo" }, @@ -1385,16 +1472,23 @@ "name": "Zatoka" }, "natural/beach": { - "name": "Plaża" + "name": "Plaża", + "terms": "plaża" }, "natural/cliff": { - "name": "Klif" + "name": "Klif", + "terms": "urwisko, klif" }, "natural/coastline": { - "name": "Wybrzeże" + "name": "Wybrzeże", + "terms": "Linia brzegowa" + }, + "natural/fell": { + "name": "Wzgórze" }, "natural/glacier": { - "name": "Lodowiec" + "name": "Lodowiec", + "terms": "lodowiec" }, "natural/grassland": { "name": "Łąka" @@ -1406,6 +1500,10 @@ "natural/peak": { "name": "Szczyt" }, + "natural/scree": { + "name": "Rumowisko", + "terms": "rumowisko" + }, "natural/scrub": { "name": "Zarośla" }, @@ -1446,13 +1544,16 @@ "name": "Miejsce" }, "place/city": { - "name": "Miasto" + "name": "Miasto", + "terms": "miasto" }, "place/hamlet": { - "name": "Przysiółek" + "name": "Przysiółek", + "terms": "mała wioska, przysiołek" }, "place/island": { - "name": "Wyspa" + "name": "Wyspa", + "terms": "Wyspa" }, "place/isolated_dwelling": { "name": "Pojedyncze zabudowania" @@ -1461,10 +1562,12 @@ "name": "Okolica" }, "place/town": { - "name": "Miasto" + "name": "Miasto", + "terms": "Miasteczko" }, "place/village": { - "name": "Wioska" + "name": "Wioska", + "terms": "Wieś" }, "point": { "name": "Punkt" @@ -1502,11 +1605,16 @@ "railway/disused": { "name": "Nieużywany tor" }, + "railway/halt": { + "name": "Stacja kolejowa", + "terms": "stacja,przystanek,kolej,kolejowa" + }, "railway/level_crossing": { "name": "Rogatka" }, "railway/monorail": { - "name": "Kolej jednoszynowa" + "name": "Kolej jednoszynowa", + "terms": "Kolej jednoszynowa" }, "railway/platform": { "name": "Peron kolejowy" @@ -1518,13 +1626,16 @@ "name": "Dworzec kolejowy" }, "railway/subway": { - "name": "Metro" + "name": "Metro", + "terms": "Metro" }, "railway/subway_entrance": { - "name": "Wejście do metra" + "name": "Wejście do metra", + "terms": "Wejście do metra" }, "railway/tram": { - "name": "Tramwaj" + "name": "Tramwaj", + "terms": "Tory tramwajowe" }, "relation": { "name": "Relacja" @@ -1533,13 +1644,15 @@ "name": "Trasa morska" }, "shop": { - "name": "Sklep" + "name": "Sklep", + "terms": "Sklep" }, "shop/alcohol": { "name": "Sklep monopolowy" }, "shop/bakery": { - "name": "Piekarnia" + "name": "Piekarnia", + "terms": "Piekarnia" }, "shop/beauty": { "name": "Salon piękności" @@ -1637,6 +1750,9 @@ "shop/laundry": { "name": "Pralnia" }, + "shop/locksmith": { + "name": "Ślusarz" + }, "shop/mall": { "name": "Centrum handlowe" }, @@ -1716,19 +1832,23 @@ "name": "Domek gościnny" }, "tourism/hostel": { - "name": "Schronisko" + "name": "Schronisko", + "terms": "Hostel" }, "tourism/hotel": { - "name": "Hotel" + "name": "Hotel", + "terms": "Hotel" }, "tourism/information": { "name": "Informacja" }, "tourism/motel": { - "name": "Motel" + "name": "Motel", + "terms": "Motel" }, "tourism/museum": { - "name": "Muzeum" + "name": "Muzeum", + "terms": "Muzeum" }, "tourism/picnic_site": { "name": "Miejsce na piknik" @@ -1740,7 +1860,8 @@ "name": "Punkt widokowy" }, "tourism/zoo": { - "name": "Zoo" + "name": "Zoo", + "terms": "Zoo, ogród zoologiczny" }, "type/boundary": { "name": "Granica" @@ -1772,6 +1893,9 @@ "type/route/foot": { "name": "Trasa piesza" }, + "type/route/hiking": { + "name": "Szlaki piesze" + }, "type/route/pipeline": { "name": "Trasa rurociągu" }, diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json index a56706e62..556155707 100644 --- a/vendor/assets/iD/iD/locales/pt-BR.json +++ b/vendor/assets/iD/iD/locales/pt-BR.json @@ -41,9 +41,11 @@ } }, "continue": { + "key": "A", "title": "Continuar", "description": "Continuar esta linha.", "not_eligible": "Nenhuma linha pode ser continuada aqui.", + "multiple": "Muitas linhas podem ser continuadas aqui. Para escolher uma linha, pressione a tecla Shift e clique nela para selecioná-la.", "annotation": { "line": "Continuou uma linha.", "area": "Continuou uma área." @@ -72,10 +74,24 @@ "not_closed": "Não é possível fazer disso um círculo, pois não forma um ciclo fechado." }, "orthogonalize": { + "title": "Ortogonalizar", + "description": { + "line": "Ajustar os cantos de uma linha para 90°.", + "area": "Ajustar os cantos de uma área para 90°." + }, + "key": "S", "annotation": { "line": "Ajustou os cantos de uma linha para 90°.", "area": "Ajustou os cantos de uma área para 90°." - } + }, + "not_squarish": "Isto não pode ser ortogonalizado porque não é um polígono." + }, + "straighten": { + "title": "Endireitar", + "description": "Endireitar esta linha.", + "key": "S", + "annotation": "Endireitar uma linha.", + "too_bendy": "Isto não pode ser alinhado porque possui muitas curvas." }, "delete": { "title": "Deletar", @@ -135,6 +151,7 @@ }, "rotate": { "title": "Girar", + "description": "Girar este objeto em torno de seu ponto central.", "key": "R", "annotation": { "line": "Girou uma linha.", @@ -230,18 +247,21 @@ "back_tooltip": "Alterar elemento", "remove": "Remover", "search": "Procurar", + "multiselect": "Itens Selecionados", "unknown": "Desconhecido", "incomplete": "", "feature_list": "Buscar elementos", - "edit": "Editar elemento" + "edit": "Editar elemento", + "none": "Nenhum" }, "background": { "title": "Imagem de Fundo", "description": "Configurações da imagem de fundo", "percent_brightness": "Brilho de {opacity}%", + "none": "Nenhum", "custom": "Customizado", "custom_prompt": "Entre com um template de tiles. Tokens válidos são {z}, {x}, {y} para esquema Z/X/Y e {u} para esquema de quadtile.", - "fix_misalignment": "Corrigir desalinhamento", + "fix_misalignment": "Corrigir alinhamento", "reset": "resetar" }, "restore": { @@ -264,7 +284,8 @@ "view_on_osm": "Ver no OSM", "facebook": "Compartilhar no Facebook", "twitter": "Compartilhar no Twitter", - "google": "Compartilhar Google+" + "google": "Compartilhar Google+", + "help_html": "Suas mudanças devem aparecer na camada \"Padrão\" do OSM em poucos minutos. Outras camadas e certos recursos podem demorar mais\n(detalhes).\n" }, "confirm": { "okay": "O.K." @@ -300,15 +321,19 @@ "cannot_zoom": "Não é possível afastar mais no modo atual.", "gpx": { "local_layer": "Arquivo GPX local", - "drag_drop": "Arraste e solte um arquivo .gpx nessa página" + "drag_drop": "Arraste e solte um arquivo .gpx na página, ou clique no botão à direita para procurar", + "zoom": "Aproximar para a trilha GPX", + "browse": "Procurar um arquivo .gpx" }, "help": { "title": "Ajuda", "help": "# Ajuda\n\nEsse é um editor para o [OpenStreetMap](http://www.openstreetmap.org/), o\nmapa livre e editável do mundo. Você pode usá-lo para adicionar e atualizar\no mapa na sua área, contribuindo com um mapa do mundo de código fonte\ne dados abertos para todos.\n\nAlterações feitas por você nesse mapa serão visíveis a todo mundo que usa o\nOpenStreetMap. Para poder editar o mapa, você precisará de uma\n[conta do OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nO [editor iD](http://ideditor.com/) é um projeto colaborativo com [código\nfonte disponível no GitHub](https://github.com/systemed/iD).\n", + "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n", "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n", - "imagery": "# Imagens Aéreas\n\nAs imagens aéreas são um recurso muito importante para o mapeamento.\nFotos de avião, de satélite e outras fontes estão disponíveis no editor,\nno menu \"Configurações da imagem de fundo\", na esquerda.\n\nPor padrão as imagens aéreas do [Bing Mapas](http://www.bing.com/maps/)\nficam habilitadas no editor, mas, ao mover o mapa para certas áreas, novas\nfontes de imagens são disponibilizadas. Alguns países, tais como os EUA, a\nFrança e a Dinamarca, têm imagens aéreas de alta qualidade em algumas áreas.\n\nAtenção: as imagens aéreas algumas vezes não batem exatamente com o\nque há em terra, isto é, têm algum deslocamento por causa de algum erro por\nparte de quem as gerou. Se você notar que muitas ruas estão deslocadas\nem comparação com a imagem de fundo, não as alinhe imediatamente com\na imagem. Em vez disso ajuste a imagem para que ela se alinhe com as ruas\natravés do botão \"Corrigir desalinhamento\" no final do painel de Configurações\nde Fundo.\n", + "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n", + "imagery": "# Imagens Aéreas\n\nAs imagens aéreas são um recurso muito importante para o mapeamento.\nFotos de avião, de satélite e de outras fontes livre estão disponíveis no editor,\nno menu \"Configurações da Imagem de Fundo\", no lado esquerdo.\n\nPor padrão as imagens de satélite do [Bing Maps](http://www.bing.com/maps/)\nestão habilitadas no editor, mas ao mover e aproximar o mapa para certas áreas,\nnovas fontes de imagens estarão disponíveis. Alguns países, tais como os EUA, a\nFrança e a Dinamarca, têm imagens aéreas de alta qualidade em algumas áreas.\n\nAtenção: as imagens aéreas algumas vezes não batem exatamente com o\nque há em terra, isto é, têm algum deslocamento por causa de algum erro por\nparte de quem as gerou. Se você notar que muitas ruas estão deslocadas\nem comparação com a imagem de fundo, não as alinhe imediatamente com\na imagem. Em vez disso ajuste a imagem para que ela se alinhe com as ruas\natravés do botão \"Corrigir desalinhamento\" no final do painel de Configurações\nda Imagem de Fundo.\n", "addresses": "# Endereços\n\nOs endereços são uma das informações mais úteis do mapa.\n\nApesar de os endereços serem representados como parte de uma rua, no OpenStreetMap\neles também são gravados como atributos de prédios e outros lugares ao longo das ruas.\n\nVocê pode adicionar informações de endereço nos locais mapeados como área de edifícios\nou mapeados como pontos. A melhor fonte de informações sobre endereços\né a que vem de pesquisas de campo ou conhecimento pessoal do local - assim\ncomo qualquer outra informação, copiar de fontes comerciais como o Google Maps é estritamente\nproibido.\n", - "inspector": "# Usando o Inspetor\n\nO inspetor é o elemento de interface do usuário no lado direito da\npágina que aparece quando um recurso é selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outras, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao elemento. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n\n### Fechando o Inspetor\n\nVocê pode fechar o inspetor, clicando no botão Fechar no canto superior direito, \nou pressionando a tecla 'Esc', ou clicando no mapa.\n", + "inspector": "# Usando o Inspetor\n\nO inspetor é a seção no lado direito da página que aparece quando um recurso\né selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como por exemplo se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outros, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao elemento. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n", "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar\ne melhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto vai destacar o\nedifício, abrir um pequeno menu de ferramentas e uma barra lateral, mostrando mais informações\nsobre o edifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o, e clique na ferramenta 'Mover'. Mova o\nmouse para deslocar o edifício, e clique novamente quando ele estiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os nós que formam as bordas\npara o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como formas quanto como pontos. A regra geral é\n_mapeie um edifício como uma forma sempre que possível_, e mapeie empresas, casas,\nserviços, e outros locais que operam fora de um edifício como pontos\ndentro da forma do edifício.\n\nComece desenhando um edifício como forma clicando no botão 'Área' no canto superior\nesquerdo da interface, e finalize pressionando 'Enter' no teclado\nou clicando no primeiro nó que você desenhou para fechar a forma.\n\n### Deletando\n\nSe um edifício estiver totalmente errado - você vê que ele não existe na imagem de satélite\ne também confirmou pessoalmente que ele não está lá - você pode deletá-lo,\nremovendo-o do mapa. Seja cuidadoso ao remover coisas -\nassim como qualquer outra edição, os resultados são vistos por todos, e as imagens de satélite\npodem estar desatualizadas, ou seja, pode ser que o edifício seja bem recente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois clicando \nna lixeira ou pressionando a tecla 'Delete'.\n", "relations": "# Relações\n\nUma relação é um tipo especial de feição do OpenStreetMap que agrupa outras feições.\nPor exemplo, dois tipos comuns de relações são as *relações de rotas*, que agrupam \ntrecho de vias que pertecem a uma mesma estrada ou rodovia, e as *relações de\n multipolígonos*, que agrupam várias linhas para definir áreas complexas, que podem\nconter áreas não contínuas ou vazios dentro de áreas.\n\nO grupo de feições em uma relação é chamado de *membros*. Na barra lateral, você \npode ver de qual relação uma feição é membro, e clicar em uma destas relações para \nselecioná-la. Quando uma relação é selecionada, você pode ver todos os seus membros \nlistados na barra lateral e selecionados no mapa.\n\nPara a maioria dos casos, o iD vai cuidar automaticamente das relações enquanto você \nedita. O mais importante a se levar em conta é que se você deletar um trecho de via \nque faz parte de uma relação para redesenhá-lo, você terá que adicioná-lo novamente \ncomo membro da relação original.\n\n## Editando Relações\n\nSe você quer editar relações, aqui estão instruções básicas.\n\nPara adicionar uma feição a uma relação, clique no botão \"+\" na seção \"Todas relações\"\nda barra lateral, e selecione ou digite o nome da relação.\n\nPara criar uma nova relação, primeiro selecione a feição que deverá ser um membro,\ndepois clique no botão \"+\" da seção \"Todas relações\" e selecione \"Nova relação...\".\n\nPara remover uma feição de uma relação, selecione ela e clique no botão de lixeira\npróximo à relação da qual você quer fazer a remoção.\n\nVocê pode criar multipolígonos com vazios usando a ferramenta \"Mesclar\". Desenhe \nduas áreas (interior e exterior), segure a tecla Shift, clique em cada uma dessas áreas\npara selecioná-las e clique no botão \"Mesclar\" (+).\n\n" }, @@ -344,13 +369,15 @@ }, "lines": { "title": "Linhas", + "add": "As linhas são usadas para representar elementos como estradas, ferrovias e rios. **Clique no botão Linha para adicionar uma nova linha.**", "start": "**Comece a desenhar a linha clicando no final da estrada.**", "intersect": "Clique para adicionar mais nós à linha. Você pode arrastar o mapa enquanto desenha, se for necessário. Estradas, e muitos outros tipos de linhas, são partes de uma rede maior. É importante que essas linhas estejam conectadas corretamente para que as aplicações de roteamento funcionem bem. **Clique na Flower Street para criar uma interseção que conecta as duas linhas.**", "finish": "Para indicar o final da criação de uma linha, clique novamente no seu último nó. **Termine de criar a rua.**", "road": "**Selecione \"Estrada\" na lista**", "residential": "Há vários tipos diferentes de estrada, o mais comum entre elas é a via residencial. **Escolha o tipo Via Residencial.**", "describe": "**Coloque o nome da rua e feche o editor de elementos.**", - "restart": "A rua precisa ter um ponto de interseção com a Flower Street." + "restart": "A rua precisa ter um ponto de interseção com a Flower Street.", + "wrong_preset": "Você não selecionou o tipo de via Residencial. **Clique aqui para escolher novamente**" }, "startediting": { "title": "Começar a editar", @@ -361,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Prédio" + }, "category-landuse": { "name": "Uso da Terra" }, @@ -376,7 +406,10 @@ "category-route": { "name": "Rota" }, - "category-water": { + "category-water-area": { + "name": "Água" + }, + "category-water-line": { "name": "Água" } }, @@ -449,6 +482,9 @@ "atm": { "label": "Caixa Eletrônico" }, + "backrest": { + "label": "Encosto" + }, "barrier": { "label": "Tipo" }, @@ -576,6 +612,9 @@ "label": "Níveis", "placeholder": "2, 4, 6..." }, + "lit": { + "label": "Iluminado" + }, "location": { "label": "Local" }, @@ -709,6 +748,9 @@ "trail_visibility": { "label": "Visibilidade da Trilha" }, + "tree_type": { + "label": "Tipo" + }, "vending": { "label": "Tipo de Produtos" }, @@ -808,6 +850,10 @@ "name": "Aluguel de Bicicletas", "terms": "Aluguel de Bicicletas" }, + "amenity/boat_rental": { + "name": "Aluguel de Barcos", + "terms": "Aluguel de Embarcações" + }, "amenity/cafe": { "name": "Cafeteria", "terms": "Cafeteria, Café" @@ -886,7 +932,7 @@ }, "amenity/parking": { "name": "Estacionamento", - "terms": "Estacionamento" + "terms": "estacionamento,parada" }, "amenity/pharmacy": { "name": "Farmácia", @@ -968,6 +1014,10 @@ "name": "Universidade", "terms": "Universidade" }, + "amenity/vending_machine": { + "name": "Máquina de Venda", + "terms": "Totem de vendas, Máquina de Venda Automática" + }, "amenity/waste_basket": { "name": "Cesto de Lixo", "terms": "Cesto de Lixo, Lixeira, Balde de Lixo" @@ -1100,6 +1150,14 @@ "name": "Entrada", "terms": "Entrada" }, + "footway/crossing": { + "name": "Cruzamento", + "terms": "cruzamento,passagem" + }, + "footway/sidewalk": { + "name": "Calçada", + "terms": "calçada,passeio" + }, "highway": { "name": "Rodovia", "terms": "Rodovia" @@ -1177,7 +1235,7 @@ "terms": "Acesso a Via Secundária" }, "highway/service": { - "name": "Estrada coletora", + "name": "Via de Serviço", "terms": "Via de Serviço" }, "highway/service/alley": { @@ -1204,6 +1262,10 @@ "name": "Escadaria", "terms": "Degraus, Escada" }, + "highway/stop": { + "name": "Placa de Pare", + "terms": "Sinal de Pare, Placa Pare" + }, "highway/tertiary": { "name": "Via Terciária", "terms": "Via Terciária" @@ -1344,6 +1406,10 @@ "name": "Lazer", "terms": "Lazer" }, + "leisure/common": { + "name": "Área Comunitária", + "terms": "Comum, Habitual, Frequente" + }, "leisure/dog_park": { "name": "Parque de Cães", "terms": "Parque de Cães" @@ -1380,6 +1446,10 @@ "name": "Quadra de Basquetebol", "terms": "Quadra de Basquete" }, + "leisure/pitch/skateboard": { + "name": "Pista de Skate", + "terms": "Parque de Skate, Área para prática de Skate" + }, "leisure/pitch/soccer": { "name": "Campo de Futebol", "terms": "Campo de Futebol" @@ -1400,6 +1470,10 @@ "name": "Rampa Náutica", "terms": "Rampa Náutica" }, + "leisure/sports_center": { + "name": "Centro Esportivo", + "terms": "Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes," + }, "leisure/stadium": { "name": "Estádio", "terms": "Estádio, Ginásio" @@ -1432,6 +1506,10 @@ "name": "Farol", "terms": "Farol" }, + "man_made/observation": { + "name": "Torre de Observação", + "terms": "Torre de observação" + }, "man_made/pier": { "name": "Píer", "terms": "Píer" @@ -1484,6 +1562,10 @@ "name": "Orla Marítima", "terms": "Orla Marítima, Linha Costeira" }, + "natural/fell": { + "name": "Colina", + "terms": "Caiu" + }, "natural/glacier": { "name": "Geleira", "terms": "Geleira, Glaciar" @@ -1500,6 +1582,10 @@ "name": "Pico", "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte" }, + "natural/scree": { + "name": "Cascalho", + "terms": "Seixos, Pedras" + }, "natural/scrub": { "name": "Arbustos", "terms": "Moita, Arbusto" @@ -1540,6 +1626,78 @@ "name": "Escritório", "terms": "Escritório" }, + "office/accountant": { + "name": "Contador" + }, + "office/administrative": { + "name": "Escritório Administrativo", + "terms": "Sala Administrativa, Administração, Sala do Administrativo" + }, + "office/architect": { + "name": "Arquiteto" + }, + "office/company": { + "name": "Escritório" + }, + "office/educational_institution": { + "name": "Instituto de Educação", + "terms": "escola,colégio,universidade,faculdade,curso,instituto,educação,educacional" + }, + "office/employment_agency": { + "name": "Agência de Empregos", + "terms": "agência,SINE,emprego,empregos,desempregado" + }, + "office/estate_agent": { + "name": "Imobiliária", + "terms": "imobiliária,aluguel,casa,apartamento,casas,apartamentos" + }, + "office/financial": { + "name": "Escritório Financeiro" + }, + "office/government": { + "name": "Escritório do Governo" + }, + "office/insurance": { + "name": "Seguradora", + "terms": "seguro,seguradora,apólice,corretor" + }, + "office/it": { + "name": "Escritório de TI", + "terms": "ti,cpd,informática,computador,rede" + }, + "office/lawyer": { + "name": "Escritório de Advogado", + "terms": "advogado,advocacia,escritório" + }, + "office/newspaper": { + "name": "Jornal", + "terms": "jornal,notícia" + }, + "office/ngo": { + "name": "Sede de ONG" + }, + "office/physician": { + "name": "Médico", + "terms": "médico,consultório,doutor,consulta" + }, + "office/political_party": { + "name": "Partido Político", + "terms": "política,político,partido,gabinete" + }, + "office/research": { + "name": "Escritório de Pesquisa", + "terms": "pesquisa,pesquisas,pesquisador,escritório" + }, + "office/telecommunication": { + "name": "Escritório de Telecomunicações" + }, + "office/therapist": { + "name": "Terapeuta" + }, + "office/travel_agent": { + "name": "Agência de Viagens", + "terms": "viagem,viagens,agência" + }, "place": { "name": "Local", "terms": "Local" @@ -1588,6 +1746,9 @@ "name": "Linha de Transmissão de Energia Elétrica", "terms": "Fio Elétrico" }, + "power/minor_line": { + "name": "Linha de Transmissão Pequena" + }, "power/pole": { "name": "Poste Elétrico", "terms": "Poste Elétrico" @@ -1616,6 +1777,10 @@ "name": "Ferrovia em Desuso", "terms": "Ferrovia em Desuso" }, + "railway/halt": { + "name": "Interrupção de Ferrovia", + "terms": "Final de Ferrovia, Interrupção de Estrada de Ferro" + }, "railway/level_crossing": { "name": "Passagem de Nível", "terms": "Passagem de Nível" @@ -1796,6 +1961,10 @@ "name": "Lavanderia", "terms": "Lavanderia" }, + "shop/locksmith": { + "name": "Chaveiro", + "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados" + }, "shop/mall": { "name": "Shopping Center", "terms": "Centro Comercial, Galeria" @@ -1828,6 +1997,10 @@ "name": "Pet Shop", "terms": "Pet Shop" }, + "shop/photo": { + "name": "Loja de Fotografia", + "terms": "Loja de Fotografia" + }, "shop/shoes": { "name": "Loja de Calçados", "terms": "Loja de Calçados" @@ -1976,6 +2149,10 @@ "name": "Rota de Pedestres", "terms": "Rota de Caminhada" }, + "type/route/hiking": { + "name": "Rota de Caminhada", + "terms": "Rota de Trekking, " + }, "type/route/pipeline": { "name": "Rota de Tubulação", "terms": "Rota de Tubulação" diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json index db22272e3..0458317ec 100644 --- a/vendor/assets/iD/iD/locales/pt.json +++ b/vendor/assets/iD/iD/locales/pt.json @@ -41,6 +41,7 @@ } }, "continue": { + "key": "A", "title": "Continuar", "description": "Continuar esta linha.", "not_eligible": "Nenhuma linha aqui pode ser continuada.", @@ -73,10 +74,24 @@ "not_closed": "Isto não pode ser tornado circular porque não é uma linha fechada." }, "orthogonalize": { + "title": "Esquadrar", + "description": { + "line": "Esquadrar os cantos desta linha.", + "area": "Esquadrar os cantos desta área." + }, + "key": "S", "annotation": { "line": "Cantos da linha ortogonalizados.", "area": "Cantos da área ortogonalizados." - } + }, + "not_squarish": "Isto não pode ser tornado quadrado porque não tem um formato quadrangular." + }, + "straighten": { + "title": "Endireitar", + "description": "Endireitar esta linha.", + "key": "S", + "annotation": "Linha endireitada.", + "too_bendy": "Isto não pode ser endireitado porque curva-se demasiado." }, "delete": { "title": "Remover", @@ -232,16 +247,20 @@ "back_tooltip": "Alterar elemento", "remove": "Remover", "search": "Pesquisar", + "multiselect": "Itens selecionados", "unknown": "Desconhecido", "incomplete": "", "feature_list": "Pesquisar elementos", - "edit": "Editar elemento" + "edit": "Editar elemento", + "none": "Nenhum" }, "background": { "title": "Imagem do Fundo", "description": "Configuração da imagem do fundo", "percent_brightness": "{opacity}% transparente", + "none": "Nenhum", "custom": "Personalizado", + "custom_prompt": "Introduza um modelo de peça. Símbolos válidos são {z}, {x}, {y} para o esquema Z/X/Y, e {u} para o esquema \"quadtile\".", "fix_misalignment": "Corrigir alinhamento", "reset": "reiniciar" }, @@ -265,7 +284,8 @@ "view_on_osm": "Ver em OSM", "facebook": "Partilhar no Facebook", "twitter": "Partilhar no Twitter", - "google": "Partilhar no Google+" + "google": "Partilhar no Google+", + "help_html": "As suas mudanças deverão aparecer na camada \"Standard\" dentro de alguns minutos. Outras camadas, e certos elementos, podem levar mais tempo\n(detalhes).\n" }, "confirm": { "okay": "OK" @@ -301,16 +321,16 @@ "cannot_zoom": "Não é possível afastar mais no modo atual.", "gpx": { "local_layer": "Ficheiro GPX local", - "drag_drop": "Arraste um ficheiro .gpx para esta página" + "drag_drop": "Arraste um ficheiro .gpx para a página, ou clique no botão à direita para navegar", + "zoom": "Enquadrar percurso GPX", + "browse": "Procurar por ficheiro .gpx" }, "help": { "title": "Ajuda", "help": "# Ajuda\n\nIsto é um editor do [OpenStreetMap](http://www.openstreetmap.org/), o mapa mundial livre e editável. Pode utilizá-lo para adicionar e atualizar dados do mapa\nna sua área, colaborando na construção de um mapa mundial melhor para todos.\n\nAs edições que fizer neste mapa serão visíveis a todas as pessoas que utilizem\no OpenStreetMap. Para poder alterar o mapa é necessário ter uma\n[conta no OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nO [editor iD](http://ideditor.com/) é um projeto colaborativo com [código-fonte disponível no site GitHub](https://github.com/systemed/iD).\n", "roads": "# Estradas\n\nPode criar, corrigir e eliminar estradas com o editor. As estradas podem ser\nde qualquer tipo: caminhos, autoestradas, carreiros florestais ou agrícolas,\nruas pedonais, ciclovias, entre outras. Qualquer local que seja frequentemente\natravessado por pessoas deve ser normalmente colocado no mapa.\n\n### Selecionar\n\nClique numa estrada para a selecionar. Aparece o painel lateral direito para\npoder editar as caraterísticas da estrada e botões em redor da estrada.\n\n### Alterar\n\nClique na estrada que quer alterar. Se quiser adicionar pontos à estrada entre\ndois pontos existentes basta clicar 2 vezes sobre o segmento da estrada.\nPode então deslocar esse ponto acabado de criar.\n\nSe existir uma estrada com ligação a outra no terreno mas que no mapa não\nestão ligadas, basta deslocar um ponto de uma das estradas até à outra estrada\npara ficarem ligadas. É muito importante as estradas estarem corretamente\nligadas umas às outras para que os programas de rotas possam fornecer\ninformações corretas aos utilizadores.\n\nPode também clicar no botão de 'Mover' ou premir a tecla 'M' para mover\na estrada toda de uma só vez. No entanto deve-se ter cuidado ao fazer isso\npois todos os pontos da estrada, incluindo os pontos partilhados com\noutras estradas, serão todos movidos.\n\nPara dividir uma estrada em duas, útil por exemplo quando existe uma estrada\nno mapa que na realidade são 2 estradas diferentes com referências diferentes,\nclique no ponto da estrada onde quer dividir e clique no botão da tesoura que\naparece ao lado do ponto. Esse botão aparece apenas se estiver o ponto\nselecionado e não a linha. Pode também combinar as 2 linhas numa só\nselecionando as duas estradas e clicando no botão + que aparece ao lado.\nSe existirem no mapa 2 estradas ligadas (nas extremidades ou num cruzamento)\nmas que na realidade não se ligam ou cruzam, basta selecionar o ponto comum\ne clicar no botão ao lado de desligar as linhas. Pode então deslocar o ponto\npara outro local.\n\n### Eliminar\n\nSe uma estrada estiver errada - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e a estrada pode ter sido\nconstruida posteriormente) e preferencialmente confirmar presencialmente - pode\neliminar a estrada toda. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar uma estrada clicando nela para a selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n\n### Criar\n\nEncontrou alguma estrada que não existe no mapa? Clique no botão 'Linha' que\nestá na parte superior ou pressione a tecla '2' para começar a desenhar a linha.\n\nClique no ponto inicial da estrada para começar a desenhá-la. Se Já existir\numa estrada no mapa, mas que está incompleta, pode continuá-la bastando\npara isso clicar no ponto da extremidade da estrada existente.\n\nAdicione então outros pontos de acordo com as imagens de satélite ou os trilhos\nGPS. Se a estrada que está a desenhar cruzar com outra estrada, crie um ponto\npor cima da outra estrada onde se cruzam. Quando terminar de desenhar\na estrada, clique duas vezes no último ponto da estrada ou pressione as teclas\nde mudança de linha ou 'Enter'.\n", "gps": "# GPS\n\nOs dados GPS são os de maior confiança para o OpenStreetMap. Este editor\npermite usar ficheiros `.gpx` como fundo para ajudar a editar mapas.\nPode obter dados GPS com vários telemóveis, assim como dispositivos GPS.\n\nPara mais informações sobre a obtenção de dados GPS ver a página [Gravando trilhos GPS] (http://wiki.openstreetmap.org/wiki/Recording_GPS_tracks).\n\nPara usar um ficheiro GPX como imagem de fundo, arraste o ficheiro do seu\ncomputador para o mapa. Se o ficheiro for reconhecido corretamente o trilho GPS\nserá mostrado a verde. Clique em 'Configuração da imagem de fundo' do lado\ndireito para mostrar ou esconder o trilho GPS, assim como enquadrar todo\no trilho GPS na janela.\n\nEste trilho GPS não é carregado para o OpenStreetMap para estar disponível\na outros editores, é apenas um ficheiro local GPS que pode utilizar para servir\nde referência e ajuda a editar o mapa. Também pode [carregar o ficheiro GPX para o OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npara que outros o possam utilizar ao editar mapas.\n\n", - "imagery": "# Imagens de Satélite\n\nAs imagens de satélite são um recurso importante na criação e alteração dos\nmapas. Estão disponíveis vários tipos de imagens de fundo para além das de\nsatélite no botão lateral esquerdo 'Configurações da imagem do fundo', como\noutros tipos de mapas.\n\nÉ normalmente mostrada primeiro a imagem de satélite do [Bing Maps](http://www.bing.com/maps/), mas conforme aproxime, afaste ou desloque\no local de visualização, podem estar disponíveis outras imagens de fundo\nde outras fontes.\n\nEm certos locais de alguns países são mostradas imagens de satélite de muito\nalta resolução, como nos Estados Unidos, França, Dinamarca. Em Portugal, Porto\ne Lisboa estão disponíveis em resolução alta, tal como Luanda em Angola e Beira\nem Moçambique. Regra geral as capitais têm boa resolução e o resto dos\nterritórios resolução média ou baixa.\n\nPor vezes as imagens de satélite não estão bem posicionadas devido a limitações\nou erros por parte do fornecedor das imagens. Caso veja que muitos elementos\ndo mapa do OpenStreetMap parecem deslocados em relação à imagem de\nsatélite, não desloque todos os elementos do mapa. É um indicador que a imagem\nde satélite necessita de ser ajustada. Para isso existe o botão 'Corrigir\nalinhamento' disponível no fundo do menu do botão lateral esquerdo de\n'Configurar imagem do fundo'.\n", "addresses": "# Endereços\n\nEndereços são das informações mais importantes para o mapa.\n\nApesar de endereços serem frequentemente representados em muitos mapas como parte de ruas, no OpenStreetMap eles são armazenados como atributos de edifícios e locais ao longo de ruas.\n\nDados de endereço podem ser adicionados tanto a locais representados como contornos de edifícios, como aos representados como um único ponto. A fonte ideal de dados de endereço é a recolha no local ou conhecimento pessoal — tal como com qualquer outro elemento, a cópia de fontes comerciais como o Google Maps é estritamente proibida.\n", - "inspector": "# Utilizar o Painel Lateral\n\nQuando se cria ou se seleciona um elemento do mapa surge um painel lateral\ndireito que permite editar detalhes do elemento, como por exemplo, indicar\nque uma estrada é uma estrada nacional, o piso é de asfalto e que num\ndeterminado trecho a velocidade máxima é de 50 km/h.\n\n### Selecionar um Tipo de Elemento\n\nApós adicionar ao mapa um ponto, linha ou área, pode escolher que tipo\nde elemento se trata, como por exemplo, se é uma estrada principal ou rua \nresidencial, supermercado ou café. O painel lateral direito mostra os tipos\nde elementos mais comuns para o elemento criado. Pode no entanto pesquisar\npor outros no campo de pesquisa. Por exemplo, não aparece por defeito na lista\n'Livraria' mas pode escrever 'livra' que aparecerá a opção 'Livraria'.\n\nClique no ícone 'i' que está do lado direito de cada etiqueta para saber mais\nsobre a mesma. \n\n### Utilizando Campos e Editar Etiquetas\n\nApós escolher um tipo de característica ou quando seleciona uma característica\nque já tem um tipo atribuído, são mostrados campos sobre a característica como\no nome e morada. Abaixo dos campos são mostrados ícones em que pode clicar\npara adicionar outras características, como uma ligação para uma página\nda Wikipédia, acesso com cadeira de rodas, notas, entre outros.\n\nNo fundo do painel lateral direito clique em 'Todas as etiquetas' para adicionar\noutros tipos de etiquetas, mesmo as incomuns. Pode recorrer ao site [Taginfo](http://taginfo.openstreetmap.org/) para saber que tipo de combinações de\netiquetas são mais utilizadas.\n\n### Fechar o Painel Lateral\n\nPode fechar o painel lateral direito clicando no botão 'x' que e encontra no canto\nsuperior direito, pressionando a tecla 'Esc' ou clicando no mapa.\n", "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios que existe sob licença\nlivre. Pode adicionar e melhorar o mapa com edifícios.\n\n### Selecionar\n\nPode selecionar edifícios clicando nos contornos da área que delimita o edifício.\nSerá mostrado então o menu de botões e o painel lateral direito com informações\nsobre o edifício.\n\n### Alterar\n\nPor vezes os edifícios são desenhados incorretamente colocados fora do sítio\nou têm etiquetas incompletas ou erradas.\n\nPara mover um edifício, selecione-o e clique no botão 'Mover' que aparece\nà volta do edifício selecionado. De seguida desloque o rato para deslocar\no edifício. Para terminar o movimento clique de novo.\n\nPara corrigir os contornos do edifício clique e desloque os pontos que formam\na área do edifício. caso seja necessário adicionar pontos clique e desloque\num ponto central que aparece entre dois pontos já existentes. Para remover\num ponto, clique no ponto e de seguida no botão de Eliminar que aparece\nà volta do ponto.\n\n### Criar\n\nPodem-se criar edifícios como áreas ou pontos. Sempre que possível, e caso\nse conheça a área que um edifício ocupa, caso esteja ligado a outros, deve-se\ncriar uma área para cada edifício. Se uma loja ou serviço ocupar um edifício todo\npode-se acrescentar etiquetas sobre a loja ou serviço ao edifício (área) todo,\ncaso existam vários num só edifício, os serviços e lojas devem ser criados\ncom pontos dentro do edifício com as etiquetas correspondentes.\n\nPara criar um edifício como área, clique no botão superior 'Área' e comece\na clicar para criar os pontos que definem a área do edifício. Termine de criar\na área clicando no ponto inicial, ou na tecla de mudança de linha do teclado.\n\n\n### Eliminar\n\nSe um edifício estiver incorreto - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e o edifício pode ter sido\nedificado posteriormente) e preferencialmente confirmar presencialmente - pode\neliminar o edifício. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar um edifício clicando na área dele para o selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n" }, "intro": { @@ -378,9 +398,6 @@ }, "category-route": { "name": "Rota" - }, - "category-water": { - "name": "Água" } }, "fields": { @@ -421,6 +438,9 @@ } } }, + "access_toilets": { + "label": "Acesso" + }, "address": { "label": "Morada", "placeholders": { @@ -443,9 +463,15 @@ "artist": { "label": "Artista" }, + "artwork_type": { + "label": "Tipo" + }, "atm": { "label": "MultiBanco" }, + "backrest": { + "label": "Encosto" + }, "barrier": { "label": "Tipo" }, @@ -518,9 +544,21 @@ "fee": { "label": "Tarifa" }, + "fire_hydrant/type": { + "label": "Tipo" + }, "fixme": { "label": "Corrigir" }, + "generator/method": { + "label": "Método" + }, + "generator/source": { + "label": "Fonte" + }, + "generator/type": { + "label": "Tipo" + }, "highway": { "label": "Tipo" }, @@ -561,6 +599,9 @@ "label": "Nível", "placeholder": "2, 4, 6..." }, + "lit": { + "label": "Iluminação" + }, "location": { "label": "Localização" }, @@ -679,6 +720,9 @@ "surface": { "label": "Superfície" }, + "toilets/disposal": { + "label": "Eliminação de resíduos" + }, "tourism": { "label": "Tipo" }, @@ -691,6 +735,9 @@ "trail_visibility": { "label": "Visibilidade do Trilho" }, + "vending": { + "label": "Tipo de produto" + }, "water": { "label": "Tipo" }, @@ -749,6 +796,9 @@ "amenity": { "name": "Infraestrutura" }, + "amenity/arts_centre": { + "name": "Centro artístico" + }, "amenity/atm": { "name": "Caixa MultiBanco" }, @@ -767,6 +817,9 @@ "amenity/bicycle_rental": { "name": "Aluguer de Bicicletas" }, + "amenity/boat_rental": { + "name": "Aluguer de barcos" + }, "amenity/cafe": { "name": "Café" }, @@ -828,9 +881,6 @@ "amenity/marketplace": { "name": "Mercado / Feira" }, - "amenity/parking": { - "name": "Estacionamento" - }, "amenity/pharmacy": { "name": "Farmácia" }, @@ -862,6 +912,9 @@ "amenity/pub": { "name": "Bar" }, + "amenity/ranger_station": { + "name": "Posto de guarda florestal" + }, "amenity/restaurant": { "name": "Restaurante" }, @@ -891,6 +944,9 @@ "name": "Universidade", "terms": "universidade,faculdade,instituto" }, + "amenity/vending_machine": { + "name": "Máquina automática de vendas" + }, "amenity/waste_basket": { "name": "Caixote do Lixo" }, @@ -981,6 +1037,12 @@ "name": "Edifício residencial", "terms": "Prédio residencial" }, + "emergency/ambulance_station": { + "name": "Central de ambulâncias" + }, + "emergency/fire_hydrant": { + "name": "Boca de incêndio" + }, "emergency/phone": { "name": "Telefone de Emergência" }, @@ -1065,6 +1127,9 @@ "highway/steps": { "name": "Escadas" }, + "highway/stop": { + "name": "Sinal de stop" + }, "highway/tertiary": { "name": "Estrada Terciária / Municipal" }, @@ -1170,6 +1235,9 @@ "leisure": { "name": "Lazer" }, + "leisure/common": { + "name": "Comum" + }, "leisure/dog_park": { "name": "Parque de cães", "terms": "Parque para cães" @@ -1198,6 +1266,9 @@ "leisure/pitch/basketball": { "name": "Campo de Basquetebol" }, + "leisure/pitch/skateboard": { + "name": "Parque de skate" + }, "leisure/pitch/soccer": { "name": "Campo de Futebol" }, @@ -1213,12 +1284,18 @@ "leisure/slipway": { "name": "Rampa para Barcos" }, + "leisure/sports_center": { + "name": "Centro desportivo" + }, "leisure/stadium": { "name": "Estádio" }, "leisure/swimming_pool": { "name": "Piscina" }, + "leisure/track": { + "name": "Pista de corridas" + }, "line": { "name": "Linha" }, @@ -1234,6 +1311,9 @@ "man_made/lighthouse": { "name": "Farol" }, + "man_made/observation": { + "name": "Torre de observação" + }, "man_made/pier": { "name": "Pontão / Atracadouro" }, @@ -1274,6 +1354,9 @@ "natural/coastline": { "name": "Linha Costeira" }, + "natural/fell": { + "name": "Encosta" + }, "natural/glacier": { "name": "Glaciar" }, @@ -1286,6 +1369,9 @@ "natural/peak": { "name": "Cume" }, + "natural/scree": { + "name": "Encosta de cascalho" + }, "natural/scrub": { "name": "Matagal" }, @@ -1346,6 +1432,9 @@ "power": { "name": "Energia" }, + "power/generator": { + "name": "Gerador elétrico" + }, "power/line": { "name": "Linha de Transmissão" }, @@ -1370,6 +1459,9 @@ "railway/disused": { "name": "Ferrovia Não Usada" }, + "railway/halt": { + "name": "Apeadeiro" + }, "railway/level_crossing": { "name": "Passagem de Nível Ferroviária" }, @@ -1466,6 +1558,9 @@ "shop/electronics": { "name": "Loja de Eletrónica de Consumo" }, + "shop/farm": { + "name": "Barraca de produtos do campo" + }, "shop/fishmonger": { "name": "Peixaria" }, @@ -1502,6 +1597,9 @@ "shop/laundry": { "name": "Lavandaria" }, + "shop/locksmith": { + "name": "Serralheiro" + }, "shop/mall": { "name": "Centro Comercial" }, @@ -1637,6 +1735,9 @@ "type/route/foot": { "name": "Rota Pedestre" }, + "type/route/hiking": { + "name": "Rota de caminhada" + }, "type/route/pipeline": { "name": "Rota de Pipeline" }, diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json index 2ff442a92..ab1312377 100644 --- a/vendor/assets/iD/iD/locales/ru.json +++ b/vendor/assets/iD/iD/locales/ru.json @@ -74,15 +74,24 @@ "not_closed": "Объект нельзя превратить в окружность: он незамкнут." }, "orthogonalize": { + "title": "Выпрямить углы", + "description": { + "line": "Сделать углы линии прямыми.", + "area": "Сделать углы контура прямыми." + }, + "key": "S", "annotation": { "line": "Выпрямлены углы в линии.", "area": "Выпрямлены углы контура." - } + }, + "not_squarish": "Нельзя выпрямить углы — это не похоже на прямоугольник." }, "straighten": { "title": "Выпрямить", "description": "Выпрямить эту линию.", - "key": "S" + "key": "S", + "annotation": "Выпрямить линию.", + "too_bendy": "Эту линию не выпрямить — она слишком изогнута." }, "delete": { "title": "Удалить", @@ -227,26 +236,29 @@ "no_documentation_key": "Для этого ключа описания нет", "show_more": "Ещё", "view_on_osm": "Посмотреть на openstreetmap.org", - "all_tags": "Все тэги", + "all_tags": "Все теги", "all_members": "Все участники", "all_relations": "Все отношения", "new_relation": "Новое отношение...", "role": "Роль", "choose": "Что это за объект?", "results": "{n} результатов для {search}", - "reference": "Посмотреть на OpenStreetMap Wiki", + "reference": "Посмотреть в вики OpenStreetMap", "back_tooltip": "Изменить объект", "remove": "Удалить", "search": "Поиск", + "multiselect": "Выделенные элементы", "unknown": "Неизвестно", "incomplete": "<не скачено>", "feature_list": "Поиск объектов", - "edit": "Редактировать объект" + "edit": "Редактировать объект", + "none": "Нет" }, "background": { "title": "Подложка", "description": "Настройка подложки", "percent_brightness": "яркость {opacity}%", + "none": "Нет", "custom": "Настраиваемый", "custom_prompt": "Введите шаблон для тайлов. Допустимые переменные {z}, {x}, {y} для Z/X/Y и {u} для quadtile.", "fix_misalignment": "Поправить смещение", @@ -267,20 +279,20 @@ "unsaved_changes": "У вас есть несохранённые правки" }, "success": { - "edited_osm": "ОСМ отредактирована!", + "edited_osm": "OSM отредактирована!", "just_edited": "Вы только что отредактировали карту OpenStreetMap!", "view_on_osm": "Посмотреть в OSM", "facebook": "Поделиться на Facebook", "twitter": "Поделиться через Twitter", "google": "Поделиться через Google+", - "help_html": "Ваши изменения должны появиться на \"Стандартном\" слое в течении нескольких минут. Обновление остальных слоев и элементов может занять большее время\n(подробности).\n" + "help_html": "Ваши изменения должны появиться на «Стандартном» слое в течении нескольких минут. Обновление остальных слоев и элементов может занять большее время\n(подробности).\n" }, "confirm": { "okay": "Ок" }, "splash": { "welcome": "Здравствуйте! Это iD, редактор карты OpenStreetMap", - "text": "Редактор iD - простой, но мощный инструмент для редактирования лучшей в мире открытой карты. Версия программы {version}. Дополнительная информация тут {website}, сообщать об ошибках на {github}.", + "text": "Редактор iD — простой, но мощный инструмент для редактирования лучшей в мире открытой карты. Версия программы: {version}. Дополнительную информацию смотрите на {website}, об ошибках сообщайте на {github}.", "walkthrough": "Запустить обучение", "start": "В редактор" }, @@ -309,32 +321,36 @@ "cannot_zoom": "Невозможно отдалиться в текущем виде.", "gpx": { "local_layer": "Свой файл GPX", - "drag_drop": "Перетащите файл .gpx на страницу" + "drag_drop": "Перетащите .gpx-файл на страницу или кликните по кнопке справа для выбора", + "zoom": "Навести на GPX-трек", + "browse": "Выбрать .gpx-файл" }, "help": { "title": "Справка", "help": "# Справка\n\nЭто редактор [OpenStreetMap](http://www.openstreetmap.org/): общедоступной,\nсвободно редактируемой карты мира. Вы можете использовать этот редактор для добавления\nи обновления карты вашей местности, помогая всем,\nулучшая открытую и свободную карту мира\n\nВаши правки увидит каждый пользователь карты OpenStreetMap. Для\nредактирования вам потребуется [зарегистрироваться в OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iD](http://ideditor.com/) — открытый совместный проект\nс [исходным кодом на GitHub](https://github.com/systemed/iD).\n", - "roads": "# Дороги\n\nВ этом редакторе вы можете создавать, изменять и удалять дороги. Дороги бывают самых разных типов: тропы, шоссе, грунтовки, велодорожки, и другие - любой участок местности, по которому есть какое-либо движение.\n\n### Выбор\n\nКликните на дороге чтобы выбрать её. Дорога подсветится выделением, справа появится редактор свойств, а рядом с ней появятся иконки действий.\n\n### Изменение\n\nИногда вы увидите дороги, не совпадающие со снимком подложки или GPS треком. Такие дороги можно отредактировать.\n\nКликните на дороге, которую надо изменить. Линия дороги подсветится, и на ней появятся контрольные точки, которые можно перетащить на более правильные места. Если вы захотите сделать дорогу более детализированной, дважды щелкните на линии для добавления в этом месте новой контрольной точки.\n\nЕсли в реальности дороги соединяются на перекрестке, а на карте не соединены - перетяните одну из контрольных точек дороги на линию другой. Правильное соединение дорог очень важно для карты и навигаторов, прокладывающих по ней маршрут.\n\nЧтобы передвинуть линию дороги целиком - выберите инструмент 'Перемещение' или нажмите горячую клавишу `M`. Повторный щелчок мышью зафиксирует дорогу на новом месте.\n\n### Удаление\n\nЕсли дорога нарисована совсем неправильно - её не видно на спутниковом снимке, а в идеальном случае - вы были на месте и сами убедились в её отсутствии - вы можете удалить дорогу с карты. Будьте очень осторожны, удаляя что-либо - как и другие ваши правки, это затрагивает всех пользователей карты. Спутниковые снимки часто бывают устаревшими, так что дорога может быть просто недавно построенной.\n\nЧтобы удалить дорогу, выберите её щелчком мыши, затем щелкните по иконке мусорного ведра или нажмите клавишу 'Delete'.\n\n### Создание\n\nНашли место, где в реальности дорога, а на карте её нет? Щелкните на кнопку 'Линия' слева вверху окна редактора или нажмите клавишу `2` чтобы начать рисовать линию.\n\nЩелкните на карте в месте, где должна начинаться дорога. Если она ответвляется от уже нарисованной можно начать рисование щелчком мыши в месте их пересечения.\n\nЗатем щелкайте на карте вдоль траектории дороги, согласно спутниковому снимку или GPS треку. Если новая дорога пересекается с другой, обязательно щелкните на уже существующей, чтобы создать точку перекрестка. Чтобы закончить рисование, сделайте двойной щелчок мышью или нажмите 'Enter' на клавиатуре.\n", - "imagery": "# Спутниковые снимки\n\nСнимки земной поверхности с воздуха - важный источник данных для редактирования. В меню 'Настройки подложки' с левой стороны окна редактора доступно подключение слоев спутниковых снимков, аэрофотосъемки и других открытых источников изображений.\n\nПо умолчанию в редакторе подключен слой спутниковых снимков [Bing Maps](http://www.bing.com/maps/), но в разных местах земного шара могут быть доступны и другие источники подложки. В некоторых районах некоторых стран, к примеру - США, Франции и Дании, доступны изображения очень высокого качества.\n\nИногда спутниковые снимки сдвинуты относительно данных карты по вине поставщика снимков. Если вы видите множество дорог, не совпадающих со снимком, не начинайте передвигать их под снимок! Вместо этого нужно сдвинуть снимок для совпадения с существующими данными, для этого в меню Настройки подложки есть кнопка 'Исправить смещение'.\n", - "addresses": "# Адреса\n\nАдреса - одна из самых важных составляющих карты.\n\nВ OpenStreetMap адреса хранятся в свойствах зданий и мест, расположенных вдоль улиц.\n\nАдресную информацию можно добавить к контурам зданий или отдельным точкам. Лучший источник адресов - ваши собственные знания или данные, полученные после обхода местности. Как и в случае с другими данными, копирование адресов из коммерческих источников вроде Google Maps строго запрещено.\n", - "inspector": "# Использование редактора свойств\n\nРедактор свойств это элемент интерфейса программы, находящийся справа окна. Он появляется когда выбран какой-либо объект карты, и позволяет увидеть и отредактировать его свойства.\n\n### Выбор типа объекта\n\nПосле того, как вы добавили точку, линию или область, вы можете выбрать, какой именно это тип объекта - шоссе, обычная дорога, супермаркет или кафе.\nРедактор свойств показывает кнопки для выбора наиболее часто используемых типов объектов, чтобы найти конкретный тип можно воспользоваться строкой поиска.\n\nЩелкните по иконке 'i' в нижнем правом углу кнопки типа объекта чтобы прочитать его описание. Щелкните на саму кнопку чтобы выбрать этот тип.\n\n### Использование полей и редактирование тэгов\n\nПосле того как вы выберете тип объекта, или выделите объект, у которого тип уже проставлен, редактор свойств покажет поля описывающие его свойства, например название или адрес.\n\nНиже этих полей находятся иконки, с помощью которых можно добавить дополнительные свойства, например ссылку на статью в [Wikipedia](http://www.wikipedia.org/), информацию о доступности для инвалидов, и другие.\n\nВ самом низу окна редактора свойств находится кнопка 'Дополнительные тэги', позволяющая добавить произвольные тэги объекту. На странице [Taginfo](http://taginfo.openstreetmap.org/) можно узнать о наиболее популярных используемых комбинациях тэгов.\n\nИзменения в редакторе свойств автоматически применяются к объекту. Как и другие изменения, их можно откатить кнопкой 'Откат'.\n\n### Закрытие редактора свойств\n\nОкно редактора свойств можно закрыть крестиком в правом верхнем углу его окна, нажатием клавиши 'Escape', или просто щелчком мыши по карте.\n", - "buildings": "# Здания\n\nOpenStreetMap - крупнейшая в мире база данных о зданиях. Вы можете добавлять и изменять эти данные.\n\n### Выбор\n\nЗдание можно выбрать щелкнув на его контур. При этом здание подсветится выделением, справа откроется страница его свойств, а рядом с ним появится меню действий.\n\n### Редактирование\n\nИногда здания неправильно размещены или имеют неверные тэги.\n\nЧтобы передвинуть здание целиком, выберите его, и щелкните на инструменте 'Перемещение'. Переместите здание с помощью мыши в нужное место и щелкните чтобы отпустить его.\n\nЧтобы изменить форму здания, перетягивайте точки его контура на нужные места.\n\n### Создание\n\nОдно из основных противоречий в добавлении новых зданий в OpenStreetMap заключается в том, что их можно задавать как областями, так и точками. Стоит взять за правило такой подход: само здание рисуется областью, если это возможно, а находящиеся в этом здании компании, магазины, и другие подобные объекты, привязанные к зданиям - рисуются точками, находящимися внутри контура здания.\n\nНарисуйте контур здания с помощью кнопки 'Область', находящейся слева вверху окна, затем закончите рисование либо нажатием клавиши 'Enter' на клавиатуре, либо щелкнув мышью на первой нарисованной точке здания.\n\n### Удаление\n\nЕсли здание совершенно неправильно нарисовано - его нет на спутниковом снимке, а еще лучше - вы лично на месте убедились что оно отсутствует - вы можете удалить его с карты. Будьте очень осторожны, удаляя объекты - ваши правки затрагивают всех пользователей ОСМ, а снимки часто бывают устаревшими. Возможно, это здание просто недавно построено.\n\nУдалить здание можно выделив его щелчком мыши, затем нажав на иконку мусорного ведра или горячей клавишей 'Delete'.\n", - "relations": "# Отношения\n\nОтношение - это специальный тип объекта в OpenStreetMap который объединяет другие объекты вместе. Например, два распространенных типа отношений это *отношения маршрутов*, которые объединяют вместе участки дорог, принадлежащих одной автостраде или шоссе, и *мультиполигоны*, которые группируют несколько линий в сложный контур, описывающий область (например, из нескольких островов или с дырами внутри).\n\nОбъекты, объединённые в отношение, называются участниками отношения. \nНа панели сбоку вы можете увидеть, участником каких отношений является выбранный объект, нажмите на отношение в этом списке, чтобы выделить его. Когда отношение выделено, вы можете увидеть всех его участников в списке на боковой панели и подсвеченными на карте.\n\nВ основном, iD заботится о поддержке отношений автоматически, пока вы редактируете. Основной момент, на который стоит обратить внимание - это, если вы удаляете отрезок дороги, чтобы перерисовать его с большей точностью, вам следует убедиться, что новый отрезок будет участником тех же отношений, что и начальный.\n\n## Редактирование отношений\n\nВот некоторые основы, если вы хотите редактировать отношения.\n\nЧтобы добавить объект в отношение, выделите объект, нажмите кнопку \"+\" в разделе \"Все отношения\" на боковой панели и выберите или напечатайте название отношения.\n\nЧтобы создать новое отношение, выберите первый объект, который будет участником отношения, нажмите кнопку \"+\" в разделе \"Все отношения\" и выберите \"Новое отношение...\".\n\nЧтобы удалить объект из отношения выберите объект и нажмите на кнопку с мусорной корзиной рядом с отношением, из которого вы хотите его удалить.\n\nВы можете делать мультиполигоны с отверстиями используя инструмент \"Объединить\". Нарисуйте два контура (внутренний и внешний), зажмите Shift и нажмите на каждый из контуров, чтобы они оба были выделены, затем нажмите кнопку \"Объединить\" (+).\n" + "editing_saving": "# Редактирование и сохранение\n\nЭтот редактор создан, в основном, для онлайн-редактирования, и сейчас вы работаете с ним через веб-сайт.\n\n### Выбор объектов\n\nЧтобы выбрать объект карты, например, дорогу или точку интереса, щёлкните по нему на карте. Выбранный объект будет помечен выделением, откроется панель его свойств, а рядом с ним появится меню с действиями, которые вы можете над ним совершить.\n\nУдерживая клавишу «Shift», можно выделить несколько объектов сразу. Это можно сделать, щёлкая по ним, или же растягивая рамку выделения с нажатой клавишей мыши. Все точки внутри неё будут выделены.\n\n### Сохранение правок\n\nКогда вы редактируете карту, например, изменяете дороги, здания и места, эти изменения хранятся на вашем компьютере, пока вы не сохраните их на сервер. Не бойтесь ошибиться — изменения можно откатить кнопкой «Отмена», или снова повторить их кнопкой «Повтор».\n\nНажмите «Сохранить» для сохранения группы изменений — например, вы закончили редактировать один район города и хотите продолжить с другим. У вас будет возможность просмотреть ваши изменения, а редактор покажет предложения и предупреждения, если во внесенных данных что-то не так.\n\nЕсли все верно, введите краткое описание ваших изменений и еще раз нажмите «Сохранить» для отправки данных на [OpenStreetMap.org](http://www.openstreetmap.org/), где они станут видны другим участникам для просмотра и дальнейшего развития карты.\n\nЕсли у вас не получается закончить с правками за один раз, окно редактора можно закрыть, тогда при следующем запуске редактора (на том же компьютере и в том же браузере) программа предложит восстановить вашу работу.\n", + "roads": "# Дороги\n\nВ этом редакторе вы можете создавать, изменять и удалять дороги. Дороги бывают самых разных типов: тропы, шоссе, грунтовки, велодорожки и другие — любой участок местности, по которому есть какое-либо движение.\n\n### Выбор\n\nКликните на дороге, чтобы выбрать её. Дорога подсветится выделением, справа появится редактор свойств, а рядом с ней появятся иконки действий.\n\n### Изменение\n\nИногда вы увидите дороги, не совпадающие со снимком подложки или GPS-треком. Такие дороги можно отредактировать.\n\nКликните на дороге, которую надо изменить. Линия дороги подсветится, и на ней появятся контрольные точки, которые можно перетащить на более правильные места. Если вы захотите сделать дорогу более детализированной, дважды щелкните на линии для добавления в этом месте новой контрольной точки.\n\nЕсли в реальности дороги соединяются на перекрестке, а на карте не соединены — перетяните одну из контрольных точек дороги на линию другой. Правильное соединение дорог очень важно для карты и навигаторов, прокладывающих по ней маршрут.\n\nЧтобы передвинуть линию дороги целиком — выберите инструмент «Перемещение» или нажмите горячую клавишу `M`. Повторный щелчок мышью зафиксирует дорогу на новом месте.\n\n### Удаление\n\nЕсли дорога нарисована совсем неправильно — её не видно на спутниковом снимке, а в идеальном случае — вы были на месте и сами убедились в её отсутствии — вы можете удалить дорогу с карты. Будьте очень осторожны, удаляя что-либо, — как и другие ваши правки, это затрагивает всех пользователей карты. Спутниковые снимки часто бывают устаревшими, так что дорога может быть просто недавно построенной.\n\nЧтобы удалить дорогу, выберите её щелчком мыши, затем щелкните по иконке мусорного ведра или нажмите клавишу «Delete».\n\n### Создание\n\nНашли место, где в реальности дорога, а на карте её нет? Щелкните на кнопку «Линия» слева вверху окна редактора или нажмите клавишу `2` чтобы начать рисовать линию.\n\nЩелкните на карте в месте, где должна начинаться дорога. Если она ответвляется от уже нарисованной можно начать рисование щелчком мыши в месте их пересечения.\n\nЗатем щёлкайте на карте вдоль траектории дороги, согласно спутниковому снимку или GPS-треку. Если новая дорога пересекается с другой, обязательно щёлкните на уже существующей, чтобы создать точку перекрестка. Чтобы закончить рисование, сделайте двойной щелчок мышью или нажмите «Enter» на клавиатуре.\n", + "gps": "# GPS\n\nДанные GPS — наиболее достоверный источник данных для OpenStreetMap. Этот редактор поддерживает загрузку файлов треков в формате `.gpx` с вашего компьютера. Вы можете записывать такие треки с помощью приложений для смартфонов и GPS-устройств.\n\nБолее подробно о сборе данных GPS можно прочесть на странице\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nЧтобы использовать GPX-трек при рисовании карты, перетяните файл трека прямо в окно редактора. Если трек успешно загрузится, то он отобразится на карте в виде ярко-зелёной линии. В меню «Настройки подложки» можно выключить, включить или масштабировать слой с треками.\n\nТрек при этом не будет загружен в базу OpenStreetMap, лучший способ его использования — нарисовать новые объекты карты, основываясь на данных трека, или [загрузить его на OpenStreetMap](http://www.openstreetmap.org/trace/create), чтобы другие смогли им воспользоваться.\n", + "imagery": "# Спутниковые снимки\n\nСнимки земной поверхности с воздуха — важный источник данных для картирования. В меню «Настройки подложки» с левой стороны окна редактора доступно подключение слоев спутниковых снимков, аэрофотосъемки и других открытых источников изображений.\n\nПо умолчанию в редакторе подключен слой спутниковых снимков [Bing Maps](http://www.bing.com/maps/), но в разных местах земного шара могут быть доступны и другие источники подложки. В некоторых районах некоторых стран, к примеру — США, Франции и Дании, доступны изображения очень высокого качества.\n\nИногда спутниковые снимки сдвинуты относительно данных карты по вине поставщика снимков. Если вы видите множество дорог, не совпадающих со снимком, не начинайте передвигать их под снимок. Вместо этого нужно сдвинуть снимок для совпадения с существующими данными, для этого в меню «Настройки подложки» есть кнопка «Исправить смещение».\n", + "addresses": "# Адреса\n\nАдреса — одна из самых важных составляющих карты.\n\nВ OpenStreetMap адреса хранятся в свойствах зданий и мест, расположенных вдоль улиц.\n\nАдресную информацию можно добавить к контурам зданий или отдельным точкам. Лучший источник адресов — ваши собственные знания или данные, полученные после обхода местности. Как и в случае с другими данными, копирование адресов из коммерческих источников вроде Google Maps строго запрещено.\n", + "inspector": "# Использование редактора свойств\n\nРедактор свойств — это элемент интерфейса программы, находящийся слева окна, который позволяет отредактировать свойства выбранного объекта.\n\n### Выбор типа объекта\n\nПосле того, как вы добавили точку, линию или область, вы можете выбрать, какой именно это тип объекта: шоссе, обычная дорога, супермаркет или кафе.\nРедактор свойств показывает кнопки для выбора наиболее часто используемых типов объектов, и можно воспользоваться строкой поиска, чтобы найти другие типы.\n\nЩёлкните по иконке «i» в нижнем правом углу кнопки типа объекта, чтобы узнать о нём больше. Щёлкните на саму кнопку чтобы выбрать этот тип.\n\n### Использование полей и редактирование тегов\n\nПосле того, как вы выберете тип объекта или выделите объект, у которого тип уже проставлен, редактор свойств покажет поля описывающие его свойства, например название или адрес.\n\nНиже этих полей находятся иконки, с помощью которых можно добавить дополнительные свойства, например ссылку на статью в [Википедии](http://www.wikipedia.org/), информацию о доступности для инвалидов и другие.\n\nВ самом низу окна редактора свойств находится кнопка «Дополнительные теги», позволяющая добавить произвольные теги объекту. На странице [Taginfo](http://taginfo.openstreetmap.org/) можно узнать о наиболее популярных комбинациях тегов.\n\nИзменения в редакторе свойств автоматически применяются к объекту. Как и другие изменения, их можно откатить кнопкой «Отмена».\n", + "buildings": "# Здания\n\nOpenStreetMap — крупнейшая в мире база данных о зданиях. Вы можете добавлять и изменять эти данные.\n\n### Выбор\n\nЗдание можно выбрать, щёлкнув на его контур. При этом здание подсветится выделением, справа откроется страница его свойств, а рядом с ним появится меню действий.\n\n### Редактирование\n\nИногда здания неправильно размещены или имеют неверные теги.\n\nЧтобы передвинуть здание целиком, выберите его, и щелкните на инструменте «Перемещение». Переместите здание с помощью мыши в нужное место и щелкните, чтобы отпустить его.\n\nЧтобы изменить форму здания, перетягивайте точки его контура на нужные места.\n\n### Создание\n\nОдно из основных противоречий в добавлении новых зданий в OpenStreetMap заключается в том, что их можно задавать как областями, так и точками. Стоит взять за правило такой подход: само здание рисуется областью, если это возможно, а находящиеся в этом здании компании, магазины, и другие подобные объекты, привязанные к зданиям, — рисуются точками, находящимися внутри контура здания.\n\nНарисуйте контур здания с помощью кнопки «Область», находящейся слева вверху окна, затем закончите рисование либо нажатием клавиши «Enter» на клавиатуре, либо щёлкнув мышью на первой нарисованной точке здания.\n\n### Удаление\n\nЕсли здание совершенно неправильно нарисовано — его нет на спутниковом снимке, а еще лучше — вы лично на месте убедились что оно отсутствует — вы можете удалить его с карты. Будьте очень осторожны, удаляя объекты — ваши правки затрагивают всех пользователей OSM, а снимки часто бывают устаревшими. Возможно, это здание просто недавно построено.\n\nУдалить здание можно, выделив его щелчком мыши, затем нажав на иконку мусорного ведра или горячей клавишей «Delete».\n", + "relations": "# Отношения\n\nОтношение — это специальный тип объекта в OpenStreetMap, который объединяет другие объекты вместе. Например, два распространенных типа отношений это *отношения маршрутов*, которые объединяют вместе участки дорог, принадлежащих одной автостраде или шоссе, и *мультиполигоны*, которые группируют несколько линий в сложный контур, описывающий область (например, из нескольких островов или с дырами внутри).\n\nОбъекты, объединённые в отношение, называются участниками отношения. \nНа панели сбоку вы можете увидеть, участником каких отношений является выбранный объект, нажмите на отношение в этом списке, чтобы выделить его. Когда отношение выделено, вы можете увидеть всех его участников в списке на боковой панели и подсвеченными на карте.\n\nВ основном, iD заботится о поддержке отношений автоматически, пока вы редактируете. Основной момент, на который стоит обратить внимание — это, если вы удаляете отрезок дороги, чтобы перерисовать его с большей точностью, вам следует убедиться, что новый отрезок будет участником тех же отношений, что и начальный.\n\n## Редактирование отношений\n\nВот некоторые основы, если вы хотите редактировать отношения.\n\nЧтобы добавить объект в отношение, выделите объект, нажмите кнопку «+» в разделе «Все отношения» на боковой панели и выберите или напечатайте название отношения.\n\nЧтобы создать новое отношение, выберите первый объект, который будет участником отношения, нажмите кнопку «+» в разделе «Все отношения» и выберите «Новое отношение...».\n\nЧтобы удалить объект из отношения выберите объект и нажмите на кнопку с мусорной корзиной рядом с отношением, из которого вы хотите его удалить.\n\nВы можете делать мультиполигоны с отверстиями используя инструмент «Объединить». Нарисуйте два контура (внутренний и внешний), зажмите Shift и нажмите на каждый из контуров, чтобы они оба были выделены, затем нажмите кнопку «Объединить» (+).\n" }, "intro": { "navigation": { "title": "Перемещение", - "drag": "Основное окно карты отображает данные OpenStreetMap поверх спутниковой подложки. Карту можно перемещать, перетягивая ее мышкой, как на большинстве веб-картографических сервисов. **Двигайте карту!**", + "drag": "Основное окно карты отображает данные OpenStreetMap поверх спутниковой подложки. Карту можно перемещать, перетягивая её мышкой, как на большинстве веб-картографических сервисов. **Двигайте карту!**", "select": "Данные карты представляются тремя способами: точками, линиями и контурами. Вы можете выбрать любой объект, нажав на него. **Кликните на точку, чтобы выбрать её.**", "header": "Заголовок показывает тип объекта.", - "pane": "Когда объект выбран открываются свойства объекта. Заголовок показывает нам тип объекта, а основная панель показывает атрибуты объекта, например, его имя или адрес. **Закройте свойства объекта нажатием на крестик в правом верхнем углу.**" + "pane": "Когда объект выбран, открываются свойства объекта. Заголовок показывает нам тип объекта, а основная панель показывает атрибуты объекта, например, его имя или адрес. **Закройте свойства объекта нажатием на крестик в правом верхнем углу.**" }, "points": { "title": "Точки", - "add": "Точки используются для того, чтобы отмечать такие объекты, как магазины, рестораны и памятники. Они помечают определенное место и описывают его. **Нажмите на кнопку Точка, чтобы добавить новую точку.**", + "add": "Точки используются для того, чтобы отмечать такие объекты, как магазины, рестораны и памятники. Они помечают определенное место и описывают его. **Нажмите на кнопку «Точка», чтобы добавить новую точку.**", "place": "Точка создаётся путём нажатия на карту. **Отметьте точку в центре здания.**", - "search": "Многие объекты карты могут быть обозначены точками.\nСейчас вы добавили точку кафе. **Найдите 'Кафе' **", - "choose": "**Выберите из списка Кафе.**", + "search": "Многие объекты карты могут быть обозначены точками.\nСейчас вы добавили точку для кафе. **Найдите «{name}»**", + "choose": "**Выберите из списка «Кафе».**", "describe": "Вы пометили точку, как кафе. Используя свойства объекта, вы можете добавить больше информации. **Добавьте название** ", "close": "Свойства объекта можно закрыть нажатием на крестик вверху справа. **Закройте свойства объекта**", "reselect": "Бывает так, что точки уже существуют, но в них содержатся ошибки или недостаточно информации. Мы можем редактировать существующие точки. **Выберите точку, которую вы только что создали.**", @@ -344,22 +360,22 @@ }, "areas": { "title": "Области", - "add": "Области - более детальный способ описать объект карты. Они задают границы объекта. Областями можно нарисовать большинство объектов, обозначаемых точками, и часто это предпочтительный способ.\n **Щелкните кнопку Область для создания новой области.**", - "corner": "Нарисовать область можно задав ее границу точками.\n**Поставьте начальную точку в каком-нибудь углу детской площадки.** ", - "place": "Нарисуйте область, расставляя точки задающие её контур. Завершите контур нажатием на начальную точку. **Нарисуйте контур детской площадки.**", + "add": "Области — более детальный способ описать объект карты. Они задают границы объекта. Областями можно нарисовать большинство объектов, обозначаемых точками, и часто это предпочтительный способ.\n **Щелкните кнопку «Область» для создания новой области.**", + "corner": "Нарисовать область можно, задав её границу точками.\n**Поставьте начальную точку в каком-нибудь углу детской площадки.** ", + "place": "Нарисуйте область, расставляя точки, задающие её контур. Завершите контур нажатием на начальную точку. **Нарисуйте контур детской площадки.**", "search": "**Найдите детскую площадку** ", - "choose": "**Выберите из списка Детскую площадку.**", + "choose": "**Выберите из списка «Детскую площадку».**", "describe": "**Добавьте название и закройте свойства объекта**" }, "lines": { "title": "Линии", - "add": "Линии используются для таких объектов, как автомобильные дороги, железные дороги и реки. **Нажмите на кнопку Линия, чтобы добавить новую линию.**", + "add": "Линии используются для таких объектов, как автомобильные дороги, железные дороги и реки. **Нажмите на кнопку «Линия», чтобы добавить новую линию.**", "start": "**Начните линию нажатием на конец дороги.**", "intersect": "Кликните, чтобы добавить больше точек в линию. Во время рисования можно двигать карту. Дороги и множество других типов линий — часть большей системы. Важно, чтобы эти линии были соединены с другими правильно для нормальной работы приложений, прокладывающих маршруты. **Нажмите на Flower Street, чтобы создать пересечение, соединяющее две линии.**", "finish": "Рисование линий можно завершить, еще раз щелкнув на последней точке. **Закончите рисование дороги.**", - "road": "**Выберите Дорогу из списка**", - "residential": "Существует много различных типов дорог, наиболее распространенной является улица. **Выберите тип дороги Улица**", - "describe": "**Именуйте дорогу и закройте свойства объекта**", + "road": "**Выберите из списка «Дорогу»**", + "residential": "Существует много различных типов дорог, наиболее распространённой является улица. **Выберите тип дороги «Улица»**", + "describe": "**Назовите дорогу и закройте свойства объекта**", "restart": "Дорога должна пересекать Flower Street.", "wrong_preset": "Вы не выбрали тип дороги. **Нажмите здесь чтобы выбрать заново**" }, @@ -386,9 +402,6 @@ }, "category-route": { "name": "Маршрут" - }, - "category-water": { - "name": "Вода" } }, "fields": { @@ -429,6 +442,9 @@ } } }, + "access_toilets": { + "label": "Доступ" + }, "address": { "label": "Адрес", "placeholders": { @@ -705,6 +721,9 @@ "surface": { "label": "Покрытие" }, + "toilets/disposal": { + "label": "Тип" + }, "tourism": { "label": "Тип" }, @@ -761,29 +780,36 @@ "terms": "Перрон" }, "aeroway/gate": { - "name": "Выход на посадку" + "name": "Выход на посадку", + "terms": "Выход на посадку" }, "aeroway/hangar": { - "name": "Ангар" + "name": "Ангар", + "terms": "Ангар" }, "aeroway/helipad": { - "name": "Вертолётная площадка" + "name": "Вертолётная площадка", + "terms": "Вертолётная площадка" }, "aeroway/runway": { - "name": "Взлетная полоса" + "name": "Взлетная полоса", + "terms": "ВПП, Взлётно-посадочная полоса" }, "aeroway/taxiway": { - "name": "Рулёжная дорожка" + "name": "Рулёжная дорожка", + "terms": "РД, Рулёжная дорожка" }, "aeroway/terminal": { "name": "Терминал аэропорта", "terms": "Терминал аэропорта" }, "amenity": { - "name": "Инфраструктура" + "name": "Инфраструктура", + "terms": "Инфраструктура" }, "amenity/arts_centre": { - "name": "Центр Искусств" + "name": "Центр Искусств", + "terms": "Художественный центр, Арт-центр, Центр искусств" }, "amenity/atm": { "name": "Банкомат", @@ -830,7 +856,8 @@ "terms": "автомойка, мойка машин, мойка автомобилей" }, "amenity/childcare": { - "name": "Уход за детьми" + "name": "Уход за детьми", + "terms": "Уход за детьми" }, "amenity/cinema": { "name": "Кинотеатр", @@ -841,10 +868,12 @@ "terms": "ПТУ, колледж, техникум" }, "amenity/courthouse": { - "name": "Суд" + "name": "Суд", + "terms": "Суд" }, "amenity/drinking_water": { - "name": "Питьевая вода" + "name": "Питьевая вода", + "terms": "Питьевая вода" }, "amenity/embassy": { "name": "Посольство", @@ -855,45 +884,48 @@ "terms": "фастфуд, фаст-фуд, быстрое питание, ресторан быстрого питания" }, "amenity/fire_station": { - "name": "Пожарная часть" + "name": "Пожарная часть", + "terms": "Пожарное депо, Пожарная станция, Пожарная часть" }, "amenity/fountain": { "name": "Фонтан", "terms": "Фонтан" }, "amenity/fuel": { - "name": "АЗС" + "name": "АЗС", + "terms": "АЗС, заправка, автозаправка" }, "amenity/grave_yard": { "name": "Кладбище", "terms": "кладбище" }, "amenity/hospital": { - "name": "Больница" + "name": "Больница", + "terms": "Больница, Госпиталь, Стационар" }, "amenity/kindergarten": { - "name": "Детский сад" + "name": "Детский сад", + "terms": "детский сад, детский садик, садик" }, "amenity/library": { "name": "Библиотека", "terms": "библиотека" }, "amenity/marketplace": { - "name": "Рынок" - }, - "amenity/parking": { - "name": "Стоянка", - "terms": "парковка, паркинг, стоянка" + "name": "Рынок", + "terms": "Рынок" }, "amenity/pharmacy": { "name": "Аптека", "terms": "Аптека" }, "amenity/place_of_worship": { - "name": "Храм" + "name": "Храм", + "terms": "церковь, храм, мечеть, синагога" }, "amenity/place_of_worship/buddhist": { - "name": "Буддийский храм" + "name": "Буддийский храм", + "terms": "буддийский храм" }, "amenity/place_of_worship/christian": { "name": "Церковь", @@ -912,17 +944,20 @@ "terms": "полиция, милиция" }, "amenity/post_box": { - "name": "Почтовый ящик" + "name": "Почтовый ящик", + "terms": "Почтовый ящик" }, "amenity/post_office": { - "name": "Почта" + "name": "Почта", + "terms": "почта, почтовое отделение" }, "amenity/pub": { "name": "Паб", "terms": "Паб" }, "amenity/restaurant": { - "name": "Ресторан" + "name": "Ресторан", + "terms": "Ресторан, Столовая" }, "amenity/school": { "name": "Школа", @@ -933,34 +968,40 @@ "terms": "плавательный бассейн, плавательный бассеин" }, "amenity/taxi": { - "name": "Стоянка такси" + "name": "Стоянка такси", + "terms": "Стоянка такси" }, "amenity/telephone": { - "name": "Телефон" + "name": "Телефон", + "terms": "Телефон" }, "amenity/theatre": { - "name": "Театр" + "name": "Театр", + "terms": "Театр" }, "amenity/toilets": { "name": "Туалет", "terms": "туалет" }, "amenity/townhall": { - "name": "Муниципалитет" + "name": "Муниципалитет", + "terms": "Муниципалитет" }, "amenity/university": { "name": "Университет", "terms": "университет, институт, вуз" }, "amenity/vending_machine": { - "name": "Торговый Автомат" + "name": "Торговый Автомат", + "terms": "Торговый автомат, автомат, торгомат" }, "amenity/waste_basket": { "name": "Мусорная корзина", "terms": "мусорная корзина, урна" }, "area": { - "name": "Область" + "name": "Область", + "terms": "Область" }, "barrier": { "name": "Преграда" @@ -975,7 +1016,8 @@ "name": "Сетка для животных" }, "barrier/city_wall": { - "name": "Городская стена" + "name": "Городская стена", + "terms": "Городская стена" }, "barrier/cycle_barrier": { "name": "Барьер для велосипедистов" @@ -987,13 +1029,16 @@ "name": "Проход" }, "barrier/fence": { - "name": "Забор" + "name": "Забор", + "terms": "Забор, Ограда, Изгородь" }, "barrier/gate": { - "name": "Ворота" + "name": "Ворота", + "terms": "ворота" }, "barrier/hedge": { - "name": "Живая изгородь" + "name": "Живая изгородь", + "terms": "Живая изгородь, Зелёное ограждение" }, "barrier/kissing_gate": { "name": "Преграда для животных" @@ -1011,37 +1056,48 @@ "name": "Пункт оплаты проезда" }, "barrier/wall": { - "name": "Стена" + "name": "Стена", + "terms": "Стена, Стенка" }, "boundary/administrative": { - "name": "Административная граница" + "name": "Административная граница", + "terms": "Административная граница" }, "building": { - "name": "Здание" + "name": "Здание", + "terms": "здание, сооружение" }, "building/apartments": { - "name": "Многоквартирный дом" + "name": "Многоквартирный дом", + "terms": "многоэтажка, высотка" }, "building/commercial": { - "name": "Деловое здание,Коммерческое здание,Коммерческая недвижимость,Деловая недвижимость" + "name": "Деловое здание", + "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость" }, "building/entrance": { - "name": "Вход" + "name": "Вход", + "terms": "вход, дверь, главный вход" }, "building/garage": { - "name": "Гараж" + "name": "Гараж", + "terms": "гараж, ракушка" }, "building/house": { - "name": "Дом" + "name": "Дом", + "terms": "дом, частный дом, изба, хата" }, "building/hut": { - "name": "Хижина" + "name": "Хижина", + "terms": "шалаш, землянка, сарай, барак, халупа" }, "building/industrial": { - "name": "Промышленное здание,Производственное здание,Индустриальное здание" + "name": "Промышленное здание", + "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех" }, "building/residential": { - "name": "Жилой Дом" + "name": "Жилой Дом", + "terms": "Жилой дом, Жилое здание" }, "emergency/ambulance_station": { "name": "Станция Скорой Помощи", @@ -1052,7 +1108,8 @@ "terms": "Пожарный Гидрант, Пожарная Колонка" }, "emergency/phone": { - "name": "Экстренный телефон" + "name": "Экстренный телефон", + "terms": "аварийный телефон, телефон спасения, 112, 911, 01, 02, 03, 04" }, "entrance": { "name": "Вход" @@ -1064,7 +1121,8 @@ "name": "Конная тропа" }, "highway/bus_stop": { - "name": "Автобусная остановка" + "name": "Автобусная остановка", + "terms": "остановка, остановка общественного транспорта, автобусная остановка" }, "highway/crossing": { "name": "Пешеходный переход" @@ -1097,7 +1155,8 @@ "name": "Пешеходная дорога" }, "highway/primary": { - "name": "Дорога регионального значения" + "name": "Дорога регионального значения", + "terms": "первичная, региональная" }, "highway/primary_link": { "name": "Съезд с дороги регионального значения" @@ -1288,7 +1347,8 @@ "name": "Волейбольная площадка" }, "leisure/playground": { - "name": "Детская площадка" + "name": "Детская площадка", + "terms": "детская площадка, игровая площадка" }, "leisure/slipway": { "name": "Стапель" @@ -1298,7 +1358,8 @@ "terms": "Спортивный Центр" }, "leisure/stadium": { - "name": "Стадион" + "name": "Стадион", + "terms": "Стадион, спортивная арена" }, "leisure/swimming_pool": { "name": "Бассейн" @@ -1322,6 +1383,10 @@ "man_made/lighthouse": { "name": "Маяк" }, + "man_made/observation": { + "name": "Смотровая башня", + "terms": "Смотровая башня, Обзорная башня" + }, "man_made/pier": { "name": "Пирс" }, @@ -1339,7 +1404,8 @@ "terms": "станция водоочистки, станция очистки воды, очистные сооружения, водоочистные сооружения" }, "man_made/water_tower": { - "name": "Водонапорная башня" + "name": "Водонапорная башня", + "terms": "водонапорная башня, водонапорная вышка" }, "man_made/water_well": { "name": "Колодец" @@ -1376,6 +1442,9 @@ "natural/peak": { "name": "Вершина" }, + "natural/scree": { + "name": "Осыпь" + }, "natural/scrub": { "name": "Кустарник" }, @@ -1406,6 +1475,50 @@ "office": { "name": "Офисы" }, + "office/accountant": { + "name": "Бухгалтерская контора", + "terms": "Бухгалтерская фирма, Бухгалтерский учёт, Аудит" + }, + "office/architect": { + "name": "Архитектурная мастерская", + "terms": "Архитектурная студия, Дизайнерское бюро, Архитектор" + }, + "office/company": { + "name": "Частная фирма", + "terms": "Частная компания, Фирма, Организация" + }, + "office/employment_agency": { + "name": "Кадровое агентство", + "terms": "Центр занятости, Биржа труда, Агентство по трудоустройству" + }, + "office/estate_agent": { + "name": "Агентство недвижимости", + "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания," + }, + "office/insurance": { + "name": "Страховая компания", + "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка," + }, + "office/lawyer": { + "name": "Юридические услуги", + "terms": "Адвокат, Нотариус, Адвокатская контора, Нотариальная контора, Юридическая консультация" + }, + "office/newspaper": { + "name": "Редакция газеты", + "terms": "Редакция журнала, Газета, Журнал, Периодическое издание, Редакция периодического издания" + }, + "office/ngo": { + "name": "Общественная организация", + "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение," + }, + "office/research": { + "name": "НИИ", + "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки" + }, + "office/travel_agent": { + "name": "Турагентство", + "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма" + }, "place": { "name": "Населённый пункт" }, @@ -1465,6 +1578,9 @@ "railway/disused": { "name": "Заброшенная железная дорога" }, + "railway/halt": { + "terms": "Железнодорожная станция, ЖД станция" + }, "railway/level_crossing": { "name": "Переезд" }, @@ -1481,7 +1597,8 @@ "name": "Железнодорожная станция" }, "railway/subway": { - "name": "Метро" + "name": "Метро", + "terms": "Метро, Подземка, " }, "railway/subway_entrance": { "name": "Вход в метро" @@ -1520,7 +1637,8 @@ "name": "Бутик" }, "shop/butcher": { - "name": "Мясной" + "name": "Мясной", + "terms": "мясной, мясная лавка, мясник" }, "shop/car": { "name": "Автодилер" @@ -1624,6 +1742,10 @@ "shop/pet": { "name": "Зоомагазин" }, + "shop/photo": { + "name": "Магазин Фототоваров", + "terms": "Фототовары, Фототехника" + }, "shop/shoes": { "name": "Обувной" }, diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json index 554ef5996..cfcccb303 100644 --- a/vendor/assets/iD/iD/locales/sk.json +++ b/vendor/assets/iD/iD/locales/sk.json @@ -83,7 +83,8 @@ "annotation": { "line": "Usporiadanie rohov čiary do pravého uhla.", "area": "Usporiadanie rohov plochy do pravého uhla." - } + }, + "not_squarish": "Tento objekt nemožno usporiadaÅ¥ do pravého uhla, pretože nie je Å¡tvorcový." }, "straighten": { "title": "Vyrovnaj", @@ -246,15 +247,18 @@ "back_tooltip": "Zmeň typ objektu", "remove": "Odstráň", "search": "Hľadaj", + "multiselect": "Vybrané položky", "unknown": "Neznámy", "incomplete": "", "feature_list": "Hľadaj objekty", - "edit": "Uprav objekt" + "edit": "Uprav objekt", + "none": "Žiadne" }, "background": { "title": "Pozadie", "description": "Nastavenia pozadia", "percent_brightness": "{opacity}% jas", + "none": "Žiadne", "custom": "Voliteľné", "custom_prompt": "Zadajte vzor pre mapový podklad. Platné znaky sú {z}, {x}, {y} pre Z/X/Y schému a {u} pre quadtile schému.", "fix_misalignment": "Oprav zarovnanie", @@ -317,7 +321,9 @@ "cannot_zoom": "V tomto móde nemožno viac oddialiÅ¥.", "gpx": { "local_layer": "Lokálny GPX súbor", - "drag_drop": "Pretiahnite a pustite .gpx súbor na stránku" + "drag_drop": "Pretiahnite a pustite .gpx súbor na stránku, alebo ckliknite na tlačítko napravo pre výber", + "zoom": "Priblíž na GPX stopu", + "browse": "Vyber .gpx súbor" }, "help": { "title": "Pomoc", @@ -325,9 +331,9 @@ "editing_saving": "# Upravovanie a ukladanie\n\nTento editor je primárne navrhnutý na prácu online, a aj práve teraz ho používate cez internetovú stránku.\n\n### Výber objektov\n\nPre výber objektu, ako napríklad cesta alebo bod záujmu, naň kliknite na mape. Týmto sa vybraný objekt zvýrazní, otvorí sa panel s jeho detajlami a zobrazí sa ponuka s úkonmi, ktoré môžete s objektom urobiÅ¥.\n\nViacero objektov je možné vybraÅ¥ podržaním klávesu \"Shift\". Potom jednoducho kliknite na objekty, ktoré chcete vybraÅ¥, alebo pretiahnite po mape akoby ste chceli nakresliÅ¥ obdĺžnik. Týmto sa zobrazí rám a vyberú sa vÅ¡etky objekty, ktoré sa v ňom nachádzajú.\n\n### Ukladanie úprav\n\nKed urobíte zmeny ako úpravy ciest, budov a miest, tieto budú lokálne uložené, až pokiaľ ich neuložíte na server. Netrápte sa ak urobíte chybu. Zmeny môžete vrátit späť kliknutím na tlačítko vrátiÅ¥ a zopakovaÅ¥ kliknutím na tlačitko zopakovaÅ¥.\n\nKeď chcete ukončit sériu úprav, kliknite na \"UložiÅ¥\". Napríklad ak ste dokončili časÅ¥ mesta a chcete začaÅ¥ s inou časÅ¥ou. Budete maÅ¥ možnosÅ¥ si prehliadnuÅ¥, čo ste urobili a editor poskytne užitočné návrhy a varovania ak niečo nie je so zmenami vporiadku.\n\nAk vÅ¡etko vyzerá vporiadku, môžete vyplniÅ¥ krátky komentár vysvetľujúci, čo ste urobili a kliknite znovu na \"UložiÅ¥\" pre odoslanie zmien na [OpenStreetMap.org](http://www.openstreetmap.org/), kde budú viditeľné pre ostatných používateľov a tak dostupné pre ďalÅ¡ie vylepÅ¡enia.\n\nAk nemôžete dokončiÅ¥ úpravy počas jedného sedenia, môžete zatvoriÅ¥ okno prehliadača, vrátiÅ¥ sa späť (na rovnakom prehliadači a počítači) a editor vám ponúkne obnoviÅ¥ vaÅ¡u prácu.\n", "roads": "# Cesty\n\nS týmto editorom môžete cesty vytvoriÅ¥, opraviÅ¥ alebo vymazaÅ¥. Cesty môžu byÅ¥ rôzneho druhu: chodníky, diaľnice, lesné cestičky, cyklochodníky a iné. Akýkoľvek často prechádzaný úsek by malo byÅ¥ možné zmapovaÅ¥.\n\n### Výber\n\nKliknite na cestu pre jej výber. Viditeľným by sa mal staÅ¥ jej obrys spolu s malou ponukou nástrojov na mape a postranným panelom, ukazujúcim dodatočné informácie o ceste.\n\n### Úprava\n\nČasto krát uvidíte cesty, ktoré nie sú zarovnané so snímkami pod nimi alebo s GPS stopu. Tieto cesty môžete upraviÅ¥ tak, aby boli na správnom mieste.\n\nNajskôr kliknite na cestu, ktorú chcete zmeniÅ¥. Týmto sa zvýrazní a po jej dĺžke sa ukážu kontrolné body, ktoré môžete pretiahnuÅ¥ na lepÅ¡iu pozíciu. Ak chcete pridaÅ¥ nový kontrolný bod pre viac detailov, dva krát kliknite na časÅ¥ cesty bez uzla a jeden bude pridaný.\n\nAk sa cesta spája s inou cestou, ale nie je správne spojená na mape, môžete pretiahnuÅ¥ jeden z jej kontrolných bodov na druhú cestu, aby ste ich spojili. Spojenie ciest je dôležité pre mapu a nevyhnutné pre poskytovanie navigácie na cestách.\n\nMôžete tiež kliknúť na nástroj \"Presuň\" alebo stlačiÅ¥ kláves \"M\" pre posunutie celej cesty naraz a potom kliknite znovu, aby ste uložili presun.\n\n### Vymazávanie\n\nAk je cesta úplne nesprávna - vidíte, že cesta neexistuje na satelitných snímkoch a najlepÅ¡ie mate potvrdené zo samotného miesta, že tam cesta nie je - môžete ju vymazaÅ¥, čím ju odstránite z mapy. Pri vymazávaní objektov buďte obozretný, rovnako ako pri iných úpravách sú výsledky viditeľné ostatnými a satelitné snímky sú často neaktuálne, takže cesta môže byÅ¥ jednoducho novopostavená.\n\nCestu môžete vymazaÅ¥, tak že na ňu kliknete čim ju vyberiete a potom kliknete na ikonu smetného koÅ¡a alebo stlačením klávesu \"Delete\".\n\n### Vytváranie\n\nZistili ste, že niekde by mala byÅ¥ cesta ale ona tam nie je? Kliknite naľavo hore na ikonu \"Čiara\" alebo stlačte kláves \"2\" pre kreslenie čiary.\n\nAby ste začali kresliÅ¥, kliknite na začiatok cesty na mape. Ak cesta odbočuje z inej existujúcej cesty, začnite kliknútím na miesto, kde sa spájajú.\n\nPotom kliknite na body pozdĺž cesty tak, aby nasledovali správny smer podľa satelitných snímkov alebo GPS. Ak cesta, ktorú kreslíte, pretína ďalÅ¡iu cestu, spojte ich kliknutím v mieste križovatky. Keď ste hotový s skreslením, dva krát kliknite alebo stlačte kláves \"Enter\" na vaÅ¡ej klávesnici.\n", "gps": "# GPS\nGPS údaje sú najviac dôveryhodný zdroj dát pre OpenStreetMap. Tento editor podporuje stopy z lokálnych \".gpx\" súborov na vaÅ¡om počítači. Tento typ GPS stôp môžete zachytiÅ¥ pomocou rôznych aplikácií pre múdre telefóny ako aj GPS prístrojmi.\n\nPre informácie, ako robiÅ¥ GPS prieskum, si prečítajte [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nAby ste použili GPX trasu pre mapovanie, pretiahnite a pustite GPX súbor na mapový editor. Po rozpoznaní, bude pridaný na mapu ako jasná zelená čiara. Kliknite na ponuku \"Nastavenia pozadia\" na ľavej strane pre zapnutie, vypnutie alebo priblíženie na túto novú GPX vrstvu.\n\nGPX trasa nie je priamo nahraná na OpenStreetMap. Najlepší spôsob ako ju využiÅ¥ je, použiÅ¥ ju ako predlohu pre zakreslovanie nových objektov a potom ju [nahraÅ¥ na OpenStreetMap](http://www.openstreetmap.org/trace/create) pre ďalších uživateľov.\n \n", - "imagery": "# Snímky povrchu\n\nLetecké snímky sú dôležitým zdrojom pre mapovanie. Kombinácia leteckých fotografií, satelitných snímok a voľne skompilovaných zdrojov je v editore dostupná vľavo pod ponukou \"Nastavenia pozadia\".\n\nÅ tandardne je v editore predvolená satelitná vrstva z [Bing Maps](http://www.bing.com/maps/), ale ako posuniete a priblížite mapu na nové geografické miesta, dostupnými sa stanú nové zdroje. Niektoré krajiny ako Spojené Å táty, Francúzsko, a Dánsko majú pre niektoré oblasti dostupné veľmi kvalitné snímky.\n\nSnímky môžu byÅ¥ niekedy posunuté voči mapovým dátam, kvôli chybe na strane poskytovateľa snímkov. Ak uvidíte veľa ciest posunutých voči pozadiu, neposúvajte ich hneď vÅ¡etky, aby ste ich zarovnali s pozadím. Namiesto toho môžete upraviÅ¥ snímky, aby odpovedali existujúcim dátam tým, že kliknete na \"Oprav zarovnanie\" naspodku Nastavenia pozadia.\n", + "imagery": "# Snímky povrchu\n\nLetecké snímky sú dôležitým zdrojom pre mapovanie. Kombinácia leteckých fotografií, satelitných snímok a voľne skompilovaných zdrojov je v editore dostupná vpravo pod ponukou \"Nastavenia pozadia\".\n\nÅ tandardne je v editore predvolená satelitná vrstva z [Bing Maps](http://www.bing.com/maps/), ale ako posuniete a priblížite mapu na nové geografické miesta, dostupnými sa stanú nové zdroje. Niektoré krajiny ako Spojené Å táty, Francúzsko, a Dánsko majú pre niektoré oblasti dostupné veľmi kvalitné snímky.\n\nSnímky môžu byÅ¥ niekedy posunuté voči mapovým dátam, kvôli chybe na strane poskytovateľa snímkov. Ak uvidíte veľa ciest posunutých voči pozadiu, neposúvajte ich hneď vÅ¡etky, aby ste ich zarovnali s pozadím. Namiesto toho môžete upraviÅ¥ snímky, aby odpovedali existujúcim dátam tým, že kliknete na \"Oprav zarovnanie\" naspodku Nastavenia pozadia.\n", "addresses": "# Adresy\n\nAdresy sú jedny z najužitočnejších informácií na mape.\n\nHoci sú adresy často znázorňované ako časti ulíc, v OpenStreetMap sú zaznamenávané ako atribúty budov a miest pozdĺž ulíc.\n\nInformáciu o adrese môžete pridaÅ¥ ku miestam znázornených ako obrysy budov, ale aj ku tým, ktoré boli zmapované ako jediný bod. Najvhodnejším zdrojom adresných údajov je miestny prieskum alebo znalosÅ¥ lokality. Tak ako pri iných objektoch, kopírovanie z komerčných zdrojov ako Google Mapy je prísne zakázané.\n", - "inspector": "# Používanie InÅ¡pektora\n\nInÅ¡pektor je používateľské rozhranie na pravej strane stránky, ktoré sa objaví po vybraní objektu a umožní vám upravovaÅ¥ detaily.\n\n### Voľba typu objektu\n\nPo tom ako pridáte bod, čiaru alebo plochu, môžete vybraÅ¥ aký je to typ objektu. Napríklad či je to diaľnica alebo obytná ulica, či supermarket alebo kaviareň. InÅ¡pektor zobrazí tlačítka pre bežné typy objektov a nájsÅ¥ ďalÅ¡ie môžete zadaním toho, čo hľadáte do vyhľadávacieho políčka.\n\nKliknite na \"i\" v pravom dolnom rohu tlačítka pre výber typu objektu, ak sa chcete o ňom dozvedieÅ¥ viac. Kliknite na tlačítko a vyberte typ objektu.\n\n### Používanie formulárov a upravovanie označenia\n\nPo tom ako zvolíte typ objektu, alebo keď vyberiete objekt, ktorý už má pridelený typ, inÅ¡pektor zobrazí polia s detailmi o objekte ako jeho meno a adresa.\n\nPod poliami sú ikony, na ktoré môžete kliknúť a pridaÅ¥ ďalÅ¡ie detaily ako informácie z [Wikipédie](http://www.wikipedia.org/), prístup pre vozičkárov a ďalÅ¡ie.\n\nNaspodku inÅ¡pektora kliknite na \"Dodatočné označenia\" pre pridanie ľubovoľných označení pre daný element. [Taginfo](http://taginfo.openstreetmap.org/) je výborný zdroj pre zistenie populárnych kombinácií označení.\n\nZmeny, ktoré spravíte v inÅ¡pektorovi, sú automaticky aplikované na mapu. VrátiÅ¥ späť ich môžete kedykoľvek kliknutím na tlačítko \"VrátiÅ¥\".\n\n### Zatvorenie inÅ¡pektora\n\nInÅ¡pektora môžete zatvoriÅ¥ kliknutím na tlačitko pre zatvorenie vpravo hore, stlačením klávesu \"Escape\" alebo kliknutím na mapu.\n", + "inspector": "# Používanie InÅ¡pektora\n\nInÅ¡pektor je používateľské rozhranie na ľavej strane stránky, ktoré sa objaví po vybraní objektu a umožní vám upravovaÅ¥ detaily.\n\n### Voľba typu objektu\n\nPo tom ako pridáte bod, čiaru alebo plochu, môžete vybraÅ¥ aký je to typ objektu. Napríklad či je to diaľnica alebo obytná ulica, či supermarket alebo kaviareň. InÅ¡pektor zobrazí tlačítka pre bežné typy objektov a nájsÅ¥ ďalÅ¡ie môžete zadaním toho, čo hľadáte do vyhľadávacieho políčka.\n\nKliknite na \"i\" v pravom dolnom rohu tlačítka pre výber typu objektu, ak sa chcete o ňom dozvedieÅ¥ viac. Kliknite na tlačítko a vyberte typ objektu.\n\n### Používanie formulárov a upravovanie označenia\n\nPo tom ako zvolíte typ objektu, alebo keď vyberiete objekt, ktorý už má pridelený typ, inÅ¡pektor zobrazí polia s detailmi o objekte ako jeho meno a adresa.\n\nPod poliami sú ikony, na ktoré môžete kliknúť a pridaÅ¥ ďalÅ¡ie detaily ako informácie z [Wikipédie](http://www.wikipedia.org/), prístup pre vozičkárov a ďalÅ¡ie.\n\nNaspodku inÅ¡pektora kliknite na \"Dodatočné označenia\" pre pridanie ľubovoľných označení pre daný element. [Taginfo](http://taginfo.openstreetmap.org/) je výborný zdroj pre zistenie populárnych kombinácií označení.\n\nZmeny, ktoré spravíte v inÅ¡pektorovi, sú automaticky aplikované na mapu. VrátiÅ¥ späť ich môžete kedykoľvek kliknutím na tlačítko \"VrátiÅ¥\".\n", "buildings": "# Budovy\n\nOpenStreetMap je najväčšia databáza budov na svete. Práve vy ju môžete tvoriÅ¥ a vylepÅ¡ovaÅ¥.\n\n### Výber\n\nBudovu môžete vybraÅ¥ kliknutím na jej hranicu. Týmto sa budova zvýrazní a otvorí sa malá ponuka nástrojov a postranný panel, ukazujúcim dodatočné informácie o budove.\n\n### Úprava\n\nNiekedy môžu byÅ¥ budovy chybne umiestnené alebo maÅ¥ nesprávne označenia.\n\nPre presun celej budovy ju vyberte, a potom kliknite na nástroj \"Presunúť\". Posuňte vaÅ¡u myÅ¡, aby ste posunuli budovu a kliknite, keď je umiestnená správne.\n\nPre opravu tvaru budovy, kliknite a Å¥ahajte za uzly, ktoré tvoria jej ohraničenie, na lepÅ¡ie miesto.\n\n### Vytváranie\n\nJeden z hlavných problémov okolo pridávania budov je, že OpenStreetMap zaznamenáva budovy ako útvary aj ako body. Nepísaným pravidlom je mapovaÅ¥ budovy vo forme útvaru vždy, keď je to možné a mapovaÅ¥ firmy, domovy, služby občianskej vybavenosti a ďalÅ¡ie subjekty, ktoré v budove pôsobia ako body umiestnené vo vnútri útvaru budovy.\n\nZačnite kresliÅ¥ budovu ako útvar, klinutím na tlačítko \"Plocha\" vľavo hore a ukončite ju buď stlačením \"Enter\" na vaÅ¡ej klávesnici alebo kliknutím na prvý uzol, ktorý ste zakreslili, čím uzavriete útvar.\n\n### Vymazávanie\n\nAk je budova úplne nesprávna - vidíte, že neexistuje na satelitných snímkoch a najlepÅ¡ie mate potvrdené zo samotného miesta, že tam nie je - môžete ju vymazaÅ¥, čím ju odstránite z mapy. Pri vymazávaní objektov buďte obozretný. Rovnako ako pri iných úpravách sú výsledky viditeľné ostatnými a satelitné snímky sú často neaktuálne, takže budova môže byÅ¥ jednoducho novopostavená.\n\nBudovu môžete vymazaÅ¥ tak, že na ňu kliknete, čím ju vyberiete, a potom kliknete na ikonu koÅ¡a alebo stlačením klávesu \"Delete\".\n", "relations": "# Relácie\n\nRelácia je zvláštny typ objektu v OpenStreetMap, ktorý zoskupuje dokopy iné objekty. Dva najčastejÅ¡ie typy relácií sú *trasy*, ktoré zoskupujú časti cesty patriace určitému cestnému Å¥ahu a *multipolygóny*, ktoré zoskupujú čiary vytvárajúce zložité plochy (pozostávajúce z niekoľko častí alebo otvorov uprostred).\n\nObjekty v relácií sa nazývajú *členy*. V postrannom panely môžete vidieÅ¥ v akých reláciach sa objekt nachádza a kliknutím na reláciu ju označiÅ¥. Keď je relácia označená, môžete vidieÅ¥ vÅ¡etky jej členy na postrannom panely a zvýraznené na mape.\n\nVo väčšine prípadov sa iD postará o udržovanie relácií počas vášho upravovania automaticky. Dôležitá vec, na ktorú by ste si mali dávaÅ¥ pozor je, ak vymažete časÅ¥ cesty, aby ste ju presnejÅ¡ie nakreslili, že táto časÅ¥ bude členom rovnakých relácií ako časÅ¥ pôvodná.\n\n ## Úprava relácií\n\nAk chcete upravovaÅ¥ relácie, tu sú základy.\n\nPre pridanie objektu do relácie, vyberte objekt a kliknite na tlačítko \"+\" v časti postranného panelu s názvom \"VÅ¡etky relácie\" a vyberte alebo napíšte meno relácie.\n\nPre vytvorenie novej relácie, vyberte prvý objekt, ktorý by mal byÅ¥ jej členom a kliknite na tlačítko \"+\" v časti s názvom \"VÅ¡etky relácie\" a vyberte \"Nová relácia...\".\n\nPre odstránenie objektu z relácie, vyberte objekt a kliknite na tlačitko smetného koÅ¡a, vedľa relácie, z ktorej ho chcete odobraÅ¥.\n\n Pomocou nástroja \"Zlúč\" môžete vytvoriÅ¥ multipolygón s dierami. Nakreslite dve plochy (vonkajÅ¡iu a vnútornú), stlačte klávesu Shift a kliknite na každú z nich, aby ste ich vybrali a potom kliknite na tlačítko \"Zlúč\" (+).\n" }, @@ -382,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Budova" + }, "category-landuse": { "name": "Využitie krajiny" }, @@ -397,8 +406,11 @@ "category-route": { "name": "Trasa" }, - "category-water": { - "name": "Vodná plocha" + "category-water-area": { + "name": "Voda" + }, + "category-water-line": { + "name": "Voda" } }, "fields": { @@ -696,6 +708,9 @@ "shelter": { "label": "PrístreÅ¡ok" }, + "shelter_type": { + "label": "Typ" + }, "shop": { "label": "Typ" }, @@ -736,6 +751,9 @@ "trail_visibility": { "label": "ViditeľnosÅ¥ trasy" }, + "tree_type": { + "label": "Typ" + }, "vending": { "label": "Typ tovaru" }, @@ -917,7 +935,7 @@ }, "amenity/parking": { "name": "Parkovisko", - "terms": "garáže,garaze,parkovanie,odstavná plocha,odstavna plocha" + "terms": "parkovisko,parkovanie,garaz,garáž" }, "amenity/pharmacy": { "name": "Lekáreň", @@ -971,6 +989,10 @@ "name": "Å kola", "terms": "akadémia,alma mater,vysoká Å¡kola,oddelenie,fakulta,katedra,prednáška,prednášková sála,skola,prednaska,vysoka skola,akademia" }, + "amenity/shelter": { + "name": "PrístreÅ¡ok", + "terms": "pristresok,útulňa,utulna" + }, "amenity/swimming_pool": { "name": "Plaváreň", "terms": "Plavaren,kúpalisko,kupalisko" @@ -1135,6 +1157,14 @@ "name": "Vstup", "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata" }, + "footway/crossing": { + "name": "Prechod", + "terms": "Prechod pre chodcov,zebra" + }, + "footway/sidewalk": { + "name": "Chodník", + "terms": "chodnik" + }, "highway": { "name": "Cesta", "terms": "dialnica,diľnica,ulica,komunikácia,komunikacia" @@ -1383,6 +1413,10 @@ "name": "Oddych", "terms": "relax,volny cas,voľný čas" }, + "leisure/common": { + "name": "Verejné priestranstvo", + "terms": "verejne priestranstvo" + }, "leisure/dog_park": { "name": "Psí park", "terms": "psi park,park pre psy" @@ -1479,6 +1513,10 @@ "name": "Maják", "terms": "majak,výstraha,vystraha" }, + "man_made/observation": { + "name": "Výhliadková veža", + "terms": "vyhliadkova veza,veza,veža,výhliadka,vyhliadka" + }, "man_made/pier": { "name": "Mólo", "terms": "molo,stĺpy,stlpy,kotva,kotvenie,ukotvenie,lode,promenáda,promenada,lávka,lavka" @@ -1595,6 +1633,86 @@ "name": "Úrad", "terms": "urad" }, + "office/accountant": { + "name": "Účtovník", + "terms": "uctovnik" + }, + "office/administrative": { + "name": "Administratívny úrad", + "terms": "administrativny urad" + }, + "office/architect": { + "name": "Architekt", + "terms": "Architekti" + }, + "office/company": { + "name": "Firma", + "terms": "firmy,spoločnosÅ¥,spolocnost" + }, + "office/educational_institution": { + "name": "Vzdelávací inÅ¡titút", + "terms": "vzdelavaci institut,univerzita,skola,vzdelavanie,Å¡kola,vzdelávanie" + }, + "office/employment_agency": { + "name": "Zamestnávateľská agentúra", + "terms": "zamestnavatelska agentura" + }, + "office/estate_agent": { + "name": "Realitná agentúra", + "terms": "realitna agentura,realitka" + }, + "office/financial": { + "name": "Finančný úrad", + "terms": "financny urad" + }, + "office/government": { + "name": "Vládny úrad", + "terms": "vladny urad" + }, + "office/insurance": { + "name": "Poistenie", + "terms": "poistenie" + }, + "office/it": { + "name": "IT služby", + "terms": "IT, it sluzby,pocitace,počítače" + }, + "office/lawyer": { + "name": "Právna kancelária", + "terms": "pravna kancelaria" + }, + "office/newspaper": { + "name": "Noviny", + "terms": "noviny" + }, + "office/ngo": { + "name": "Nezisková organizácia", + "terms": "neziskova organizacia,neziskovka" + }, + "office/physician": { + "name": "Doktor", + "terms": "doktor" + }, + "office/political_party": { + "name": "Politická strana", + "terms": "politicka strana" + }, + "office/research": { + "name": "Výskum", + "terms": "vyskum" + }, + "office/telecommunication": { + "name": "Telekomunikácie", + "terms": "telekomunikacie,mobilny operator,mobilný operátor,operator,operátor" + }, + "office/therapist": { + "name": "Terapeut", + "terms": "terapeut" + }, + "office/travel_agent": { + "name": "Cestovná agentúra", + "terms": "cestova agentura,cestovka,dovolenka,cestovanie" + }, "place": { "name": "Obec", "terms": "dedina,mesto,sýdlo,sydlo" @@ -1643,6 +1761,10 @@ "name": "Elektrické vedenie", "terms": "elektricke vedenie,vedenie,kable,káble" }, + "power/minor_line": { + "name": "VedľajÅ¡ie elektrické vedenie", + "terms": "vedlajsie elektricke vedenie,rozvod, elektrika" + }, "power/pole": { "name": "Elektrický stĺp", "terms": "stlp elektrickeho vedenia,stožiar,stoziar,elektrický stĺp,elektricky stlp,Stĺp elektrického vedenia" @@ -1855,6 +1977,10 @@ "name": "Čistiareň", "terms": "cistiaren,Čistiareň odevov,Práčovňa,cistiaren odevov,pracovna" }, + "shop/locksmith": { + "name": "Zámočníctvo", + "terms": "zamocnictvo,zámočník,zamocnik,kľúče,kluce,zámok,zámky,zamok,zamky" + }, "shop/mall": { "name": "Nákupné centrum", "terms": "nakupne centrum,obchodne cenrum,obchodné centrum,obchody" @@ -1887,6 +2013,10 @@ "name": "Chovprodukt", "terms": "domáci miláčik,domaci milacik,domace zvierata,domáce zvierata,potrava" }, + "shop/photo": { + "name": "Obchod s fototechnikou", + "terms": "Fotoateliér,fotoatelier,fotostudio,fotoÅ¡túdio,fotografia" + }, "shop/shoes": { "name": "Obchod s obuvov", "terms": "obuv,topánky,topanky" diff --git a/vendor/assets/iD/iD/locales/sl.json b/vendor/assets/iD/iD/locales/sl.json index 0cb38685b..d8d65f5b6 100644 --- a/vendor/assets/iD/iD/locales/sl.json +++ b/vendor/assets/iD/iD/locales/sl.json @@ -32,6 +32,9 @@ } }, "continue": { + "title": "Nadaljuj", + "description": "Nadaljuj to črto", + "not_eligible": "Od tu ni mogoče nadaljevati črte", "annotation": { "line": "Nadaljevanje črte.", "area": "Nadaljevanje področja." @@ -50,6 +53,11 @@ "area": "Področke spremejeno v krog." } }, + "straighten": { + "title": "Poravnaj", + "description": "Poravnaj to črto", + "annotation": "Črta poravnana." + }, "delete": { "title": "IzbriÅ¡i", "description": "Odstrani to iz zemljevida.", @@ -64,7 +72,9 @@ }, "merge": { "title": "Združi", - "description": "Združi te črte." + "description": "Združi te črte.", + "annotation": "Združeno {n} črt.", + "not_eligible": "Teh elementov ni mogoče združiti." }, "move": { "title": "Premakni", @@ -79,11 +89,35 @@ }, "rotate": { "title": "Zasuči" + }, + "reverse": { + "title": "Obrni", + "description": "Obrne to črto v nasprotno smer.", + "annotation": "Črta obrnjena." + }, + "split": { + "title": "Razdruži" } }, + "undo": { + "tooltip": "Razveljavi: {action}" + }, + "redo": { + "tooltip": "Ponovi: {action}" + }, + "tooltip_keyhint": "Bližnjica:", + "translate": { + "translate": "Prevedi", + "localized_translation_label": "Večjezično ime", + "localized_translation_language": "Izberite jezik", + "localized_translation_name": "Ime" + }, "logout": "odjava", + "loading_auth": "Povezovanje z OpenStreetMap...", + "report_a_bug": "prijavi napako", "commit": { "title": "Shrani spremembe", + "description_placeholder": "Kratek opis vaÅ¡ih sprememb", "save": "Shrani", "cancel": "Prekliči", "warnings": "Opozorila", @@ -91,24 +125,70 @@ "deleted": "Izbrisano", "created": "Ustvarjeno" }, + "contributors": { + "list": "Spremembe uporabnikov {users}", + "truncated_list": "Spremembe uporabnikov {users} in {count} ostalih" + }, + "geocoder": { + "search": "Išči po celem svetu..." + }, "inspector": { "no_documentation_combination": "Za to kombinacijo oznak ni na voljo dokumentacije", - "results": "{n} zadetkov iskanja {search}" + "show_more": "Pokaži več", + "view_on_osm": "Ogled na openstreetmap.org", + "all_tags": "Vse oznake", + "all_members": "Vsi člani", + "all_relations": "Vse relacije", + "role": "Vloga", + "choose": "Izberite vrsto elementa", + "results": "{n} zadetkov iskanja {search}", + "reference": "Ogled v OpenStreetMap Wiki-ju", + "back_tooltip": "Spremeni element", + "remove": "Odstrani", + "search": "Išči", + "multiselect": "Izbrani predmeti", + "unknown": "Neznano", + "incomplete": "", + "feature_list": "Iskanje elementov", + "edit": "Urejanje elementa" }, "background": { "title": "Ozadje", "description": "Nastavitve ozadja", "percent_brightness": "{opacity}% svetlost", + "none": "Brez", + "custom": "Po meri", "reset": "ponastavi" }, "restore": { + "description": "Ali želite ponastaviti Å¡e ne shranjene spremembe iz predhodnega urejanja?", + "restore": "Ponastavi", "reset": "Ponastavi" }, "save": { - "title": "Shrani" + "title": "Shrani", + "help": "Shrani spremembe v OpenStreetMap, kar jih naredi vidne tudi ostalim uporabnikom.", + "no_changes": "Ni sprememb za shranjevanje.", + "uploading": "PrenaÅ¡anje sprememb v OpenStreetMap.", + "unsaved_changes": "Imate Å¡e ne shranjene spremembe." + }, + "success": { + "just_edited": "Pravkar ste uredili OpenStreetMap zemljevid!", + "view_on_osm": "Ogled na OSM", + "twitter": "Deli na Twitter-ju", + "google": "Deli na Google+" + }, + "confirm": { + "okay": "Potrdi" + }, + "splash": { + "welcome": "DobrodoÅ¡li v iD, urejevalniku OpenStreetMap podatkov", + "start": "Uredi sedaj" }, "tag_reference": { - "on_wiki": "{tag} na wiki.osm.org" + "description": "Opis", + "on_wiki": "{tag} na wiki.osm.org", + "used_with": "uporabljeno z {type}" }, "validations": { "untagged_point": "Neoznačena točka", @@ -122,6 +202,26 @@ "out": "PomanjÅ¡aj" }, "cannot_zoom": "V trenutnem načinu pomanjÅ¡ava ni več mogoča.", + "gpx": { + "local_layer": "Krajevna datoteka GPX" + }, + "help": { + "title": "Pomoč" + }, + "intro": { + "points": { + "title": "Točke" + }, + "areas": { + "title": "Področja" + }, + "lines": { + "title": "Črte" + }, + "startediting": { + "start": "Začetek urejanja!" + } + }, "presets": { "categories": { "category-landuse": { @@ -132,15 +232,14 @@ }, "category-road": { "name": "Cesta" - }, - "category-water": { - "name": "Voda" } }, "fields": { "access": { "label": "Dostop", + "placeholder": "Neznano", "types": { + "access": "SploÅ¡no", "foot": "PeÅ¡", "motor_vehicle": "Motorna vozila", "bicycle": "Kolesarji", @@ -156,12 +255,19 @@ }, "private": { "title": "Zasebno" + }, + "destination": { + "title": "Za dostavo" } } }, + "access_toilets": { + "label": "Dostop" + }, "address": { "label": "Naslov", "placeholders": { + "housename": "HiÅ¡no ime", "number": "123", "street": "Ulica", "city": "Mesto", @@ -174,6 +280,12 @@ "amenity": { "label": "Vrsta" }, + "artist": { + "label": "Umetnik" + }, + "artwork_type": { + "label": "Vrsta" + }, "atm": { "label": "Bankomat" }, @@ -183,6 +295,9 @@ "bicycle_parking": { "label": "Vrsta" }, + "boundary": { + "label": "Vrsta" + }, "building": { "label": "Zgradba" }, @@ -192,6 +307,10 @@ "building_yes": { "label": "Zgradba" }, + "capacity": { + "label": "Kapaciteta", + "placeholder": "50, 100, 200..." + }, "cardinal_direction": { "label": "Smer" }, @@ -220,18 +339,40 @@ "denomination": { "label": "Denominacija" }, + "description": { + "label": "Opis" + }, "elevation": { "label": "Nadmorska viÅ¡ina" }, + "emergency": { + "label": "Urgenca" + }, "entrance": { "label": "Vrsta" }, "fax": { - "label": "Telefaks" + "label": "Telefaks", + "placeholder": "+386 4 123 4567" }, "fee": { "label": "Plačilo" }, + "fire_hydrant/type": { + "label": "Vrsta" + }, + "fixme": { + "label": "Popravi me" + }, + "generator/method": { + "label": "Način" + }, + "generator/source": { + "label": "Vir" + }, + "generator/type": { + "label": "Vrsta" + }, "highway": { "label": "Vrsta" }, @@ -257,6 +398,10 @@ "landuse": { "label": "Vrsta" }, + "lanes": { + "label": "Pasov", + "placeholder": "1, 2, 3..." + }, "layer": { "label": "Plast" }, @@ -264,13 +409,18 @@ "label": "Vrsta" }, "levels": { - "label": "Nivojev" + "label": "Nivojev", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "Osvetljeno" }, "man_made": { "label": "Vrsta" }, "maxspeed": { - "label": "Omejitev hitrosti" + "label": "Omejitev hitrosti", + "placeholder": "30, 50, 60..." }, "name": { "label": "Ime" @@ -306,7 +456,8 @@ "label": "Vrsta" }, "phone": { - "label": "Telefon" + "label": "Telefon", + "placeholder": "+386 31 123 4567" }, "place": { "label": "Vrsta" @@ -320,6 +471,9 @@ "ref": { "label": "Referenca" }, + "relation": { + "label": "Vrsta" + }, "religion": { "label": "Veroizpoved", "options": { @@ -332,6 +486,15 @@ "taoist": "Taoizem" } }, + "restriction": { + "label": "Vrsta" + }, + "route": { + "label": "Vrsta" + }, + "route_master": { + "label": "Vrsta" + }, "sac_scale": { "label": "Zahtevnost poti" }, @@ -351,6 +514,7 @@ "label": "Å port" }, "structure": { + "placeholder": "Neznano", "options": { "bridge": "Most", "tunnel": "Tunel", @@ -358,6 +522,9 @@ "cutting": "Usek" } }, + "supervised": { + "label": "Nadzorovano" + }, "surface": { "label": "PovrÅ¡ina" }, @@ -373,6 +540,12 @@ "trail_visibility": { "label": "Vidnost poti" }, + "tree_type": { + "label": "Vrsta" + }, + "vending": { + "label": "Vrsta dobrin" + }, "water": { "label": "Vrsta" }, @@ -380,7 +553,8 @@ "label": "Vrsta" }, "website": { - "label": "Spletno mesto" + "label": "Spletno mesto", + "placeholder": "http://example.com/" }, "wetland": { "label": "Vrsta" @@ -396,11 +570,15 @@ } }, "presets": { + "address": { + "name": "Naslov" + }, "aeroway": { "name": "Letalstvo" }, "aeroway/aerodrome": { - "name": "Letališče" + "name": "Letališče", + "terms": "aerodrom" }, "aeroway/apron": { "name": "LetaliÅ¡ka ploščad" @@ -424,10 +602,12 @@ "name": "Bankomat" }, "amenity/bank": { - "name": "Banka" + "name": "Banka", + "terms": "hranilnica,posojilnica" }, "amenity/bar": { - "name": "Bar" + "name": "Bar", + "terms": "bife,kava,pivnica" }, "amenity/bench": { "name": "Klop" @@ -439,7 +619,8 @@ "name": "Izposoja koles" }, "amenity/cafe": { - "name": "Kavarna" + "name": "Kavarna", + "terms": "bife,kava,bar" }, "amenity/car_wash": { "name": "Avtopralnica" @@ -453,6 +634,9 @@ "amenity/courthouse": { "name": "Sodišče" }, + "amenity/drinking_water": { + "name": "Pitna voda" + }, "amenity/embassy": { "name": "VeleposlaniÅ¡tvo" }, @@ -469,7 +653,8 @@ "name": "Bencinska črpalka" }, "amenity/grave_yard": { - "name": "Pokopališče" + "name": "Pokopališče", + "terms": "pokopališče,žale,britof" }, "amenity/hospital": { "name": "BolniÅ¡nica" @@ -511,7 +696,8 @@ "name": "PoÅ¡ta" }, "amenity/pub": { - "name": "Pivnica" + "name": "Pivnica", + "terms": "pivo,pijača" }, "amenity/restaurant": { "name": "Restavracija" @@ -522,6 +708,9 @@ "amenity/swimming_pool": { "name": "Bazen" }, + "amenity/taxi": { + "name": "Postajališče za taxije" + }, "amenity/telephone": { "name": "Telefon" }, @@ -537,15 +726,36 @@ "amenity/university": { "name": "Univerza" }, + "amenity/vending_machine": { + "name": "Prodajni avtomat" + }, "amenity/waste_basket": { "name": "KoÅ¡ za odpadke" }, + "area": { + "name": "Področje" + }, "barrier": { "name": "Ovira" }, + "barrier/block": { + "name": "Blok" + }, + "barrier/bollard": { + "name": "Stebriček" + }, + "barrier/cattle_grid": { + "name": "ReÅ¡etka za živino" + }, "barrier/city_wall": { "name": "Mestno obzidje" }, + "barrier/cycle_barrier": { + "name": "Ovira za kolesarje" + }, + "barrier/ditch": { + "name": "Jarek" + }, "barrier/entrance": { "name": "Vhod" }, @@ -558,6 +768,16 @@ "barrier/hedge": { "name": "Živa meja" }, + "barrier/lift_gate": { + "name": "Zapornica", + "terms": "rampa" + }, + "barrier/retaining_wall": { + "name": "Obzidje" + }, + "barrier/toll_booth": { + "name": "Cestninska postaja" + }, "barrier/wall": { "name": "Zid" }, @@ -567,15 +787,30 @@ "building": { "name": "Zgradba" }, + "building/apartments": { + "name": "Stanovanja" + }, "building/entrance": { "name": "Vhod" }, + "building/garage": { + "name": "Garaža" + }, "building/house": { "name": "HiÅ¡a" }, + "emergency/ambulance_station": { + "name": "Postaja nujne medicinske pomoči" + }, "entrance": { "name": "Vhod" }, + "footway/crossing": { + "name": "Prehod za peÅ¡ce" + }, + "footway/sidewalk": { + "name": "Pločnik" + }, "highway": { "name": "Cesta" }, @@ -586,7 +821,7 @@ "name": "Avtobusno postajališče" }, "highway/crossing": { - "name": "Križišče" + "name": "Prehod za peÅ¡ce" }, "highway/cycleway": { "name": "Kolesarska steza" @@ -613,7 +848,8 @@ "name": "Pot" }, "highway/pedestrian": { - "name": "Pločnik" + "name": "PeÅ¡ cona", + "terms": "pločnik" }, "highway/primary": { "name": "Glavna cesta" @@ -669,6 +905,12 @@ "highway/unclassified": { "name": "Neopredeljena cesta" }, + "historic/archaeological_site": { + "name": "ArheoloÅ¡ko najdišče" + }, + "historic/boundary_stone": { + "name": "Mejni kamen" + }, "historic/castle": { "name": "Grad" }, @@ -679,7 +921,8 @@ "name": "Spomenik" }, "historic/ruins": { - "name": "RuÅ¡evine" + "name": "RuÅ¡evine", + "terms": "ostaline,podrtija" }, "historic/wayside_cross": { "name": "Križ" @@ -786,18 +1029,34 @@ "leisure/swimming_pool": { "name": "Bazen" }, + "line": { + "name": "Črta" + }, + "man_made/breakwater": { + "name": "Valobran", + "terms": "lukobran,pomol,nasip,zid" + }, "man_made/lighthouse": { "name": "Svetilnik" }, "man_made/pier": { "name": "Pomol" }, + "man_made/pipeline": { + "name": "Cevovod" + }, + "man_made/tower": { + "name": "Stolp" + }, "man_made/wastewater_plant": { "name": "Čistilna naprava" }, "man_made/water_tower": { "name": "Vodni stolp" }, + "man_made/water_well": { + "name": "Vodnjak" + }, "natural": { "name": "Naravno" }, @@ -852,6 +1111,21 @@ "office": { "name": "Pisarne" }, + "office/accountant": { + "name": "Računovodstvo" + }, + "office/administrative": { + "name": "Upravna pisarna" + }, + "office/architect": { + "name": "Arhitekt" + }, + "office/lawyer": { + "name": "Pravna pisarna" + }, + "office/political_party": { + "name": "Politična stranka" + }, "place": { "name": "Kraj" }, @@ -873,12 +1147,31 @@ "place/village": { "name": "Vas" }, + "point": { + "name": "Točka" + }, "power": { "name": "Elektro" }, + "power/generator": { + "name": "Električni generator", + "terms": "agregat" + }, "power/line": { "name": "Daljnovod" }, + "power/pole": { + "name": "Steber daljnovoda", + "terms": "kandelaber" + }, + "power/sub_station": { + "name": "Razdelilna transformatorska postaja", + "terms": "rtp,transformator,stikališče,razdelilna postaja" + }, + "power/tower": { + "name": "Steber visokonapetostnega daljnovoda", + "terms": "kandelaber" + }, "power/transformer": { "name": "Transformator" }, @@ -892,7 +1185,7 @@ "name": "Opuščena železnica" }, "railway/level_crossing": { - "name": "Prehod" + "name": "Nivojsko križišče" }, "railway/monorail": { "name": "Monorail" @@ -915,6 +1208,12 @@ "railway/tram": { "name": "Tramvaj" }, + "relation": { + "name": "Relacija" + }, + "route/ferry": { + "name": "Trajektna linija" + }, "shop": { "name": "Trgovina" }, @@ -1113,6 +1412,30 @@ "tourism/zoo": { "name": "Živalski vrt" }, + "type/boundary": { + "name": "Meja" + }, + "type/boundary/administrative": { + "name": "Upravna meja" + }, + "type/restriction": { + "name": "Prepoved" + }, + "type/route/bus": { + "name": "Avtobusna linija" + }, + "type/route/detour": { + "name": "Obvoz" + }, + "type/route/ferry": { + "name": "Trajektna linija" + }, + "type/route/tram": { + "name": "Tramvajska linija" + }, + "vertex": { + "name": "Drugo" + }, "waterway": { "name": "Vodotok" }, @@ -1132,7 +1455,8 @@ "name": "Reka" }, "waterway/riverbank": { - "name": "Breg" + "name": "Rečni breg", + "terms": "brežina,obala,breg" }, "waterway/stream": { "name": "Potok" diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json index d6ff1f2c1..4b23a6f51 100644 --- a/vendor/assets/iD/iD/locales/sr.json +++ b/vendor/assets/iD/iD/locales/sr.json @@ -249,15 +249,16 @@ "unknown": "Непознато", "incomplete": "<није преузето>", "feature_list": "Могућности претраге", - "edit": "Уредите објекат" + "edit": "Уредите објекат", + "none": "Ниједан" }, "background": { "title": "Позадина", "description": "Подешавања позадине", "percent_brightness": "{opacity}% прозирност", + "none": "Ниједна", "custom": "Прилагођена", "custom_prompt": "Унесите образац плочица. Важеће вредности су {z}, {x}, {y} за Z/X/Y шему и {u} за квадратну шему.", - "fix_misalignment": "Поправи поравнање", "reset": "ресетовање" }, "restore": { @@ -316,8 +317,7 @@ }, "cannot_zoom": "Не можете даље умањивати у тренутном режиму.", "gpx": { - "local_layer": "Локална GPX датотека", - "drag_drop": "Превуците и отпустите .gpx датотеку на страницу" + "local_layer": "Локална GPX датотека" }, "help": { "title": "Помоћ", @@ -325,9 +325,7 @@ "editing_saving": "# Уређивање и чување⏎\n⏎\nОвај уређивач је дизајниран да ради пре свега на мрежи, и ви му управо сада ⏎\nприступате преко сајта.⏎\n⏎\n### Одабир обележја⏎\n⏎\nДа бисте изабрали обележје на мапи, као што је пут или тражени објекат, кликните ⏎\nна њега на мапи. То ће обележити изабрани објекат, отворите панел са ⏎\nдетаљима о њему, и показати мени ствари које можете да урадите са обележјем.⏎\n⏎\nВише обележја може бити изабрано држањем 'Shift' тастера, кликом миша, ⏎\nи превлачењем на мапи. Ово ће обележити све објекте унутар оквира који ⏎\nје нацртан, што омогућава да урадите ствари над неколико објеката одједном.⏎\n⏎\n### Чување измена⏎\n⏎\nКада направите измене као што је измена путева, зграда и места, оне се ⏎\nчувају локално док их не сачувате на серверу. Не брините ако направите ⏎\nгрешку - можете опозвати измене тако што ћете кликнути на дугме за опозив, и ⏎\nповратити измене кликом на дугме за повраћај.⏎\n⏎\nКликните на „Сачувај“ да бисте завршили групу измена - на пример, ако сте завршили ⏎\nподручје града и желите да почнете на новом простору. Имаћете прилику ⏎\nда размотрите шта сте урадили, а уређивач вас снабдева корисним предлозима ⏎\nи упозорењима уколико нешто није у реду у вези са изменама.⏎\n⏎\nАко све изгледа добро, можете унети кратак коментар у којем је објашњена измена ⏎\nкоју сте направили, и кликните поново на „Сачувај“ да бисте поставили измене ⏎\nна [OpenStreetMap.org] (http://www.openstreetmap.org/), где су видљиве ⏎\nсвим другим корисницима и на располагању другима да надограђују и побољшавају.⏎\n⏎\nАко не можете да завршите своје измене у одједанпут, можете да напустите прозор ⏎\nуређивача и вратите се касније (на истом прегледачу и рачунару), а ⏎\nапликација ће понудити да обнови ваш рад.\n\nапликација уређивача ће понудити да обновите ваш рад.⏎\n", "roads": "# Путеви\n\nМожете правити, поправљати, и брисати путеве са овим уређивачем. Путеви могу бити \nсвих врста: стазе, ауто-путеви, путићи, бициклистичке стазе, и више - било који често \nкоришћени сегмент би требало да буде мапоиран.\n\n### Избор\n\nКликните на путу да бисте га изабрали. Контура би требало да постане видљива, \nзаједно са малим менијем алатки на мапи и траком са стране која показује више \nинформација о путу.\n\n### Измена\n\nЧесто ћете видети путеве који нису усклађени са сликом иза њих\nили са ГПС путањом. Можете да прилагодите ове путеве, тако буду на исправном\nместу.\n\nПрво кликните на путу који желите да промените. То ће га истаћи и показати\nконтролне тачке дуж пута које можете превући на боље локације. Ако\nжелите да додате нове контролне тачке за више детаља, кликните двапут део\nпута без чвора, и чвор ће бити додат.\n\nАко се пут повезује са другим путем, али је неправилно повезан на\nмапи, можете да повучете неку од његових контролних тачака на други пут с\nциљем да се повежу. Повезивање путева је важно за мапе\nи од суштинског значаја за пружање упутстава при вожњи.\n\nТакође можете да кликнете на 'Премести' алатку или притисните `M` тастер пречице за премештање целог \nпута одједном, а затим поново кликните да бисте сачували померање.\n\n### Брисање\n\nАко је пут потпуно неисправан - можете видети да он не постоји на сателитским\nснимцима и идеално су потврдили локално да није присутан - можете да избришете\nто, што га уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да пут може бити у скорије време изграђен.\n\nМожете обрисати пут тако што ћете кликнути на њега да бисте га изабрали, затим кликните\nна иконицу канте за смеће или притисните тастер 'Delete'.\n\n### Прављење\n\nНашли сте да би негде требало да постоји пут, али га нема на мапи? Кликните на 'Путања'\nикону у горњем левом углу уређивача или притисните тастер за пречицу `2` да бисте \nпочели са цртањем путање.\n\nКликните на почетак пута на мапи да бисте почели са цртањем. Ако се пут\nодваја од постојећег пута, почните тако што ћете кликнути на месту где су повезани.\n\nЗатим кликните на места дуж пута, тако да следи праву путању, према\nсателитским снимцима или ГПС-у. Ако је пут који цртате укрштен другим путем, повежите\nих тако што ћете кликнути на тачку пресека. Када завршите цртање, кликните двапут\nили притисните 'Return' или 'Enter' на тастатури.\n", "gps": "# ГПС\n\nГПС подаци су најпоузданији извор података за Опенстреетмап. Овај уређивач\nподржава локалне путање - `.gpx` датотеке на локалном рачунару. Можете прикупити\nову врсту ГПС путања са бројних апликација за паметне телефоне , као и са\nличним ГПС хардвером.\n⏎\nЗа информације о томе како да извршите ГПС премеравање, прочитајте\n[Премеравање са ГПС] (http://learnosm.org/en/beginner/using-gps/).\n\nДа бисте користили GPX путању за мапирање, превуците и отпустите GPX датотеку\nна мапу уређивача. Ако је препозната, биће додата на мапу као светло зелена\nлинија. Кликните на мени 'Подешавања позадине' на левој страни како бисте омогућили,\nонемогућили, или увећали на овај нови GPX слој.\n\nGPX путања се директно не преноси на Опенстреетмап - најбољи начин да\nје користите јесте да исцртавате на мапи, користећи путању као водиљу за нове\nобјекте које додајете, као и да [учитавате податке на Поенстритмап](http://www.openstreetmap.org/trace/create)⏎\nкако би и други корисници могли да их користе.\n", - "imagery": "# Снимци\n\nСнимци из ваздуха су важан ресурс за мапирање. Комбинација \nавионских прелета, сателитских приказа и слободно састављених извора су на \nрасполагању у уређивачу испод менија 'Подешавања позадине' са леве стране.\n\nПодразумевано је представљен [Bing Maps] (http://www.bing.com/maps/) слој \nсателитских снимака у уређивачу, али као померате и увећавате мапу на нова географска \nподручја, нови извори ће постати доступни. Неке земље, попут Сједињених \nДржава, Француске и Данске имају веома квалитетне снимке доступна за неке области.\n\nСнимак је некада померен у односу на податке на мапи због грешке од страни \nдобављача снимака. Ако видите много путева померених у односу на позадину, \nнемојте их одмах преместити све да одговарају позадини. Уместо тога можете подесити \nслике тако да одговарају постојећим подацима кликом на 'Поправи поравнање' на \nдну интерфејса Подешавање позадине.\n", "addresses": "# Адресе\n\nАдресе су једне од најкориснијих информација на мапи.\n\nИако су адресе често представљене као делови улица, у Опенстреетмап\nсу забележене као атрибути објеката и места дуж улица.\n\nМожете да додате информације о адреси на местима мапираним као основе зграде\nкао и оних мапираних као појединачне тачке. Оптимални извор података адреса\nје од премеравања на терену или лично знање - као и са било којим \nдругим објектом, копирање са комерцијалних извора, као што су Гугл мапе је строго\nзабрањено.\n", - "inspector": "# Коришћење инспектора\n\nИнспектор је елемент корисничког интерфејса на десној страни странице \nкоја се појављује када је објекат изабран и омогућава вам да измените његове детаље.\n\n### Избор врсте карактеристика\n\nНакон што додате чвор, линију, или област, можете да изаберете врсту карактеристика, \nредимо да ли је аутопут или стамбени пут, супермаркет или кафе.\nИнспектор ће приказати иконице за најчешће врсте карактеристика, а друге можете\nпронаћи куцањем оног што тражите у поље за претрагу.\n\nКликните на 'i' у доњем десном углу дугмета врсте могућности како бисте\nсазнали више о томе. Кликните на дугме како бисте изабрали дату врсту.\n\n### Коришћење образаца и уређивање ознака\n\nНакон што одаберете посебну врсту, или када изаберете објекат која већ\nима додељену врсту, инспектор ће приказати поља са детаљима о\nкарактеристикама као што су име и адреса.\n\nИспод поља које видите, можете да кликнете на иконе да бисте додали друге детаље,\nкао што су информације са [Википедије] (http://www.wikipedia.org/), приступ инвалидским \nколицима, и више од тога.\n\nНа дну инспектора, кликните на 'Додатне ознаке' да бисте произвољно додали \nдруге ознаке елементу. [Taginfo](http://taginfo.openstreetmap.org/) је\nобиман ресурс ако желите да за сазнате више о популарним комбинацијама ознака.\n\nПромене које направите у инспектора ће се аутоматски применити на мапи.\nМожете их опозвати у било ком тренутку тако што ћете кликнути на дугме 'Опозови'.\n\n### Затварање инспектора\n\nМожете да затворите инспектор кликом на дугме за затварање на врху десно,\nпритиском на тастер 'Escape', или кликом на мапу.\n", "buildings": "# Грађевине\n\nОпенстреетмап је највећа база података грађевина на свету. Можете правити \nи побољшати ову базу података.\n\n### Избор\n\nМожете изабрати грађевину кликом на њене оквире. То ће истаћи\nграђевину и отворити мали мени са алатима и траку са стране која приказује више \nинформација о грађевини.\n\n### Измена\n\nПонекад су зграде погрешно постављене или имају погрешне ознаке.\n\nДа бисте преместили читав објекат, изаберите га, а затим кликните на алат 'Премести'. Померите\nмиша да бисте преместили грађевину, и кликните поново када је правилно поставите.\n\nДа бисте поправили одређени облик грађевине, кликните и превуците чворове који чине\nњене границе на праве локације.\n\n### Прављење\n\nЈедно од главних недоумица око додавања грађевине на мапу јесте да\nОпенстреетмап заправо чува грађевине и као облик и као тачке. Правило\nје да се _мапирају грађевине као облик кад год је то могуће_, а да се мапирају предузећа, куће,\nпогодности, као и друге ствари које функционишу унутар грађевина као тачке постављене\nунутар облика зграде.\n\nПочните цртање грађевине као облика тако што ћете кликнути на дугме 'Област' на врху\nлево интерфејса, и завршите је било притиском на тастер 'Return' на тастатури\nили кликом на први исцртани чвор којим се затвара облик.\n\n### Брисање\n\nАко је грађевина потпуно неисправна - можете видети да она не постоји на сателитским\nснимцима и у најбољем случају потврђено је локално да није присутан - можете је избрисати, \nчиме се уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да објекат може бити у новије време изграђен.\n\nМожете обрисати грађевину кликом на њу да бисте је изабрали, затим кликните\nна икону канте за смеће или притиском на тастер 'Delete'.\n", "relations": "# Односи\n\nОднос је посебна врста обележја у Опенстреетмапама која групише друга обележја. На пример, две основне врсте односа су *односи путева* којим се групишу заједно деонице пута које припадају одређеном аутопуту или магистралном путу, и * вишеструки полигони* којим се групише заједно неколико линија које дефинишу сложену област (један полигон од више делова или са рупом у себи попут крофне).\n\nГрупа обележја у односу се називају *чланови*. На бочној траци, можете видети којем односу припада обележје, и ту кликнути на релацију да бисте је изабрали. Када је однос изабран, можете видети све његове чланове наведени у бочној траци и означене на мапи.\n\nУ већини случајева, iD ће се побринути о одржавању односа аутоматски док правите измене. Најважнија ствар које би требало да будете свесни јесте да ако избришете део пута да бисте га прецизније исцртали, требало би да се уверите и да је нови одељак члан истог односа као и оригинал.\n\n## Уређивање односа\n\nАко желите да измените односе, овде су дате основе.\n\nДа бисте додали обележје у однос, изаберите обележје, кликните на дугме „+“ у одељку „Сви односи“ бочне траке, и изаберите или упишите име односа.\n\nДа бисте креирали нови однос, изаберите прво обележје које би требало да буде члан,\nкликните на дугме „+“ у одељку „Сви односи“, и одаберите „Нови однос...“.\n\nДа бисте уклонили обележје из односа, изаберите обележје и кликните на иконицу смеће\nпоред односа из којег желите да га уклоните.\n\nМожете да креирате вишеструке полигоне са рупама помоћу алат „Споји“. Нацртајте две области (унутрашњу и спољашњу), држите тастер Шифт и кликните на сваки од њих да бисте изабрали обоје, а затим кликните на дугме „Споји“ (+) дугме.\n" }, @@ -382,6 +380,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Зграда" + }, "category-landuse": { "name": "Коришћење земљишта" }, @@ -396,9 +397,6 @@ }, "category-route": { "name": "Путања" - }, - "category-water": { - "name": "Вода" } }, "fields": { @@ -696,6 +694,9 @@ "shelter": { "label": "Склониште" }, + "shelter_type": { + "label": "Врста" + }, "shop": { "label": "Врста" }, @@ -736,6 +737,9 @@ "trail_visibility": { "label": "Видљивост стазе" }, + "tree_type": { + "label": "Врста" + }, "vending": { "label": "Врста добара" }, @@ -877,9 +881,6 @@ "amenity/marketplace": { "name": "Тржница" }, - "amenity/parking": { - "name": "Паркинг" - }, "amenity/pharmacy": { "name": "Апотека" }, @@ -1042,6 +1043,9 @@ "entrance": { "name": "Улаз" }, + "footway/crossing": { + "name": "Прелаз" + }, "highway": { "name": "Ауто-пут" }, @@ -1300,6 +1304,9 @@ "man_made/lighthouse": { "name": "Светионик" }, + "man_made/observation": { + "name": "Посматрачки торањ" + }, "man_made/pier": { "name": "Пристаниште" }, @@ -1384,6 +1391,9 @@ "office": { "name": "Канцеларија" }, + "office/travel_agent": { + "name": "Туристичка агенција" + }, "place": { "name": "Место" }, @@ -1576,6 +1586,9 @@ "shop/laundry": { "name": "Перионица" }, + "shop/locksmith": { + "name": "Бравар" + }, "shop/mall": { "name": "Тржни центар" }, diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json index 6a87286c3..3f8ad4fcf 100644 --- a/vendor/assets/iD/iD/locales/sv.json +++ b/vendor/assets/iD/iD/locales/sv.json @@ -228,7 +228,6 @@ "title": "Bakgrund", "description": "Bakgrundsinställningar", "percent_brightness": "{opacity}% ljusstyrka", - "fix_misalignment": "Justera bildplacering", "reset": "ta bort" }, "restore": { @@ -284,8 +283,7 @@ }, "cannot_zoom": "GÃ¥r ej att zooma ut ytterligare med nuvarande sätt.", "gpx": { - "local_layer": "Lokal gpx-fil", - "drag_drop": "Dra och släpp en .gpx-fil pÃ¥ sidan" + "local_layer": "Lokal gpx-fil" }, "help": { "title": "Hjälp", @@ -625,9 +623,6 @@ "amenity/marketplace": { "name": "Maknadsplats" }, - "amenity/parking": { - "name": "Parkering" - }, "amenity/pharmacy": { "name": "Läkemedel" }, diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json index 4c3d7058d..e00758b0b 100644 --- a/vendor/assets/iD/iD/locales/te.json +++ b/vendor/assets/iD/iD/locales/te.json @@ -16,6 +16,32 @@ "point": "ఒక బిందువును చేర్చారు." } }, + "start": { + "annotation": { + "line": "ఒక గీతను మొదలుపెట్టారు.", + "area": "ఒక ప్రదేశాన్ని మొదలుపెట్టారు." + } + }, + "continue": { + "title": "కొనసాగించు", + "description": "ఈ గీతను కొనసాగించండి.", + "annotation": { + "line": "ఒక గీతను కొనసాగించారు.", + "area": "ఒక ప్రదేశాన్ని కొనసాగించారు." + } + }, + "cancel_draw": { + "annotation": "గీయడాన్ని రద్దుచేసారు." + }, + "circularize": { + "description": { + "line": "ఈ గీతను వృత్తంగా చేయి.", + "area": "ఈ ప్రదేశాన్ని వృత్తంగా చేయి." + } + }, + "straighten": { + "description": "ఈ గీతను తిన్నగా చేయి." + }, "delete": { "title": "తొలగించు", "annotation": { @@ -29,6 +55,7 @@ }, "translate": { "translate": "అనువదించండి", + "localized_translation_label": "బహుభాషా పేరు", "localized_translation_language": "భాషను ఎంచుకోండి", "localized_translation_name": "పేరు" }, @@ -69,7 +96,9 @@ "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి" }, "success": { - "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి" + "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి", + "twitter": "ట్విట్టర్లో పంచుకోండి", + "google": "గూగుల్+లో పంచుకోండి" }, "confirm": { "okay": "సరే" @@ -87,20 +116,25 @@ "points": { "title": "బిందువులు" }, + "areas": { + "title": "ప్రదేశాలు" + }, "lines": { "title": "గీతలు" } }, "presets": { - "categories": { - "category-water": { - "name": "నీళ్ళు" - } - }, "fields": { "access": { "types": { - "access": "సాధారణం" + "access": "సాధారణం", + "bicycle": "సైకిళ్ళు", + "horse": "గుర్రాలు" + }, + "options": { + "destination": { + "title": "గమ్యం" + } } }, "address": { @@ -117,6 +151,9 @@ "amenity": { "label": "రకం" }, + "artwork_type": { + "label": "రకం" + }, "barrier": { "label": "రకం" }, @@ -163,6 +200,12 @@ "entrance": { "label": "రకం" }, + "fire_hydrant/type": { + "label": "రకం" + }, + "generator/type": { + "label": "రకం" + }, "highway": { "label": "రకం" }, @@ -191,7 +234,8 @@ "label": "వేగ పరిమితి" }, "name": { - "label": "పేరు" + "label": "పేరు", + "placeholder": "మామూలు పేరు (ఉంటే)" }, "note": { "label": "గమనిక" @@ -315,6 +359,9 @@ "amenity/pharmacy": { "name": "మందుల షాపు" }, + "amenity/place_of_worship/buddhist": { + "name": "బౌద్ధ ఆలయం" + }, "amenity/place_of_worship/christian": { "name": "చర్చి", "terms": "చర్చి, చర్చ్" @@ -458,6 +505,9 @@ "shop/supermarket": { "name": "సుపర్ మార్కెట్" }, + "shop/toys": { + "name": "బొమ్మల కొట్టు" + }, "shop/vacant": { "name": "ఖాళీ దుకాణం" }, diff --git a/vendor/assets/iD/iD/locales/tr.json b/vendor/assets/iD/iD/locales/tr.json index 20a0ddb99..7bb311956 100644 --- a/vendor/assets/iD/iD/locales/tr.json +++ b/vendor/assets/iD/iD/locales/tr.json @@ -195,7 +195,6 @@ "title": "Arkaplan", "description": "Arkaplan Ayarları", "percent_brightness": "{opacity}% parlaklık", - "fix_misalignment": "Yanlış hizalamayı düzelt", "reset": "Sıfırla" }, "restore": { @@ -248,8 +247,7 @@ "out": "Uzaklaş" }, "gpx": { - "local_layer": "Lokal GPX dosyası", - "drag_drop": ".gpx dosyasını sayfa üzerine sürükleyip bırakınız" + "local_layer": "Lokal GPX dosyası" }, "help": { "title": "Yardım" @@ -598,9 +596,6 @@ "amenity/marketplace": { "name": "Pazar Yeri" }, - "amenity/parking": { - "name": "Park Alanı" - }, "amenity/pharmacy": { "name": "Eczane" }, diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json index e126cd208..df46c257f 100644 --- a/vendor/assets/iD/iD/locales/uk.json +++ b/vendor/assets/iD/iD/locales/uk.json @@ -83,7 +83,8 @@ "annotation": { "line": "Випрямлено кути лінії.", "area": "Випрямлено кути полігону." - } + }, + "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів." }, "straighten": { "title": "Випрямити", @@ -159,7 +160,7 @@ }, "reverse": { "title": "Розвернути", - "description": "Змінити напрямок лінії на протилежний.", + "description": "Змінює напрямок лінії на протилежний.", "key": "V", "annotation": "Напрямок лінії змінено." }, @@ -188,7 +189,7 @@ "tooltip": "Повернути: {action}", "nothing": "Немає чого повертати." }, - "tooltip_keyhint": "Клавішна клмбінація:", + "tooltip_keyhint": "Клавішна комбінація:", "browser_notice": "Цей редактор працює в оглядачах Firefox, Chrome, Safari, Opera і Internet Explorer версії 9 і вище. Будь ласка, оновіть свій оглядач або скористайтеся редактором Potlatch 2.", "translate": { "translate": "Перекласти", @@ -196,7 +197,7 @@ "localized_translation_language": "Обрати мову", "localized_translation_name": "Назва" }, - "zoom_in_edit": "Наблизтесь, щоб редагувати", + "zoom_in_edit": "Необхідно збільшити масштаб, щоб редагувати", "logout": "вийти", "loading_auth": "З’єднання з OpenStreetMap…", "report_a_bug": "повідомити про помилку", @@ -240,21 +241,23 @@ "all_relations": "Всі зв’язки", "new_relation": "Новий зв’язок…", "role": "Роль", - "choose": "Виберіть тип об’єкту", + "choose": "Виберіть тип об’єкта", "results": "знайдено {n} об’єктів на запит {search}", "reference": "Подивитись на OpenStreetMap Wiki", "back_tooltip": "Змінити об’єкт", "remove": "Вилучити", "search": "Пошук", + "multiselect": "Вибрані об’єкти", "unknown": "Невідомо", "incomplete": "<не завантажено>", "feature_list": "Пошук об’єктів", "edit": "Властивості об’єкта" }, "background": { - "title": "Фон", - "description": "Налаштування фону", + "title": "Тло", + "description": "Налаштування тла", "percent_brightness": "прозорість {opacity}%", + "none": "Пусте", "custom": "Власний фон", "custom_prompt": "Введіть шаблон для квадратів мапи. Використовуй те {z}, {x}, {y} для схеми Z/X/Y та {u} схеми QuadTiles.", "fix_misalignment": "Виправити зсув", @@ -268,7 +271,7 @@ }, "save": { "title": "Зберегти", - "help": "Зберегти зміни надіславши їх на OpenStreetMap, та зробивши їх доступними усім іншим.", + "help": "Зберегти зміни надіславши їх до OpenStreetMap, що зробить їх доступними усім іншим.", "no_changes": "Зміни для збереження відсутні.", "error": "Під час збереження виникла помилка", "uploading": "Надсилання змін до OpenStreetMap.", @@ -281,7 +284,7 @@ "facebook": "Поділитись на Facebook", "twitter": "Поділитись на Twitter", "google": "Поділитись на Google+", - "help_html": "Ваші зміни повинні з’явитись в «Стандартному» шарі через кілька хвилин. Зміни інших шарів, та об’єктів можуть відбуватись\nдовше (докладніше англійською).\n" + "help_html": "Ваші зміни повинні з’явитись в «Стандартному» шарі за кілька хвилин. \nЗміни інших шарів та об’єктів можуть відбуватись довше (докладніше англійською).\n" }, "confirm": { "okay": "Готово" @@ -317,24 +320,26 @@ "cannot_zoom": "Не можливо зменшити масштаб в поточному режимі.", "gpx": { "local_layer": "Локальний файл GPX", - "drag_drop": "Перетягніть файл .gpx на сторінку" + "drag_drop": "Перетягніть файл .gpx на сторінку чи натисніть кнопку праворуч для вибору файлу", + "zoom": "Масштабувати за треком GPX", + "browse": "Вибрати файл .gpx" }, "help": { "title": "Довідка", "help": "# Довідка\n\nЦе редактор для [OpenStreetMap](http://www.openstreetmap.org/),\nвільної мапи світу, яку може редагувати кожний. Ви можете використовувати \nредактор для додавання та уточнення даних у вашій місцевості, роблячи \nмапу вільних та відкритих даних світу ще кращою.\n\nВаші правки будуть доступні кожному, хто користується мапою OpenStreetMap. \nДля того, щоб їх вносити вам потрібно [зареєструватись в OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n[Редактор iD](http://ideditor.com/) — є спільним проектом [сирці якого \nдоступні на GitHub](https://github.com/systemed/iD).\n", "editing_saving": "# Редагування та збереження\n\nЦей редактор створений переважно для роботи онлайн, і ви зараз\nпрацюєте з ним на веб-сайті.\n\n### Виділення об’єктів\n\nДля виділення об’єктів на мапі, таких як дороги чи пам’ятки, треба\nклацнути по них на мапі. Виділені об’єкти будуть підсвічені, з’явиться\nпанель з подробицями про них та меню із переліком того, що можна\nзробити.\n\nДля виділення кількох об’єктів натисніть 'Shift', або клацніть та потягніть\nмишею по мапі. Будуть виділені всі об’єкти, що попали у прямокутник\nвиділення, це дозволить вам виконувати дії одночасно над кількома\nоб’єктами.\n\n### Збереження правок\n\nПісля того як ви зробили зміни, виправивши дорогу, чи будинок, вони є\nлокальними доки ви не збережете їх на сервері. Не хвилюйтесь, якщо\nви припустились помилки, ви можете відмінити зміни натиснувши на\nкнопку 'Відмінити', а також повернути зміни — натиснувши 'Повернути'\n\nНатисніть 'Зберегти', щоб закінчити групу правок, наприклад, якщо ви\nзакінчили роботу над одним районом міста і бажаєте перейти до іншого.\nВи будете мати можливість переглянути те, що ви зробили, а редактор\nзапропонує вам корисні поради та видасть попередження, якщо ваші\nправки не виглядають вірними.\n\nЯкщо все виглядає добре, ви можете додати коротке пояснення того, що\nви зробили та натиснути кнопку 'Зберегти' ще раз, щоб надіслати зміни\nдо [OpenStreetMap.org](http://www.openstreetmap.org/), де вони стануть\nдоступні для всіх інших користувачів для перегляду та вдосконалення.\n\nЯкщо ви не можете закінчити ваші правки за один раз, ви можете лишити\nвікно з редактором відкритим і повернутись (на тому самому комп’ютері та\nоглядачі) до роботи потім — редактор запропонує вам відновити вашу\nроботу.\n", "roads": "# Дороги\n\nВи можете створювати, виправляти та вилучати дороги з допомогою\nцього редактора. Дороги можуть бути будь-якого типу: автомагістралі, \nстежки, велодоріжки та багато інших — все що частіше за все має\nперетин між собою, повинне бути нанесено на мапу.\n\n### Виділення\n\nКлацніть по дорозі для того щоб її вибрати. Вона стані підсвіченою\nпо всій довжині, поряд на мапі з’явиться невеличке меню з інструментами,\nа на бічній панелі буде показано додаткову інформацію про дорогу.\n\n### Зміна\n\nДоволі часто вам будуть траплятись дороги, що не співпадають із дорогами\nна супутниковому знімку чи треками GPS. Ви можете виправити їх положення.\nАле з початку вирівняйте положення знімку по треках GPS. \n\nПотім клацніть по дорозі, яку ви маєте намір змінити. Вона стане підсвіченою\nі на ній з’являться контрольні точки, які можна рухати, підлаштовуючи положення\nта форму дороги. Якщо вам потрібно додати нову точку, для підвищення деталізації,\nдодайте її подвійним клацанням на відрізку дороги. \n\nЯкщо дорога повинна з’єднуватись з іншою дорогою, але на мапі лінії не\nз’єднані, підтягніть одну із контрольних точок однієї дорого до іншої, для\nїх з’єднання. Мати з’єднані дороги — дуже важливо для мапи, а особливо\nдля впровадження можливості прокладання маршрутів.\n\nВи також можете обрати інструмент 'Перемістити' або натиснути 'M' для \nпереміщення всієї дороги, повторне клацання зберігає нове положення\nдороги.\n\n### Вилучення\n\nЯкщо дороги накреслені зовсім невірно і це добре видно по супутникових\nзнімках, а, в ідеалі, ви точно знаєте що їх у цьому місці немає — ви можете\nїх вилучити, що призведе до їх вилучення з мапи. Проте будьте уважними,\nвилучення, як і інші виправлення, призведуть до змін на мапі, що доступна\nкожному; також зауважте, що супутникові знімки з часом застарівають, отже\nновозбудована дорога буде на них відсутня. \n\nВи можете вилучити дорогу клацнувши на неї для виділення, потім натиснувши\nна значок із смітником чи натиснувши клавішу 'Delete'.\n\n### Створення\n\nЩо робити — знайшли місце де повинна бути дорога, а її там немає? Оберіть \nінструмент 'Лінія' зверху ліворуч або натисніть клавішу '2' для того, щоб\nрозпочати креслення ліній.\n\nКлацніть на початку дороги на мапі для того, щоб розпочати креслення. Якщо\nдорога відгалужується від існуючої дороги, розпочніть з місця їх з’єднання.\n\nПотім клацайте вздовж дороги так щоб утворився правильний шлях, відповідно\nдо супутникових знімків та/чи треків GPS. Якщо дорога, яку ви креслите, перетинає\nіншу дорогу, з’єднуйте їх клацаючи в точці їх перехрещення. Для закінчення\nкреслення виконайте подвійне клацання мишею чи натисніть 'Enter' на \nклавіатурі.\n", - "gps": "# GPS\n\nGPS дані є найбільш надійним джерелом даних для OpenStreetMap.\nЦей редактор підтримує роботу з локальними треками  — файлами `.gpx`\nз вашого комп’ютера. Ви можете отримати GPS треки за допомогою\nчисленних застосунків для смартфонів так само, як і з допомогою\nспеціального GPS-обладнання. \n\nДля того, щоб дізнатись як проводити збір GPS даних прочитайте\n[Збір інформації за допомогою GPS](http://learnosm.org/en/beginner/using-gps/).\n\nДля того, щоб скористатись GPX треками, перетягніть файл GPX у\nредактор мап. Після того, як його буде розпізнано, він буде доданий\nна мапу у вигляді лінії світло-зеленого кольору. Клацніть на меню\n'Налаштування фону' ліворуч для того, щоб показати, чи приховати,\nабо масштабувати новий шар з GPX.\n\nGPX трек не буде завантажений безпосередньо до OpenStreetMap,\nкращий спосіб його використання — креслити об’єкти на мапі,\nвикористовуючи його як орієнтир для додавання об’єктів. \nТакож його можна [вивантажити до OpenStreetMap](http://www.openstreetmap.org/trace/create), щоб \nним могли користуватись інші.\n", - "imagery": "# Фон\n\nАерофотознімки є важливим джерелом для картографування. Знімки\nзроблені з літака, супутника, а також з отримані з відкритих джерел\nдоступні в редакторі в меню 'Налаштування фону' ліворуч.\n\nТиповим шаром, який містить супутникові знімки є [Bing Maps](http://www.bing.com/maps/).\nРухаючись мапою до інших місць ви можете отримати фонові зображення\nз інших джерел. Деякі країни, Сполучені Штати, Франція, Данія, мають\nдуже високоякісні знімки певних територій.\n\nФонове зображення іноді є зміщеним від даних мапи, що є помилкою\nз боку постачальників знімків. Якщо ви помітили, що дороги є зміщеними\nвідносно до фонового зображення, не кидайтесь негайно пересувати їх\nтак, щоб вони співпали із дорогами на знімку. Замість цього спробуйте\nпідлаштувати положення фону, так щоб він співпав із даними. Для цього\nскористуйтесь підменю 'Виправити зсув' наприкінці меню 'Налаштування\nфону'.\n", + "gps": "# GPS\n\nGPS дані є найбільш надійним джерелом даних для OpenStreetMap.\nЦей редактор підтримує роботу з локальними треками — файлами `.gpx`\nз вашого комп’ютера. Ви можете отримати GPS треки за допомогою\nчисленних застосунків для смартфонів так само, як і з допомогою\nспеціального GPS-обладнання. \n\nДля того, щоб дізнатись як проводити збір GPS даних прочитайте\n[Збір інформації за допомогою GPS](http://learnosm.org/en/beginner/using-gps/).\n\nДля того, щоб скористатись GPX треками, перетягніть файл GPX у\nредактор мап. Після того, як його буде розпізнано, він буде доданий\nна мапу у вигляді лінії світло-зеленого кольору. Клацніть на меню\n'Налаштування тла' праворуч для того, щоб показати, приховати чи\nмасштабувати новий шар з GPX.\n\nGPX трек не буде завантажений безпосередньо до OpenStreetMap,\nкращий спосіб його використання — креслити об’єкти на мапі,\nвикористовуючи його як орієнтир для додавання об’єктів. \nТакож його можна [вивантажити до OpenStreetMap](http://www.openstreetmap.org/trace/create), щоб \nним могли користуватись інші.\n", + "imagery": "# Тло\n\nВикористання аерофотознімків є важливим засобом картографування.\nЗнімки, зроблені з літака, супутника, а також отримані з відкритих джерел\nдоступні в редакторі у меню 'Налаштування тла' праворуч.\n\nТипово вибраним шаром з супутниковими знімками є [Bing Maps](http://www.bing.com/maps/),\nале у різних місцях та на різних масштабах будуть доступні й інші джерела.\nДеякі країни, як, наприклад, Сполучені Штати, Франція, Данія,\nмають дуже високоякісні знімки певних територій.\n\nЗображення тла іноді є зміщеним відносно даних мапи через помилки\nпостачальників знімків. Якщо ви помітили, що дороги є зміщеними\nвідносно знімків, не кидайтесь пересувати їх так, щоб вони співпали \nз дорогами на знімку. Спробуйте спочатку підлаштувати положення тла так,\nщоб воно співпадало з даними за допомогою підменю 'Виправити зсув'\nнаприкінці меню 'Налаштування тла'.\n", "addresses": "# Адреси\n\nАдреси є однією з найважливіших видів інформації на мапі.\n\nХоча адреси часто представляються як частини вулиць, в OpenStreetMap \nвони записані як атрибути будівель і місць вздовж вулиць.\n\nВи можете додавати інформацію з адресою до будівель, що позначені\nполігонами, так само як і до будівель позначених точками. Найкращим\nджерелом інформації про адреси є проведення досліджень на місцевості,\nабо ваші особисті знання про об’єкти, що знаходяться поруч з вами,\nадже як і вся інша інформація в проекті, вона не повинна бути скопійована\nз комерційних/закритих джерел. Копіювання, наприклад з Google Maps,\nє суворо забороненим.\n", - "inspector": "# Використання Інспектора\n\nІнспектор — елемент інтерфейсу, який з’являється праворуч,\nколи виділяється об’єкт, який дозволяє вам правити атрибути об’єкту.\n\n### Вибір типів об’єкта\n\nПісля того, як ви додали точку, лінію, чи полігон, ви можете вибрати\nтип об’єкту, чи це автомагістраль чи дорога місцевого значення,\nсупермаркет або кафе. Інспектор запропонує вам обрати серед\nрізних типів, також, ви можете пошукати потрібний тип об’єкта\nчерез пошуковий рядок.\n\nНатисніть на прапорець у правому нижньому куті кнопки об’єкта, \nщоб отримати більше відомостей про нього. Натисніть на кнопку,\nщоб застосувати обраний тип до об’єкта.\n\n### Використання форм та редагування теґів\n\nПісля того, як ви обрали тип об’єкта, чи коли ви виділили об’єкт,\nтип якого вже був заданий, інспектор покаже поля властивостей,\nтакі як назва та адреса.\n\nНижче, під ними ви побачите рядок значків для додавання інших\nдеталей: посилання на [Wikipedia](http://www.wikipedia.org/), вказання\nна можливість пересування інвалідним візком та т.і.\n\nВнизу інспектора натисніть на 'Додаткові теґи', щоб додати до\nоб’єкта довільні теґи. [Taginfo](http://taginfo.openstreetmap.org/) є\nгарним джерелом для того, щоб дізнатись про поширені комбінації\nзастосування теґів.\n\nЗміни, які ви робите в інспекторі, автоматично застосовуються до мапи.\nВи можете скасувати їх натиснувши на кнопку 'відмінити'\n\n### Вихід із інспектора\n\nВи можете закрити інспектор, натиснувши на клавішу закриття\nвгорі праворуч, натиснувши 'Escape', чи клацнувши на мапі.\n", + "inspector": "# Використання Інспектора\n\nІнспектор — частина інтерфейсу ліворуч, що дозволяє змінювати \nдеталі виділеного об’єкта.\n\n### Вибір типу об’єкта\n\nПісля додавання точки, лінії чи полігону, ви можете вибрати\nтип об’єкта. Наприклад, це може бути автомагістраль, вулиця,\nсупермаркет або кафе. Інспектор запропонує вам обрати серед\nнайпопулярніших типів, а також ви можете пошукати потрібний\nтип об’єкта, увівши його назву у пошуковий рядок.\n\nНатисніть на кнопку \"i\" праворуч від типу, щоб дізнатися більше\nпро нього. Натисніть на тип, щоб застосувати його до об’єкта.\n\n### Використання форм та редагування теґів\n\nПісля вибору типу нового об’єкта чи виділення вже існуючого об’єкта\nпевного типу інспектор покаже поля властивостей, наприклад, \nназву та адресу.\n\nНижче ви побачите рядок значків для додавання інших деталей:\nпосилання на [Wikipedia](http://www.wikipedia.org/), вказання на можливість\nпересування інвалідним візком, та інші.\n\nЩоб додати до об’єкта довільні теґи, потрібно розкрити пункт 'Всі теґи' \nвнизу інспектора. \n[Taginfo](http://taginfo.openstreetmap.org/) є хорошим джерелом інформації про поширені\nкомбінації застосування теґів.\n\nЗміни, які ви здійснюєте у інспекторі, автоматично застосовуються до мапи.\nВи можете скасувати їх, натиснувши кнопку 'Відмінити'.\n", "buildings": "# Будівлі\n\nOpenStreetMap — є найбільшою в світі базою даних будівель. Ви можете\nпримати участь у її створенні та покращенні.\n\n### Виділення\n\nДля того, щоб виділити будівлю, потрібно клацнути на її контурі. Вона\nстане підсвіченою і поруч з’явиться невеличке меню з інструментами, а\nна боковій панелі — докладна інформація про будівлю.\n\n### Змінення\n\nІноді будівлі неточно розміщенні або мають неправильні теґи.\n\nДля того, щоб пересунути будівлю, виділіть її, клацніть на інструмент\n'Переміщення'. Рухайте мишею, щоб пересунути будівлю на нове місце,\nпісля чого клацніть мишею ще раз.\n\nДля того щоб надати будівлі певної форми, перетягуйте точки її контуру\nдо досягнення бажаного результату.\n\n\n### Створення\n\nОдне із питань є в тому, що OpenStreetMap підтримує обидва варіанти \nбудівель: у вигляді полігонів та точок. Основне правило полягає в тому,\nщо _наносити будівлі потрібно у вигляді полігонів, якщо це можливо_, а\nкомпанії, помешкання, зручності та інші речі, які розташовані в будинках —\nточками в межах полігону будівлі.\n\nДля того, щоб розпочати креслення будівлі, оберіть інструмент 'Полігон'\nзверху ліворуч, для закінчення креслення натисніть або 'Return' на \nклавіатурі чи клацнувши на першій точці для замкнення полігону.\n\n### Вилучення\n\nЯкщо будівля є зовсім неправильною — її немає на супутниковому знімку\nта, в ідеалі, це підтверджено дослідженнями на місцевості — ви можете\nїї вилучити, що призведе до її зникнення з мапи. Будьте обережні, \nвилучаючи об’єкти, ці дії, так само як і інші зміни вони будуть видимі\nвсім іншим; до того ж супутникові знімки можуть бути застарілими, отже\nновозбудовані будівлі будуть на них відсутні.\n\nДля того, щоб вилучити будівлі, виділіть її, потім натисніть на значок із\nзображенням смітника чи натисніть клавішу 'Delete'.\n", "relations": "# Зв’язки\n\nЗв’язки є певним типом об’єктів в OpenStreetMap, які складаються з інших\nоб’єктів. Наприклад, двома найпоширенішими типами зв’язків є *маршрути*,\nдо складу яких входять частини доріг, по яких проходить певна автомагістраль,\nта *мультиполігони*, які об’єднують кілька різних ліній для утворення об’єкта\nскладної форми (наприклад, такий що складається із кількох частин, або\nмає дірку, як бублик).\n\nОб’єкти в зв’язку називаються *членами*. На боковій панелі ви можете\nбачити членом якого зв’язку є об’єкт, та клацнувши на зв’язок, маєте\nможливість виділити його. Коли зв’язок виділено, ви можете побачити всіх\nйого членів на боковій панелі, зв’язок також буде підсвічений на мапі.\n\nУ більшості випадків iD піклується про автоматичну обробку зв’язків\nпід час редагування. Головне, що потрібно запам’ятати, так це те, якщо\nви вилучите лінію, для того, щоб її нанести точніше, вам треба переконатись\nв тому, що нова лінія буде включена до складу того ж зв’язку, що й \nоригінальна.\n\n## Редагування зв’язків\n\nТут ви можете ознайомитись із основами редагування зв’язків.\n\nДля того, щоб додати об’єкт до зв’язку, натисніть на кнопку «+» в розділі\n«Всі зв’язки» на боковій панелі та оберіть тип та назву зв’язку.\n\nЩоб створити новий зв’язок, виділіть об’єкт, який повинен входити до його\nскладу, натисніть «+» в розділі «Всі зв’язки» та оберіть «Новий зв’язок…».\n\nДля вилучення об’єкта зі зв’язку — виділіть об’єкт та натисніть на значок\nсмітника поруч із зв’язком, з якого ви бажаєте вилучити об’єкт.\n\nВи можете створити мультиполігон із дірками інструментом «Об’єднати». Накресліть\nдва полігони (зовнішній та внутрішній), виділіть їх утримуючи натиснутим Shift,\nпотім натисніть на клавішу «Об’єднати» (+).\n" }, "intro": { "navigation": { "title": "Пересування", - "drag": "На основній мапі показуються дані OpenStreetMap поверх фонового зображення. Ви можете рухатись мапою перетягуючи її так само, як і на будь якій іншій веб-мапі. **Потягніть мапу!**", + "drag": "На основній області редагування мапи показуються дані OpenStreetMap над зображенням тла. Ви можете рухатись мапою перетягуючи її так само, як і на будь якій іншій веб-мапі. **Потягніть мапу!**", "select": "Об’єкти мапи представлені трьома способами: точками, лініями та полігонами. Для того щоб їх виділити треба клацнути по них. **Клацніть на точку для її виділення.**", "header": "В заголовку показується тип об’єкта.", "pane": "Коли об’єкт мапи виділено, з’являється редактор його властивостей. В заголовку буде показаний тип об’єкта, а на головній панелі — атрибути об’єкта, такі як його назва та адреса. **Закрийте редактор об’єктів натиснувши на кнопку вгорі праворуч.**" @@ -368,7 +373,7 @@ "intersect": "Клацніть, щоб додати ще кілька точок до лінії. Ви можете перетягувати мапу під час креслення у разі потреби. Дороги, та багато ліній інших типів є частиною великих мереж. Тому дуже важливо, щоб вони були правильно з’єднані одна з одною для того, щоб можливо було прокласти по них маршрут. **Клацніть на Flower Street, для того, щоб створити перехрещення, що з’єднує дві лінії.**", "finish": "Закінчити креслення лінії можна клацнувши на її останню точку знов. **Закінчіть креслення дороги.**", "road": "**Виберіть Дороги зі списку**", - "residential": "Існує багато різних типів доріг, найбільш уживаним є Дорога місцевого значення. **Виберіть Дорогу місцевого значення** ", + "residential": "Існує багато різних типів доріг, найбільш уживаним є Вулиця. **Виберіть Вулицю** ", "describe": "**Додайте назву дорозі та закрите редактор об’єктів.**", "restart": "Дорога повинна з’єднуватись з Flower Street", "wrong_preset": "Ви не не обрали тип дороги «Дорога місцевого значення». **Спробуйте ще раз**" @@ -396,9 +401,6 @@ }, "category-route": { "name": "Маршрути" - }, - "category-water": { - "name": "Вода" } }, "fields": { @@ -661,7 +663,7 @@ "label": "Тип" }, "ref": { - "label": "Посилання" + "label": "Номер" }, "relation": { "label": "Тип" @@ -765,19 +767,19 @@ "presets": { "address": { "name": "Адреса", - "terms": "Address, flhtcf, місце" + "terms": "Address, адреса, місце" }, "aeroway": { "name": "Аеропорт", - "terms": "Aeroway, fthjgjhn, повітряний транспорт,повітряне сполучення" + "terms": "Aeroway, аеропорт, повітряний транспорт,повітряне сполучення" }, "aeroway/aerodrome": { "name": "Аеропорт", - "terms": "Airport, fthjgjhn, аеродром, летовище" + "terms": "Airport, аеропорт, аеродром, летовище" }, "aeroway/apron": { "name": "Перон", - "terms": "Apron, gthjy" + "terms": "Apron, перон" }, "aeroway/gate": { "name": "Вихід на посадку", @@ -873,7 +875,7 @@ }, "amenity/drinking_water": { "name": "Питна вода", - "terms": "Drinking Water, gbnyf djlf" + "terms": "Drinking Water, gbnyf djlf, бювет" }, "amenity/embassy": { "name": "Амбасада", @@ -915,10 +917,6 @@ "name": "Ринок", "terms": "Marketplace, hbyjr,базар,базарна площа" }, - "amenity/parking": { - "name": "Стоянка", - "terms": "Parking, cnjzyrf,парковка,паркування" - }, "amenity/pharmacy": { "name": "Аптека", "terms": "Pharmacy, fgntrf,ліки,фармація" @@ -1479,6 +1477,10 @@ "name": "Маяк", "terms": "Lighthouse,vfzr,сигнал,вогонь" }, + "man_made/observation": { + "name": "Оглядова вежа", + "terms": "Observation tower, jukzljdf dtf, пожежна вишка" + }, "man_made/pier": { "name": "Пірс", "terms": "Pier,gshc,причал" @@ -1595,6 +1597,30 @@ "name": "Офіс", "terms": "Office,jasc" }, + "office/accountant": { + "name": "Бухгалтерська або аудиторська фірма", + "terms": "Бухгалтерська або аудиторська фірма, eufknthcmrf fj felbnjhcmrf ashvf, Accountant" + }, + "office/architect": { + "name": "Архітектурне або дизайнерське бюро", + "terms": "архітектор, Архітектурне або дизайнерське бюро, fhsntrnehyt fj lbpfqythcmrt hj, Architect" + }, + "office/company": { + "name": "Офіс компанії", + "terms": "фірма, підприємство, контора, бюро, юридична особа, Офіс компанії, jasc rjvgfys, Company Office" + }, + "office/educational_institution": { + "name": "Офіс освітнього закладу", + "terms": "Офіс освітнього закладу, jasc jcdsnymjuj pfrkfle, Educational Institution" + }, + "office/employment_agency": { + "name": "Кадрова агенція", + "terms": "працевлаштування, робота, пошук роботи, рекрутингова агенція, Кадрова агенція, rflhjdf futywsz, Employment Agency" + }, + "office/estate_agent": { + "name": "Агенція з нерухомості", + "terms": "ріелтор, Агенція з нерухомості, futywsz p ythejvjcns, Real Estate Office" + }, "place": { "name": "Місцевість", "terms": "Place,vscwtdscnm" @@ -1640,8 +1666,12 @@ "terms": "Power Generator,tktrnhjcnfywsz" }, "power/line": { - "name": "Лінія електропередач", - "terms": "Power Line,ksysz tktrnhjgthtlfx" + "name": "Лінія електропередачі високої напруги", + "terms": "Power Line,ksysz tktrnhjgthtlfxs dbcjrj yfgheub, Лінія електропередачі високої напруги, ЛЕП" + }, + "power/minor_line": { + "name": "Лінія електропередачі середньої напруги", + "terms": "Minor Power Line, ksysz tktrnhjgthtlfxs cthtlymj yfghueb, Лінія електропередачі середньої напруги, ЛЕП" }, "power/pole": { "name": "Опора", @@ -1855,6 +1885,10 @@ "name": "Пральня", "terms": "Laundry,ghfkmyz" }, + "shop/locksmith": { + "name": "Виготовлення ключів", + "terms": "Locksmith,rkxs,ключі" + }, "shop/mall": { "name": "Торгівельний центр", "terms": "Mall,njhusdtkmybq wtynh" @@ -1887,6 +1921,10 @@ "name": "Товари для тварин", "terms": "Pet Store,njdfhb lkz ndfhby" }, + "shop/photo": { + "name": "Фототовари", + "terms": "Photography Store, ajnjnjdfhb" + }, "shop/shoes": { "name": "Взуття", "terms": "Shoe Store,dpennz" diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json index 8e33cc354..77d53a886 100644 --- a/vendor/assets/iD/iD/locales/vi.json +++ b/vendor/assets/iD/iD/locales/vi.json @@ -83,7 +83,8 @@ "annotation": { "line": "làm vuông góc một đường kẻ", "area": "làm vuông góc một vùng" - } + }, + "not_squarish": "Không thể làm vuông một đối tượng không phải vuông vuông." }, "straighten": { "title": "Làm thẳng", @@ -246,18 +247,21 @@ "back_tooltip": "Thay đổi đối tượng", "remove": "Xóa", "search": "Tìm kiếm", + "multiselect": "Các đối tượng được chọn", "unknown": "Không rõ", "incomplete": "", "feature_list": "Tìm kiếm đối tượng", - "edit": "Sá»­a đối tượng" + "edit": "Sá»­a đối tượng", + "none": "Không có" }, "background": { "title": "Hình nền", "description": "Tùy chọn Hình nền", "percent_brightness": "Độ sáng {opacity}%", + "none": "Không có", "custom": "Tùy biến", "custom_prompt": "Đưa vào định dạng URL của các mảnh bản đồ. Bạn có thể sá»­ dụng các dấu hiệu {z}, {x}, {y} cho định dạng Z/X/Y hoặc {u} cho định dạng quadtile.", - "fix_misalignment": "Chỉnh lại hình nền bị chệch", + "fix_misalignment": "Điều chỉnh lại", "reset": "đặt lại" }, "restore": { @@ -317,7 +321,9 @@ "cannot_zoom": "Không thể thu nhỏ hÆ¡n trong chế độ hiện tại.", "gpx": { "local_layer": "Tập tin GPX địa phÆ°Æ¡ng", - "drag_drop": "Kéo thả một tập tin .gpx vào trang" + "drag_drop": "Kéo thả một tập tin .gpx vào trang hoặc bấm nút bên phải để duyệt", + "zoom": "Phóng vừa tuyến đường GPX", + "browse": "Chọn một tập tin .gpx" }, "help": { "title": "Trợ giúp", @@ -325,9 +331,9 @@ "editing_saving": "# Sá»­a đổi & LÆ°u giữ\n\nĐây là một chÆ°Æ¡ng trình vẽ trá»±c tuyến, hiện tại bạn đang truy cập nó qua một trang Web.\n\n### Lá»±a chọn Đối tượng\n\nĐể lá»±a chọn một đối tượng, thí dụ con đường hay một điểm, nhấn chuột vào nó trên bản đồ. Khi đối tượng được chọn, bạn sẽ thấy một biểu mẫu ở bên phải chứa các chi tiết về đối tượng, cÅ©ng nhÆ° một trình đơn giống bảng màu của họa sÄ© chứa các tác vụ để thá»±c hiện với đối tượng.\n\nĐể lá»±a chọn nhiều đối tượng cùng lúc, nhấn giữ phím Shift và nhấn chuột vào từng đối tượng một. Thay thế, nhấn giữ Shift và kéo chuột trên bản đồ để vẽ hộp bao. Các đối tượng nằm vào hộp này sẽ được chọn.\n\n### LÆ°u giữ Sá»­a đổi\n\nKhi bạn sá»­a đổi các tuyến đường, tòa nhà, và địa điểm, các thay đổi này được lÆ°u giữ trên máy cho đến khi bạn đăng nó lên máy chủ. Đừng lo nhầm lẫn: chỉ việc nhấn vào các nút Hoàn tác và Làm lại.\n\nNhấn “LÆ°u” để hoàn thành các sá»­a đổi, thí dụ bạn vừa vẽ xong một khu và muốn bắt đầu vẽ khu mới. Trình vẽ sẽ trình bày các thay đổi để bạn xem lại, cÅ©ng nhÆ° các gợi ý và cảnh báo nếu bạn đã sá»­a nhầm lẫn.\n\nSau khi vẽ xong, bạn sẽ nhập lời tóm lược các thay đổi và nhấn “LÆ°u” lần nữa để đăng các thay đổi lên [OpenStreetMap.org](http://www.openstreetmap.org/). Các thay đổi sẽ xuất hiện tại trang web này để mọi người xem và cập nhật nếu có sai sót.\n\nNếu bạn chÆ°a xong mà cần rời khỏi máy tính, bạn có thể đóng trình vẽ này. Lần sau trở lại, trình vẽ này sẽ cho phép khôi phục các thay đổi chÆ°a lÆ°u của bạn (miễn là bạn sá»­ dụng cùng máy tính và trình duyệt).\n", "roads": "# Đường sá\n\nTrình vẽ này cho phép tạo, sá»­a, và xóa các con đường. Con đường không nhất thiết phải là đường phố: có thể vẽ đường cao tốc, đường mòn, đường đi bộ, đường xe đạp…\n\n### Lá»±a chọn\n\nNhấn vào con đường để lá»±a chọn nó. Con đường sẽ được tô sáng, một trình đơn công cụ sẽ xuất hiện bên cạnh đường, và thanh bên sẽ trình bày các chi tiết của con đường.\n\n### Sá»­a đổi\n\nNhiều khi bạn sẽ gặp những con đường bị chệch đối với hình nền hoặc tuyến đường GPS. Bạn có thể chỉnh lại các con đường này để chính xác hÆ¡n.\n\nTrước tiên, nhấn vào con đường cần chỉnh lại. Đường sẽ được tô sáng và các nốt sẽ xuất hiện để bạn kéo sang vị trí đúng hÆ¡n. Để thêm chi tiết, nhấn đúp vào một khúc đường chÆ°a có nốt, và một nốt mới sẽ xuất hiện để bạn kéo.\n\nNếu con đường nối với đường khác trên thá»±c tiếp, nhÆ°ng trên bản đồ thì chÆ°a nối liền, hãy kéo một nốt của một con đường sang đường kia để nối liền hai con đường. Nối liền các đường tại giao lộ là một điều rất quan trọng tăng khả năng chỉ đường.\n\nĐể di chuyển toàn bộ con đường cùng lúc, nhấn vào công cụ “Di chuyển” hoặc nhấn phím tắt `M`, chuyển chuột sang vị trí mới, rồi nhấn chuột để hoàn thành việc di chuyển.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một con đường hoàn toàn sai: bạn không thấy được con đường trong hình ảnh trên không và, theo lý tưởng, cÅ©ng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa con đường hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống nhÆ° mọi sá»­a đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – con đường có thể mới xây – thành thá»­ tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một con đường, lá»±a chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n\n### Tạo mới\n\nBạn có tìm ra một con đường chÆ°a được vẽ trên bản đồ? Hãy bắt đầu vẽ đường kẻ mới bằng cách nhấn vào nút “Đường” ở phía trên bên trái của trình vẽ, hoặc nhấn phím tắt `2`.\n\nNhấn vào bản đồ tại điểm bắt đầu của con đường. Hoặc nếu con đường chia ra từ đường khác đã tồn tại, trước tiên nhấn chuột tại giao lộ giữa hai con đường này.\n\nSau đó, nhấn chuột lần lượt theo lối đường dùng hình ảnh trên không hoặc tuyến đường GPS. Khi nào con đường giao với đường khác, nhấn chuột tại giao lộ để nối liền hai con đường này. Sau khi vẽ xong, nhấn đúp vào nốt cuối dùng hoặc nhấn phím Return hay Enter.\n", "gps": "# GPS\n\nHệ thống định vị toàn cầu, còn gọi GPS, là nguồn dữ liệu tin tưởng nhất trong dá»± án OpenStreetMap. Trình vẽ này hỗ trợ các tuyến đường thu thập được từ máy GPS, tức tập tin `.gpx` trên máy tính của bạn. Bạn có thể thu loại tuyến đường GPS này bằng một ứng dụng cài đặt trên điện thoại thông minh hoặc máy thu GPS, chẳng hạn máy Garmin.\n\nĐọc thêm về cách thu thập dữ liệu bằng GPS tại “[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)”.\n\nĐể sá»­ dụng một tuyến đường GPX trong việc vẽ bản đồ, kéo thả tập tin GPX vào trình vẽ bản đồ này. Nếu trình vẽ nhận ra tuyến đường, tuyến đường sẽ được tô màu xanh nõn chuối trên bản đồ. Mở hộp “Tùy chọn Hình nền” ở thanh công cụ bên phải để bật tắt hoặc thu phóng lớp GPX này.\n\nTuyến đường GPX không được tải lên OpenStreetMap trá»±c tiếp. Cách tốt nhất để sá»­ dụng nó là vạch đường theo nó trên bản đồ, cÅ©ng nhÆ° [tải nó lên OpenStreetMap](http://www.openstreetmap.org/trace/create) để cho người khác sá»­ dụng.\n", - "imagery": "# Hình ảnh\n\nẢnh hàng không (chụp từ máy bay, vệ tinh) là tài nguyên quan trọng trong việc vẽ bản đồ. Có sẵn một số nguồn hình ảnh từ máy bay, vệ tinh, và dịch vụ mở trong trình vẽ này, dưới trình đơn “Tùy chọn Hình nền” ở bên trái.\n\nTheo mặc định, trình vẽ hiển thị lớp trên không của [Bản đồ Bing](http://www.bing.com/maps/), nhÆ°ng có sẵn nguồn khác tùy theo vị trí đang xem trong trình duyệt. Ngoài ra có hình ảnh rất rõ tại nhiều vùng ở một số quốc gia nhÆ° Hoa Kỳ, Pháp, và Đan Mạch.\n\nHình ảnh đôi khi bị chệch đối với dữ liệu bản đồ vì dịch vụ hình ảnh có lỗi. Nếu bạn nhận thấy nhiều con đường bị chệch đối với hình nền, xin đừng di chuyển các đường này để trùng hợp với hình ảnh. Thay vì di chuyển các con đường, hãy chỉnh lại hình ảnh để phù hợp với dữ liệu tồn tại bằng cách nhấn “Chỉnh lại hình nền bị chệch” ở cuối hộp Tùy chọn Hình nền.\n", + "imagery": "# Hình ảnh\n\nẢnh hàng không là tài nguyên quan trọng trong việc vẽ bản đồ. Có sẵn một số nguồn hình ảnh chụp từ máy bay và vệ tinh, cÅ©ng nhÆ° một số nguồn thông tin mở, trong trình đơn “Tùy chọn Hình nền” ở bên phải của trình vẽ này.\n\nTheo mặc định, trình vẽ hiển thị lớp trên không của [Bản đồ Bing](http://www.bing.com/maps/), nhÆ°ng có sẵn nguồn khác tùy theo vị trí đang xem trong trình duyệt. Ngoài ra có hình ảnh rất rõ tại nhiều vùng ở một số quốc gia nhÆ° Hoa Kỳ, Pháp, và Đan Mạch.\n\nHình ảnh đôi khi bị chệch đối với dữ liệu bản đồ vì dịch vụ hình ảnh có lỗi. Nếu bạn nhận thấy nhiều con đường bị chệch đối với hình nền, xin đừng di chuyển các đường này để trùng hợp với hình ảnh. Thay vì di chuyển các con đường, hãy chỉnh lại hình ảnh để phù hợp với dữ liệu tồn tại bằng cách nhấn “Chỉnh lại hình nền bị chệch” ở cuối hộp Tùy chọn Hình nền.\n", "addresses": "# Địa chỉ\n\nĐịa chỉ là những thông tin rất cần thiết trên bản đồ.\n\nTuy bản đồ thường trình bày các địa chỉ nhÆ° một thuộc tính của đường sá, nhÆ°ng OpenStreetMap liên kết các địa chỉ với các tòa nhà hoặc miếng đất dọc đường.\n\nBạn có thể thêm thông tin địa chỉ vào các hình dạng tòa nhà hoặc các địa điểm quan tâm. Tốt nhất là lấy thông tin địa chỉ từ kinh nghiệm cá nhân, thí dụ đi dạo trên phố và ghi chép các địa chỉ hoặc nhớ lại những chi tiết từ hoạt động hàng ngày của bạn. CÅ©ng nhÆ° bất cứ chi tiết nào, dá»± án này hoàn toàn cấm sao chép từ các nguồn thÆ°Æ¡ng mại nhÆ° Bản đồ Google.\n", - "inspector": "# Biểu mẫu\n\nBiểu mẫu là hộp xuất hiện ở bên phải của trang khi nào một đối tượng được chọn. Biểu mẫu này cho phép sá»­a đổi các chi tiết của các đối tượng được chọn.\n\n### Chọn Thể loại\n\nSau khi thêm địa điểm, đường kẻ, hoặc vùng vào bản đồ, bạn có thể cho biết đối tượng này tượng trÆ°ng cho gì, chẳng hạn con đường, siêu thị, hoặc quán cà phê. Biểu mẫu trình bày các nút tiện để chọn các thể loại đối tượng thường gặp, hoặc bạn có thể gõ một vài chữ mô tả vào hộp tìm kiếm để tìm ra các thể loại khác.\n\nNhấn vào hình dấu trang ở phía dưới bên phải của một nút thể loại để tìm hiểu thêm về thể loại đó. Nhấn vào nút để chọn thể loại đó.\n\n### Điền đơn và Gắn thẻ\n\nSau khi bạn chọn thể loại, hoặc nếu chọn một đối tượng đã có thể loại, biểu mẫu trình bày các trường văn bản và điều khiển để xem và sá»­a các thuộc tính của đối tượng nhÆ° tên và địa chỉ.\n\nỞ dưới các điều khiển có một số hình tượng có thể nhấn để thêm chi tiết, chẳng hạn tên bài [Wikipedia](http://www.wikipedia.org/) và mức hỗ trợ xe lăn.\n\nNhấn vào “Các thẻ năng cao” ở cuối biểu mẫu để gắn bất cứ thẻ nào vào đối tượng. [Taginfo](http://taginfo.openstreetmap.org/) là một công cụ rất hữu ích để tìm ra những phối hợp thẻ phổ biến.\n\nCác thay đổi trong biểu mẫu được tá»± động áp dụng vào bản đồ. Bạn có thể nhấn vào nút “Hoàn tác” vào bất cứ lúc nào để hoàn tác các thay đổi.\n\n### Đóng Biểu mẫu\n\nĐể đóng biểu mẫu, nhấn vào nút Đóng ở phía trên bên phải, nhấn phím Esc, hoặc nhấn vào một khoảng trống trên bản đồ.\n", + "inspector": "# Biểu mẫu\n\nBiểu mẫu là hộp ở bên trái của trang cho phép sá»­a đổi các chi tiết của các đối tượng được chọn.\n\n### Chọn Thể loại\n\nSau khi thêm địa điểm, đường kẻ, hoặc vùng vào bản đồ, bạn có thể cho biết đối tượng này tượng trÆ°ng cho gì, chẳng hạn con đường, siêu thị, hoặc quán cà phê. Biểu mẫu trình bày các nút tiện để chọn các thể loại đối tượng thường gặp, hoặc bạn có thể gõ một vài chữ mô tả vào hộp tìm kiếm để tìm ra các thể loại khác.\n\nNhấn vào hình dấu trang ở phía dưới bên phải của một nút thể loại để tìm hiểu thêm về thể loại đó. Nhấn vào nút để chọn thể loại đó.\n\n### Điền đơn và Gắn thẻ\n\nSau khi bạn chọn thể loại, hoặc nếu chọn một đối tượng đã có thể loại, biểu mẫu trình bày các trường văn bản và điều khiển để xem và sá»­a các thuộc tính của đối tượng nhÆ° tên và địa chỉ.\n\nỞ dưới các điều khiển có một số hình tượng có thể nhấn để thêm chi tiết, chẳng hạn tên bài [Wikipedia](http://www.wikipedia.org/) và mức hỗ trợ xe lăn.\n\nNhấn vào “Các thẻ năng cao” ở cuối biểu mẫu để gắn bất cứ thẻ nào vào đối tượng. [Taginfo](http://taginfo.openstreetmap.org/) là một công cụ rất hữu ích để tìm ra những phối hợp thẻ phổ biến.\n\nCác thay đổi trong biểu mẫu được tá»± động áp dụng vào bản đồ. Bạn có thể nhấn vào nút “Hoàn tác” vào bất cứ lúc nào để hoàn tác các thay đổi.\n", "buildings": "# Tòa nhà\n\nOpenStreetMap là cÆ¡ sở dữ liệu tòa nhà lớn nhất trên thế giới. Mời bạn cùng xây dá»±ng và cải tiến cÆ¡ sở dữ liệu này.\n\n### Lá»±a chọn\n\nNhấn vào một vùng tòa nhà để lá»±a chọn nó. Đường biên của vùng sẽ được tô sáng, một trình đơn giống bảng màu của họa sÄ© sẽ xuất hiện gần con trỏ, và thanh bên sẽ trình bày các chi tiết về tòa nhà.\n\n### Sá»­a đổi\n\nĐôi khi vị trí hoặc các thẻ của một tòa nhà không chính xác.\n\nĐể di chuyển toàn bộ tòa nhà cùng lúc, lá»±a chọn vùng, rồi nhấn vào công cụ “Di chuyển”. Chuyển con trỏ sang vị trí mới và nhấn chuột để hoàn thành việc di chuyển.\n\nĐể sá»­a hình dạng của một tòa nhà, kéo các nốt của đường biên sang các vị trí chính xác.\n\n### Vẽ mới\n\nMột trong những điều gây nhầm lẫn là một tòa nhà có thể là vùng hoặc có thể là địa điểm. Nói chung, khuyên bạn _vẽ tòa nhà là vùng nếu có thể_. Nếu tòa nhà chứa hÆ¡n một công ty, chỗ ở, hoặc gì đó có địa chỉ, hãy đặt một địa điểm riêng cho mỗi địa chỉ đó và đưa mỗi địa điểm vào trong vùng của tòa nhà.\n\nĐể bắt đầu vẽ tòa nhà, nhấn vào nút “Vùng” ở phía trên bên trái của trình vẽ. Nhấn chuột tại các góc tường, rồi “đóng” vùng bằng cách nhấn phím Return hay Enter hoặc nhấn vào nốt đầu tiên.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một tòa nhà hoàn toàn sai: bạn không thấy được tòa nhà trong hình ảnh trên không và, theo lý tưởng, cÅ©ng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa tòa nhà hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống nhÆ° mọi sá»­a đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – có thể mới xây tòa nhà – thành thá»­ tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một tòa nhà, lá»±a chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n", "relations": "# Quan hệ\n\nQuan hệ là loại dữ liệu đặc biệt trong OpenStreetMap có khả năng nhóm lại nhiều đối tượng. Có hai loại quan hệ phổ biến nhất: các *quan hệ tuyến đường* nhóm lại các khúc đường trên một xa lộ, còn các *tổ hợp đa giác* (multipolygon) ghép lại một vài đường kẻ định rõ hình dạng của một khu vá»±c có nhiều đa giác riêng hoặc một khu vá»±c có lỗ.\n\nCác đối tượng trá»±c thuộc quan hệ là các *thành viên*. Trong thanh bên, bạn có thể xem đối tượng trá»±c thuộc những quan hệ nào. Nhấn chuột vào một quan hệ ở đấy để chọn nó. Khi nào quan hệ được chọn, các thành viên sẽ được liệt kê trong thanh bên và tô đậm trên bản đồ.\n\nNói chung, iD sẽ tá»± động quản lý các quan hệ trong lúc sá»­a đổi. Bạn chỉ cần chú ý rằng, khi nào bạn xóa một khúc đường để vẽ chính xác hÆ¡n, bạn phải chắc chắn rằng khúc đường mới cÅ©ng trá»±c thuộc cùng quan hệ với khúc đường cÅ©.\n\n## Sá»­a đổi Quan hệ\n\niD cho phép sá»­a đổi các chi tiết cÆ¡ bản của quan hệ.\n\nĐể đưa một đối tượng vào quan hệ, chọn đối tượng, bấm nút “+” trong phần “Tất cả các quan hệ” của thanh bên, và chọn quan hệ từ trình đơn hoặc nhập tên của quan hệ.\n\nĐể tạo một quan hệ mới, chọn đối tượng đầu tiên để đưa vào quan hệ, bấm nút “+” trong phần “Tất cả các quan hệ” của thanh bên, và chọn “Quan hệ mới…”.\n\nĐể tháo gỡ một đối tượng khỏi quan hệ, chọn đối tượng vào nhấn chuột vào hình thùng rác bên cạnh quan hệ mà bạn không muốn bao gồm đối tượng.\n\nDùng công cụ “Gộp” để vẽ tổ hợp đa giác, tức thủng lỗ vào một vùng. Vẽ hai vùng (ứng với cạnh bên trong và bên ngoài), giữ phím Shift trong khi nhấn chuột vào các vùng để chọn chúng, và bấm nút “Gộp” (hình +).\n\n" }, @@ -382,6 +388,9 @@ }, "presets": { "categories": { + "category-building": { + "name": "Tòa nhà" + }, "category-landuse": { "name": "Sá»­ dụng Đất" }, @@ -397,7 +406,10 @@ "category-route": { "name": "Tuyến đường" }, - "category-water": { + "category-water-area": { + "name": "Nước" + }, + "category-water-line": { "name": "Nước" } }, @@ -696,6 +708,9 @@ "shelter": { "label": "Chỗ che" }, + "shelter_type": { + "label": "Kiểu" + }, "shop": { "label": "Kiểu" }, @@ -736,6 +751,9 @@ "trail_visibility": { "label": "Tầm nhìn trên Đường mòn" }, + "tree_type": { + "label": "Loại" + }, "vending": { "label": "Loại Hàng hóa" }, @@ -971,6 +989,10 @@ "name": "Nhà trường", "terms": "trường,trường học,nhà trường,học viện,trường tÆ°,trường tÆ° thá»±c,trường công,trường công lập,tiểu học,trường tiểu học,trung học,trường trung học,trung học cÆ¡ sở,trường trung học cÆ¡ sở,THCS,TTHCS,trung học phổ thông,trường trung học phổ thông,THPT,TTHPT,trung học chuyên nghiệp,trường trung học chuyên nghiệp,THCN,TTHCN,cao đẳng,trường cao đẳng,CĐ,đại học,trường đại học,ĐH,trường dòng,khoa,học,truong,truong hoc,nha truong,hoc vien,truong tu,truong tu thuc,truong cong,truong cong lap,tieu hoc,ttruong tieu hoc,trung hoc,truong trung hoc,truong hoc co so,truong trung hoc co so,trung hoc pho nghiep,cao dang,truong cao dang,CD,dai hoc,truong dai hoc,DH,truong dong,khoa,hoc" }, + "amenity/shelter": { + "name": "Nhà trú", + "terms": "nhà trú,chỗ che chở,nhà trú bão,nhà trú mÆ°a,nhà trú ẩn,điểm trú bão,điểm trú mÆ°a,điểm trú ẩn,túp lều,mái,nóc,cho che cho,nha tru bao,nha tru mua,nha tru an,diem tru bao,diem tru mau,diem tru an,tup leu,mai,noc" + }, "amenity/swimming_pool": { "name": "Hồ BÆ¡i", "terms": "hồ bÆ¡i,hồ tắm,ho boi,ho tam" @@ -1049,7 +1071,7 @@ }, "barrier/gate": { "name": "Cổng", - "terms": "cổng,cong" + "terms": "cổng,cổng vào,cong,cong vao" }, "barrier/hedge": { "name": "Hàng rào Cây", @@ -1135,6 +1157,14 @@ "name": "Cá»­a vào", "terms": "cá»­a vào,lối vào,cua vao,loi vao" }, + "footway/crossing": { + "name": "Lối Băng qua Đường", + "terms": "lối băng qua đường,lối qua đường,đường ngá»±a vằn,loi bang qua duong,loi qua duong,duong ngua van" + }, + "footway/sidewalk": { + "name": "Lề đường", + "terms": "lề đường,vỉa hè,đường đi bộ,đường dạo,le duong,vie he,duong di bo,duong dao" + }, "highway": { "name": "Đường Giao thông", "terms": "đường giao thông,đường,duong giao thong,duong" @@ -1301,7 +1331,7 @@ }, "historic/ruins": { "name": "Tàn tích", - "terms": "Di tích" + "terms": "tàn tích,di tích" }, "historic/wayside_cross": { "name": "Thánh Giá Dọc đường", @@ -1381,7 +1411,11 @@ }, "leisure": { "name": "Giải trí", - "terms": "giải trí,thể thao,thể dục,giai tri,the thao,thể dục" + "terms": "giải trí,thể thao,thể dục,giai tri,the thao,the duc" + }, + "leisure/common": { + "name": "Đất công", + "terms": "đất công,mảnh đất công,đất công cộng,dat cong,manh dat cong,dat cong cong" }, "leisure/dog_park": { "name": "Công viên dành cho Chó", @@ -1479,6 +1513,10 @@ "name": "Hải đăng", "terms": "hải đăng,đèn biển,hai dang,den bien" }, + "man_made/observation": { + "name": "Tháp Quan sát", + "terms": "tháp quan sát,trạm quan sát,tầng quan sát,thap quan sat,tram quan sat,tang quan sat" + }, "man_made/pier": { "name": "Cầu tàu", "terms": "cầu tàu,bến tàu,đạp ngăn sóng,cầu dạo chÆ¡i,cau tau,ben tau,dap ngan song,cau dao choi" @@ -1593,7 +1631,87 @@ }, "office": { "name": "Văn phòng", - "terms": "văn phòng,van phong" + "terms": "văn phòng,sở,van phong,so" + }, + "office/accountant": { + "name": "TÆ° vấn Kế toán", + "terms": "tÆ° vấn kế toán,kế toán viên,văn phòng kế toán,nhân viên kế toán,dịch vụ khai thuế,văn phòng khai thuế,tài chính,tài chánh,tu van ke toan,ke toan vien,van phong ke toan,nhan vien ke toan,dich vu khai thue,van phong khai thue,tai chinh,tai chanh" + }, + "office/administrative": { + "name": "CÆ¡ quan Địa phÆ°Æ¡ng", + "terms": "cÆ¡ quan địa phÆ°Æ¡ng,hội đồng địa phÆ°Æ¡ng,công sở địa phÆ°Æ¡ng,sở hành chính địa phÆ°Æ¡ng,co quan dia phuong,hoi dong dia phuong,cong so dia phuong,so hanh chinh dia phuong" + }, + "office/architect": { + "name": "Kiến trúc sÆ°", + "terms": "kiến trúc sÆ°,kien truc su" + }, + "office/company": { + "name": "Văn phòng Công ty", + "terms": "văn phòng công ty,văn phòng công ti,văn phòng cty,trụ sở công ty,trụ sở công ti,trụ sở cty,van phong cong ty,van phong cong ti,van phong cty,tru so cong ty,tru so cong ti,tru so cty" + }, + "office/educational_institution": { + "name": "Trường học", + "terms": "trường học,trường cao đẳng,trường đại học,học viện,hội đồng giáo dục,học khu,khu học chánh,nha học chánh,truong hoc,trường cao đẳng,trường đại học,học viện,hoi dong giao duc,hoc khu,khu hoc chanh,nha hoc chanh" + }, + "office/employment_agency": { + "name": "CÆ¡ quan Giới thiệu Việc làm", + "terms": "cÆ¡ quan giới thiệu việc làm,cÆ¡ quan việc làm,văn phòng giới thiệu việc làm,co quan gioi thieu viec lam,co quan viec lam,van phong gioi thieu viec lam" + }, + "office/estate_agent": { + "name": "Văn phòng Bất động sản", + "terms": "văn phòng bất động sản,địa ốc viên,chuyên viên địa ốc,chuyên viên bất động sản,van phong bat dong san,dia oc vien,chuyen vien dia oc,chuyen vien bat dong san" + }, + "office/financial": { + "name": "Văn phòng Tài chính", + "terms": "văn phòng tài chính,văn phòng tài chánh,van phong tai chinh,van phong tai chanh" + }, + "office/government": { + "name": "Công sở", + "terms": "công sở,cÆ¡ quan chính phủ,cÆ¡ quan chính quyền,cong so,co quan chinh phu,co quan chinh quyen" + }, + "office/insurance": { + "name": "Văn phòng Bảo hiểm", + "terms": "văn phòng bảo hiểm,van phong bao hiem" + }, + "office/it": { + "name": "Văn phòng Tin học", + "terms": "văn phòng tin học,chuyên viên tin học,văn phòng công nghệ thông tin,văn phòng CNTT,van phong tin hoc,chuyen vien tin hoc,van phong cong nghe thong tin,van phong CNTT" + }, + "office/lawyer": { + "name": "Văn phòng Luật sÆ°", + "terms": "văn phòng luật sÆ°,van phong luat su" + }, + "office/newspaper": { + "name": "Tờ báo", + "terms": "tờ báo,nhật báo,tuần báo,tạp chí,to bao,nhat bao,tuan bao,tap chi" + }, + "office/ngo": { + "name": "Tổ chức Phi chính phủ", + "terms": "tổ chức phi chính phủ,văn phòng NGO,văn phòng ONG,tổ chức phi lợi nhuận,tổ chức bất vụ lợi,quỹ từ thiện,hiệp hội thÆ°Æ¡ng mại,to chuc phi chinh phu,van phong NGO,van phong ONG,to chuc phi loi nhuan,to chuc bat vu loi,quy tu thien,hiep hoi thuong mai" + }, + "office/physician": { + "name": "Văn phòng Bác sÄ©", + "terms": "văn phòng bác sÄ©,văn phòng bác sỹ,văn phòng thầy thuốc,van phong bac si,van phong bac sy,van phong thay thuoc" + }, + "office/political_party": { + "name": "Đảng Chính trị", + "terms": "văn phòng đảng chính trị,văn phòng đảng chánh trị,van phong dang chinh tri,van phong dang chanh tri" + }, + "office/research": { + "name": "Văn phòng Nghiên cứu", + "terms": "văn phÃ²ng nghiên cứu,van phong nghien cuu" + }, + "office/telecommunication": { + "name": "Văn phòng Viễn thông", + "terms": "văn phòng viễn thông,tiệm viễn thông,cá»­a hàng viễn thông,trụ sở công ty viễn thông,trụ sở công ti viễn thông,trụ sở cty viễn thông,van phong vien thong,tiem vien thong,cua hang vien thong,tru so cong ty vien thong,tru so cong ti vien thong,tru so cty vien thong" + }, + "office/therapist": { + "name": "Nhà trị liệu", + "terms": "nhà trị liệu,bác sÄ© chuyên khoa,thầy thuốc chuyên khoa,nha tri lieu,bac si chuyen khoa,thay thuoc chuyen khoa" + }, + "office/travel_agent": { + "name": "Văn phòng Du lịch", + "terms": "văn phòng du lịch,công ty du lịch,công ti du lịch,cty du lịch,đại lý du lịch,đại lí du lịch,du lịch theo nhóm,tour,vé máy bay,van phong du lich,cong ty du lich,cong ti du lich,cty du lich,dai ly du lich,dai li du lich,du lich theo nhom,ve may bay" }, "place": { "name": "Địa phÆ°Æ¡ng", @@ -1640,8 +1758,12 @@ "terms": "máy phát điện,động cÆ¡,tua bin,tuabin,may phat dien,dong co" }, "power/line": { - "name": "Đường Dây điện", - "terms": "đường dây điện,duong day dien" + "name": "Đường Dây điện Cao thế", + "terms": "đường dây điện cao thế,đường dây điện cao áp,đường dây truyền tải điện năng,duong day dien cao the,duong day dien cao ap,duong day truyen tai dien nang" + }, + "power/minor_line": { + "name": "Đường Dây điện Hạ/Trung thế", + "terms": "đường dây điện trung thế,đường dây điện hạ thế,đường dây điện trung áp,đường dây điện hạ áp,duong day dien trung the,duong day dien ha the,duong day dien trung ap,duong day dien ha ap" }, "power/pole": { "name": "Cột điện", @@ -1649,7 +1771,7 @@ }, "power/sub_station": { "name": "Trạm Điện Phụ", - "terms": "trạm điện phụ" + "terms": "trạm điện phụ,tram dien phu" }, "power/tower": { "name": "Cột điện Cao thế", @@ -1676,7 +1798,7 @@ "terms": "ga xép,ga nhỏ,ga xep,ga nho" }, "railway/level_crossing": { - "name": "Giao lộ Đường sắt", + "name": "Điểm giao Đường sắt", "terms": "giao lộ đường sắt,giao lộ đường ray,nút giao đường sắt,giao lo duong sat,giao lo duong ray,nut giao duong sat" }, "railway/monorail": { @@ -1855,6 +1977,10 @@ "name": "Tiệm Máy giặt", "terms": "tiệm máy giặt,tiệm giặt ủi,chỗ giặt quần áo,chỗ giặt ủi,cá»­a hàng giặt ủi,tiem may giat,tiem giat ui,cho giat quan ao,cho giat ui,cua hang giat ui" }, + "shop/locksmith": { + "name": "Thợ khóa", + "terms": "thợ khóa,thợ sá»­a khóa,thợ khoá,trợ sá»­a khoá,thợ kim khí,tho khoa,tho sua khoa,tho kim khi" + }, "shop/mall": { "name": "Trung tâm ThÆ°Æ¡ng mại", "terms": "trung tâm thÆ°Æ¡ng mại,khu thÆ°Æ¡ng mại,trung tam thuong mai,khu thuong mai" @@ -1887,6 +2013,10 @@ "name": "Tiệm Vật nuôi", "terms": "tiệm bán vật nuôi,tiệm bán đồ nuôi thú vật,cá»­a hàng vật nuôi,cá»­a hiệu thú vật,đồ ăn thú vật,chó,mèo,tiem ban vat nuoi,tiem ban do nuoi thu vat,cua hang vat nuoi,cua hieu thu vat,do an thu vat,cho,meo" }, + "shop/photo": { + "name": "Tiệm Chụp Hình", + "terms": "tiệm chụp hình,tiệm lấy hình,tiệm lấy ảnh,tiệm nhiếp ảnh,cá»­a hàng chụp hình,cá»­a hàng lấy hình,cá»­a hàng lấy ảnh,cá»­a hàng nhiếp ảnh,tiem chup hinh,tiem lay hinh,tiem lay anh,tiem nhiep anh,cua hang chup hinh,cua hang lay hinh,cua hang lay anh,cua hang nhiep anh" + }, "shop/shoes": { "name": "Tiệm Giày", "terms": "tiệm giày,cá»­a hàng giày,chỗ bán giày,cá»­a hiệu giày,dép,tiem giay,cua hang giay,cho ban giay,cua hieu giay,dep" diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json new file mode 100644 index 000000000..ba910f8d8 --- /dev/null +++ b/vendor/assets/iD/iD/locales/yue.json @@ -0,0 +1,2231 @@ +{ + "modes": { + "add_area": { + "title": "範圍", + "description": "地圖度，加園、屋宇、湖或者其他範圍入去。", + "tail": "要畫範圍，諸如園、湖屋，撳地圖先，先至去畫。" + }, + "add_line": { + "title": "綫", + "description": "地圖度，加公路、街、行人徑、水道或者其他綫。", + "tail": "地圖度撳一下，畫路、徑、或者路綫。" + }, + "add_point": { + "title": "處", + "description": "地圖上加酒樓、紀念碑、郵筒或者其他處。", + "tail": "撳地圖加處" + }, + "browse": { + "title": "周圍睇", + "description": "地圖放大睇" + }, + "draw_area": { + "tail": "撳下加節入你個範圍。撳第一節去完成範圍。" + }, + "draw_line": { + "tail": "撳一下去加多幾節落條綫。掹其他綫，駁去佢哋度，同快撳兩下，完咗條綫。" + } + }, + "operations": { + "add": { + "annotation": { + "point": "處加咗", + "vertex": "道度加節", + "relation": "關聯加咗。" + } + }, + "start": { + "annotation": { + "line": "綫起咗。", + "area": "範圍起咗。" + } + }, + "continue": { + "key": "A", + "title": "繼續", + "description": "續條綫。", + "not_eligible": "爾度無綫可以可續。", + "multiple": "爾度幾條綫可繼續。揀一條綫，咁住Shift掣，撳住佢揀佢。", + "annotation": { + "line": "綫續咗。", + "area": "範圍續咗。" + } + }, + "cancel_draw": { + "annotation": "唔畫。" + }, + "change_role": { + "annotation": "改咗關聯成員嘅作用。" + }, + "change_tags": { + "annotation": "籤改咗。" + }, + "circularize": { + "title": "整圓", + "description": { + "line": "整圓條綫", + "area": "整圓範圍" + }, + "key": "O", + "annotation": { + "line": "整圓條綫。", + "area": "整圓範圍。" + }, + "not_closed": "無得整圓，根本唔係圈。" + }, + "orthogonalize": { + "title": "四方", + "description": { + "line": "整方個綫角", + "area": "整方範圍角" + }, + "key": "S", + "annotation": { + "line": "整方咗綫角。", + "area": "整方咗範圍角。" + }, + "not_squarish": "佢太唔似方，整唔到方。" + }, + "straighten": { + "title": "拉直", + "description": "拉直條綫", + "key": "S", + "annotation": "條綫拉直咗。", + "too_bendy": "條綫太彎，拉直唔到。" + }, + "delete": { + "title": "刪", + "description": "地圖度拎走佢。", + "annotation": { + "point": "刪咗處。", + "vertex": "道度刪咗節。", + "line": "刪咗綫。", + "area": "刪咗範圍。", + "relation": "刪咗關聯。", + "multiple": "刪咗物體{n}個。" + }, + "incomplete_relation": "此地貌無得刪走，皆因佢未傳晒落來。" + }, + "add_member": { + "annotation": "加咗成員入關聯。" + }, + "delete_member": { + "annotation": "拎走咗關聯成員。" + }, + "connect": { + "annotation": { + "point": "駁咗道去嗰處。", + "vertex": "駁咗道去其他。", + "line": "駁咗道去綫。", + "area": "駁咗道去範圍。" + } + }, + "disconnect": { + "title": "掹開", + "description": "此綫或者範圍等，全部掹開。", + "key": "D", + "annotation": "綫或範圍，經已掹開咗。", + "not_connected": "爾度唔够綫或者範圍去掹開。" + }, + "merge": { + "title": "ä½µ", + "description": "併埋爾啲綫。", + "key": "C", + "annotation": "併咗綫{n}條。 ", + "not_eligible": "爾啲地貌，無得併埋。", + "not_adjacent": "爾啲綫無得掹開，根本無駁埋。", + "restriction": "爾啲綫併唔到，當中至少一個，屬於{relation}關聯。" + }, + "move": { + "title": "搬", + "description": "搬爾個去另第度。", + "key": "M", + "annotation": { + "point": "搬一點", + "vertex": "道度搬咗節。", + "line": "搬咗條綫。", + "area": "搬咗範圍。", + "multiple": "搬物體幾個。" + }, + "incomplete_relation": "此地貌無得搬，皆因佢未傳晒落來。" + }, + "rotate": { + "title": "擰轉", + "description": "圍住中心點，擰轉爾個物體。", + "key": "R", + "annotation": { + "line": "條綫擰轉咗。", + "area": "範圍擰轉咗。" + } + }, + "reverse": { + "title": "倒向。", + "description": "整到修綫方向相反。", + "key": "V", + "annotation": "條綫方向倒咗轉。" + }, + "split": { + "title": "斬開", + "description": { + "line": "爾節度，斬綫爲二。", + "area": "斬界，一分爲二。", + "multiple": "爾節度，斬綫或範圍界綫，一分爲二。" + }, + "key": "X", + "annotation": { + "line": "斬開條綫。", + "area": "斬開範圍界綫。", + "multiple": "斬開綫或範圍界綫{n}條。" + }, + "not_eligible": "綫無得喺頭尾度斬。", + "multiple_ways": "爾處太多綫，無得斬開。" + } + }, + "undo": { + "tooltip": "還原：{action}", + "nothing": "無嘢好還原" + }, + "redo": { + "tooltip": "重做：{action}", + "nothing": "無嘢好重做" + }, + "tooltip_keyhint": "快掣", + "browser_notice": "爾個編輯，只用於Firefox、Chrome、Safari、Opera以及Internet Explorer 版本九或以上。唔該換新瀏覽器，或者用Potlach2去改地圖。", + "translate": { + "translate": "繙", + "localized_translation_label": "各話名", + "localized_translation_language": "揀話", + "localized_translation_name": "名" + }, + "zoom_in_edit": "放大去改", + "logout": "簽走", + "loading_auth": "駁上去公家街圖⋯⋯", + "report_a_bug": "報告有錯", + "status": { + "error": "駁唔通程式接口。", + "offline": "程式接口收工。遲啲再改啦。", + "readonly": "程式接口，只讀不寫。你要等下先記到你修改。" + }, + "commit": { + "title": "記低修改", + "description_placeholder": "簡述你爾則稿件", + "message_label": "遞交片語", + "upload_explanation": "你嘅修改，傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。", + "upload_explanation_with_user": "你以{user}名義，修改傳咗上去公家街圖。凢用公家街圖資料，地圖都會見到。", + "save": "記", + "cancel": "唔記", + "warnings": "警告", + "modified": "改咗", + "deleted": "刪咗", + "created": "開咗" + }, + "contributors": { + "list": "有{users}修改", + "truncated_list": "有{users}及其他{count}修改" + }, + "geocoder": { + "search": "揀世界⋯⋯", + "no_results_visible": "圖內可見之處，搵唔到。", + "no_results_worldwide": "無嘢搵到" + }, + "geolocate": { + "title": "標出我位置" + }, + "inspector": { + "no_documentation_combination": "未有文件解爾支籤", + "no_documentation_key": "未有文件解依個圖例。", + "show_more": "睇多啲", + "view_on_osm": "入openstreetmap.org睇", + "all_tags": "所有籤", + "all_members": "所有成員", + "all_relations": "所有關聯", + "new_relation": "開新關聯⋯⋯", + "role": "作用", + "choose": "揀地貌", + "results": "{search}搵出{n}項", + "reference": "入公家街圖百科睇", + "back_tooltip": "轉地貌", + "remove": "移走", + "search": "搵", + "multiselect": "揀咗嘅項目", + "unknown": "未知", + "incomplete": "<無傳落來>", + "feature_list": "搵地貌", + "edit": "改地貌", + "none": "無" + }, + "background": { + "title": "背景", + "description": "背景設定", + "percent_brightness": "{opacity}% 光", + "none": "無", + "custom": "自訂", + "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。", + "fix_misalignment": "校正對位誤差", + "reset": "重設" + }, + "restore": { + "heading": "你有修改未記妥", + "description": "要唔要囘復上次未記妥之修改？", + "restore": "囘復", + "reset": "重新開始" + }, + "save": { + "title": "記低", + "help": "修改放上公家街圖，等其他用者都睇到。", + "no_changes": "無修改可記", + "error": "記上去時出錯", + "uploading": "修改傳上公家街圖。", + "unsaved_changes": "你有修改未記妥" + }, + "success": { + "edited_osm": "改公家街圖！", + "just_edited": "你啱啱改咗公家街圖！", + "view_on_osm": "入公家街圖睇", + "facebook": "放上Facebook", + "twitter": "放上Twitter", + "google": "放上Google+", + "help_html": "你所改嘅，幾分鐘後會送到普通層。其他層，或者某啲地貌，要用多啲時間。\n(詳解)。\n" + }, + "confirm": { + "okay": "得" + }, + "splash": { + "welcome": "歡迎來到艾第公家街圖造圖。", + "text": "艾第爾件架生，易用之時，亦功用多多，用來投稿修改去，世界至好，任用嘅世界地圖片。現時版本係{version}。想多啲資料，睇下 {website}同埋去{github}報告出錯。", + "walkthrough": "開始逐步解釋", + "start": "卽改" + }, + "source_switch": { + "live": "運行之中", + "lose_changes": "你未有修改未記妥。轉用地圖電腦，就會無咗修改。你真係要轉地圖電腦？", + "dev": "製作之中" + }, + "tag_reference": { + "description": "描述", + "on_wiki": "喺wiki.osm.org度嘅{tag}", + "used_with": "同{type}一齊用" + }, + "validations": { + "untagged_point": "未有籤嘅點", + "untagged_line": "冇籤嘅綫", + "untagged_area": "冇籤嘅範圍", + "many_deletions": "你要刪走物件{n}個。你真係想咁做？咁人人用開嘅openstreetmap.org地圖入便，都會刪走埋。", + "tag_suggests_area": "{tag}籤話條綫係範圍，實情佢唔係。", + "deprecated_tags": "廢籤：{tags}" + }, + "zoom": { + "in": "放大", + "out": "縮細" + }, + "cannot_zoom": "今下模式，無得再縮。", + "gpx": { + "local_layer": "本地 GPX 檔案", + "drag_drop": "拉個 .gpx擋入來爾版。或者，撳右邊粒掣揀檔。", + "zoom": "較到GPX路徑大細", + "browse": "望下有乜 .gpx 檔" + }, + "help": { + "title": "指南", + "help": "# 指南\n\n爾個編器，係爲 [公家街圖](http://www.openstreetmap.org/)而做。 有世界地圖，任用亦改得。你可以用佢，喺你處加嘢改嘢。如此一來，裏面嘅料，人人可以任用。\n\n邊個用公家街圖，都見得到你整嘅地圖。要改得到，就要開定個\n[免費公家街圖戶口](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) 係合作而成， [程式碼放喺 GitHub](https://github.com/systemed/iD).\n", + "editing_saving": "# 改同記\n\n爾個程式，係上網用嘅，你用到佢，就係喺你上緊嘅網站上面。\n\n### 㨂地貌\n\n㨂地圖地貌，好似路，名勝，就喺地圖撳佢一下。咁佢就會顯眼，同埋有一大欄，講佢明細。亦有選單，你可以點地貌。\n\n要揀多個一種，就撳實【Shift】掣先。一係跟手撳落地貌，揀你想揀。一係拖個長方形出來，包住佢嘅點都着咗。\n\n### 記修改\n\n你修改路、屋宇及地方之時，爾啲修改只喺你部電腦上面，直至你記上地圖電腦。唔好擔心，若你出錯，你可以撳還原掣還原，重做掣重做。\n\n撳【記低】就完成一組修改。畀個例，你畫完個鎮，又會去畫另一度。咁你有機會去校閱你改過乜。同埋，若然有乜改得唔妥，程式亦會有用提議同警告。\n\n若然樣樣都妥當，咁你就打啲解釋，講下你改過乜，之後【記低】送修改上 [OpenStreetMap.org](http://www.openstreetmap.org/)。如此一來，人人都會睇到，等人再以此建立同改善。\n\n若你一次改唔晒，你都可以閂咗程式，下次返來，用同一部電腦同瀏覽器，程式會畀機會你囘復修改。\n", + "roads": "# è·¯\n\n用個程式，你開得，整得，刪得啲路。路有幾種，徑、公路、山徑、單車徑等等，乜嘢相交一段都要畫面出來。\n\n### 揀\n\n撳一下條路，就揀到。個外形會見得明顯，亦有架生仔選單，外加邊註欄有多啲路嘅資料。\n\n### 改\n\n你耐不耐見到條路，同背景相，或全球定位系統行縱，並唔一致。你要調較到佢哋啱位。\n\n首先撳一下，你想改嗰條路。咁條路就會特別顯眼，同埋有一點點畀你畀拉到啱位。若你想加多幾點，更加仔細，就喺條路上面，無節嘅地方，快撳兩下，咁就會開多一節。\n\n若然條路要駁去其他路，之但係無駁妥，咁你就拖住一點，拉到其他路，整到聯埋。地圖來講，駁通啲路係咁緊要，同埋駕車搵路亦必須。\n\n你亦可以用【搬】爾個架生，或撳快掣【M】，一次過搬成條路，再撳多下，就記好搬動。\n\n### 刪\n\n若成條路都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新路未必見。\n\n你刪條路，就撳佢一下，揀咗佢。跟住撳垃圾筒公仔，或者撳快掣【Delete】。\n\n### 開新\n\n要搵地方，緊係要有條路，係咪？去程式左上角，咁住【綫】個公仔，或者撳快掣【2】，就開始畫綫。\n\n地圖度，撳住路頭個位開始畫。若然條路由原路分出，就由原路上面路口位，撳一下開始。\n\n撳嘅點，應該人係跟實條路，跟䘙星相，或跟全球定位系統行蹤。若果你條路，會橫過另一條，你就喺路口位，撳落另一條路上，就起咗個交叉點。你要畫完，就快撳兩下。又或者咁鍵盤【Return】或【Enter】掣。\n", + "gps": "# 全球定位系統\n\n數據取自全球定位系統，係公家街圖至可靠來源。爾個造圖程式，用到本機行蹤，卽放你電腦嘅【.gpx】檔案。你收集全球定位系統行蹤，取自智能電話程式，或者個人全球定位系統儀。\n\n點去用全球定位系統測量，睇下[用全球定位系統測量](http://learnosm.org/en/beginner/using-gps/).\n\n用GPX途徑製圖，拖GPX檔案落造圖程式。若然讀得明，佢會加入地圖，用鮮綠綫顯現。喺右邊，撳落【背景設定】選單。咁就開得，閂得，放大縮細新嘅GPX層。\n\n爾個GPX途徑，唔會直上公家街圖，最好用法，就係用佢製圖。按此加新地貌，亦可[傳上公家街圖](http://www.openstreetmap.org/trace/create)以作其他用途。\n", + "imagery": "# 相\n\n航空相係地圖要源。佢哋飛機飛過，衞星望落等組合。網上有任用來源，可供使用。就喺右邊，【背景設定】之內。\n\n程式預先已有 [兵地圖](http://www.bing.com/maps/) 䘙星相層。你放大縮細去某啲地方，就有其他可用。某幾國，如美國、法國、丹麥等，國內某啲地方，有極精細嘅相。\n\n相有時同地圖資料有差距，爾個係供相者出錯。若你睇到多多路與背景移咗位，就唔好郁住。將啲相校好個位，同地圖資料吻合。要咁做，就去背景設定，撳【校正對位誤差】校好咗先。\n", + "addresses": "# 地埗\n\n地埗，對地圖好有用嘅資料。\n\n雖則地埗通常係街嘅一部份，不過喺公家街圖入面，會記爲沿街屋宇及地方屬性。\n\n你可以加地埗落地方，畫成屋宇界圖，亦可以畫成單處。最好來源，就係視身街一轉，或者靠個人知識。之但係，同其他地貌一樣，禁止抄其他商用來源，包括谷歌地圖。\n", + "inspector": "# 用明細一覽\n\n明細一覽係全版左邊嘅部份，畀你改個地貌嘅詳細資料。\n\n### 揀地貌\n\n無論你加處、綫或者範圍，你要揀係乜地貌，如公路定住宅路，超級市場定茶座。明細一覽上面有掣，揀你要嘅地貌，同埋你亦可以格中，一邊打一邊搵。\n\n個個地貌製，右邊【i】字，撳落有細解。撳落個掣度就揀到地貌。\n\n### 用表及改籤\n\n你㨂完地貌，或者你㨂嘅，早已入咗地貌，咁明細一覽，就有一欄欄，講地貌詳細資料，例如名同地埗咁。\n\n欄下面，你會見到啲細公仔，係用來加其他明細，好似 [維基百科](http://www.wikipedia.org/) 資料、行唔行到輪輢等等。\n\n明細一覽個底，撳【所有籤】，就可以隨意加其他籤落去。\n[籤料](http://taginfo.openstreetmap.org/) 係極有用嘅地方知道唔通籤嘅配搭。\n\n你喺明細一覽改嘅，都會自動送上地圖。你亦可以還原修改，只要咁下【還原】掣。\n", + "buildings": "# 屋宇\n\n公家街圖有屋宇資料庫，全球至大。你可以幫手添啲，亦可改善資料。\n\n### 揀\n\n你要揀屋宇，咁邊佢條邊就得。間屋宇會顯眼啲，亦會有架生仔選單，同埋邊註欄講屋宇多啲資料。\n\n### 改\n\n有陣時屋宇放唔啱，又或者放錯籤。\n\n要搬成間屋宇，揀佢先，跟手用【搬】架生。郁滑鼠就移屋宇，搬啱就咁撳一下。\n\n想改屋宇個形，邊度撳一節，拖住一節到啱位爲止。\n\n### 開新\n\n時時有人問，加新屋宇落地圖，而公家街圖又可以係點，又可以加形，咁邊個好啲呢？原則就係，_用得形就用形_，以及屋宇個形內，加公司、屋企、方便設施同其他種種，喺屋宇內有嘅嘢。\n\n畫新屋宇個形，喺左上面撳【範圍】掣，畫完就撳鍵盤【Return】掣，或者撳返去第一節，咁個形就埋口。\n\n### 刪\n\n若成間屋宇都唔啱，你亦要望下衞星相，以及最好親身確認，佢真係唔喺度，你就可以刪咗佢，卽係由地圖度搬走。小心啲刪走地貌，同其他改法一樣，有時地貌係人人都見到，但係衞星相過晒時，新屋宇未必見。\n\n你要刪咗間屋宇，就撳佢揀佢。然後撳垃圾筒公你，或者撳【Delete】掣。\n", + "relations": "# 關聯\n\n公家街圖入面，關聯係特別地貌，夾埋其他地貌做一組。例如，有兩種至常見。一係*途徑關聯*，佢係路段組成，路屬高速公路同公路。另一係*幾多邊形*，佢將唔同綫結合，定個複雜嘅範圍，好似範圍分開幾個，或者有洞好似沙翁。\n\n關聯之中，一組地貌就係*成員*。邊註欄度，你睇到地貌，佢做邊啲關聯成員。撳落關聯，就跳入關聯。一揀咗關聯，邊註欄列晒成員，地圖佢哋亦會特別顯眼。\n\n多數情形，你改嘢時，艾弟都會自動保持關聯。你要留意，你刪走一段，想畫得準確一啲，你要確保新段，都留喺原有關聯之中。\n\n## 改關聯\n\n你改關聯，爾度講基本嘢。\n\n加地貌落關聯，㨂地貌。邊註欄入面，【所有關係】度撳【+】掣，揀或打關聯名。\n\n開新關聯，㨂首個成員地貌，【所有關係】度撳【+】掣，揀【新關聯⋯⋯】。\n\n由關聯度拎走地貌，揀地貌，喺唔要嘅關聯側邊，撳垃圾桶公仔。\n\n你砌多幾多邊形開窿，可以用【併】架生。畫出兩個範圍，內同外，鍵盤撳實【Shift】掣，兩個各撳一下，揀晒佢哋，然後撳【併】掣。\n" + }, + "intro": { + "navigation": { + "title": "周圍望", + "drag": "大地圖度，公家街圖資料，放喺背景之上。你想周圍望，就拖住，推上落，推左右，就好似普通網上地圖咁。**拖住地圖**", + "select": "圖上地貌，有三種方法表示，處、綫同範圍。所有地貌，都以一撳就揀。**撳處去揀。**", + "header": "頂頭指明地貌。", + "pane": "一揀地貌，地貌器就出。頂頭話我哋知乜嘢地貌，主要顯示地貌屬性，如名同地址。**閂地貌器，就撳右上閂埋個掣。**" + }, + "points": { + "title": "點", + "add": "處，用來指示地貌，如舖、餐廳、紀念碑。佢哋畫低某個位置，用來講下當地係乜。**撳處個掣，開新一處。**", + "place": "地圖度，撳一下擺低一處。**擺個處去屋頂。**", + "search": "處可以用來指示種種地貌。你加爾處就係茶座。**搵【{name}】**", + "choose": "**由一覽度揀茶座。**", + "describe": "爾處畫成茶座。用地貌編器，我哋可以加名啲料上地貌。**加個名**", + "close": "想閂地貌編寫，只要一撳閂掣。**閂地貌編寫**", + "reselect": "有時處在。有時整錯或者未完整。我哋可改已有之處。**揀你喘啱整嗰處。**", + "fixname": "**改名兼閂地貌編寫**", + "reselect_delete": "地圖度，乜地貌都刪得。**撳你嗰開嗰處。**", + "delete": "個選單，會圍住嗰處。嗰處有唔同嘢做，可以改珧嗰處，當中有刪。**刪嗰處。**" + }, + "areas": { + "title": "範圍", + "add": "範圍係更祥細講地貌。佢畀埋地貌界綫。處出地嘅地貌，範圍多數都用到，做到範圍就做範圍。**撳住範圍掣，開新範圍。**", + "corner": "要畫範圍，就用節來勾出邊界，包住範圍。**擺開始一節，喺遊樂場一角。**", + "place": "畫範圍，就要擺多啲節。要完成範圍，就欽返頭嗰節。**畫個範圍畀遊樂場。**", + "search": "**搵【{name}】。**", + "choose": "**由一覽度揀遊樂場。**", + "describe": "**加名兼閂咗地貌編寫**" + }, + "lines": { + "title": "綫", + "add": "綫用來指示地貌，好似馬路、火車路、江河等。**撳綫掣，開一條綫。**", + "start": "**開一條綫，就撳路一端。**", + "intersect": "撳下去加幾節入綫。若有必要，你邊畫邊拖住地圖。路、同埋其他嘅綫，係大網入面。駁啱啲綫，通估綫程式，至爲重要。**撳住花街（Flower Street），爲兩綫駁做路口。**", + "finish": "畫綫到尾，只要再撳最尾一節一次。**畫完條路。**", + "road": "**由一覽度揀路。**", + "residential": "種種道路，最常見係住宅路。**揀住宅路**", + "describe": "**同路起名，以及閂咗地貌內容。**", + "restart": "條路要駁去花街（Flower Street）。", + "wrong_preset": "你未有指名住宅路。**撳爾度去揀多次**" + }, + "startediting": { + "title": "開始改", + "help": "更多文件，連同爾個逐步解釋，就放喺度。", + "save": "記得定時記低修改！", + "start": "開始制圖" + } + }, + "presets": { + "categories": { + "category-building": { + "name": "屋宇" + }, + "category-landuse": { + "name": "用地" + }, + "category-path": { + "name": "徑" + }, + "category-rail": { + "name": "軌道" + }, + "category-road": { + "name": "è·¯" + }, + "category-route": { + "name": "路綫" + }, + "category-water-area": { + "name": "æ°´" + }, + "category-water-line": { + "name": "æ°´" + } + }, + "fields": { + "access": { + "label": "通", + "placeholder": "未知", + "types": { + "access": "總體", + "foot": "行", + "motor_vehicle": "車", + "bicycle": "單車", + "horse": "馬" + }, + "options": { + "yes": { + "title": "准許", + "description": "按法例可通，通路之權。" + }, + "no": { + "title": "禁入", + "description": "公眾不通" + }, + "permissive": { + "title": "放任", + "description": "可以行，直至地主唔畀。" + }, + "private": { + "title": "私家", + "description": "要地主逐個批准。" + }, + "designated": { + "title": "指名", + "description": "法例或路牌指名點行" + }, + "destination": { + "title": "目的地", + "description": "去目的地就無限" + } + } + }, + "access_toilets": { + "label": "通" + }, + "address": { + "label": "地埗", + "placeholders": { + "housename": "屋名", + "number": "一百二十三號", + "street": "街", + "city": "城", + "postcode": "郵政編號" + } + }, + "admin_level": { + "label": "行政層次" + }, + "aeroway": { + "label": "類" + }, + "amenity": { + "label": "類" + }, + "artist": { + "label": "藝人" + }, + "artwork_type": { + "label": "類" + }, + "atm": { + "label": "提款機" + }, + "backrest": { + "label": "長椅" + }, + "barrier": { + "label": "類" + }, + "bicycle_parking": { + "label": "類" + }, + "boundary": { + "label": "類" + }, + "building": { + "label": "屋宇" + }, + "building_area": { + "label": "屋宇" + }, + "building_yes": { + "label": "屋宇" + }, + "capacity": { + "label": "容納", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "方向" + }, + "clock_direction": { + "label": "方向", + "options": { + "clockwise": "順時針", + "anticlockwise": "逆時針" + } + }, + "collection_times": { + "label": "收集時間" + }, + "construction": { + "label": "類" + }, + "country": { + "label": "國" + }, + "crossing": { + "label": "類" + }, + "cuisine": { + "label": "菜式" + }, + "denomination": { + "label": "æ´¾" + }, + "denotation": { + "label": "表示" + }, + "description": { + "label": "描述" + }, + "elevation": { + "label": "æ°´å¹³" + }, + "emergency": { + "label": "急症室" + }, + "entrance": { + "label": "類" + }, + "fax": { + "label": "傳真", + "placeholder": "+31 42 123 4567" + }, + "fee": { + "label": "費用" + }, + "fire_hydrant/type": { + "label": "類" + }, + "fixme": { + "label": "整好我" + }, + "generator/method": { + "label": "方法" + }, + "generator/source": { + "label": "來源" + }, + "generator/type": { + "label": "類" + }, + "highway": { + "label": "類" + }, + "historic": { + "label": "類" + }, + "iata": { + "label": "IATA" + }, + "icao": { + "label": "ICAO" + }, + "incline": { + "label": "斜路" + }, + "internet_access": { + "label": "用到互聯網", + "options": { + "wlan": "無綫上網", + "wired": "揷綫上網", + "terminal": "終端機" + } + }, + "landuse": { + "label": "類" + }, + "lanes": { + "label": "綫道", + "placeholder": "1, 2, 3..." + }, + "layer": { + "label": "層" + }, + "leisure": { + "label": "類" + }, + "levels": { + "label": "樓", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "有燈" + }, + "location": { + "label": "地點" + }, + "man_made": { + "label": "類" + }, + "maxspeed": { + "label": "限速", + "placeholder": "40, 50, 60..." + }, + "name": { + "label": "名", + "placeholder": "常用名（若有）" + }, + "natural": { + "label": "自然" + }, + "network": { + "label": "網絡" + }, + "note": { + "label": "註" + }, + "office": { + "label": "類" + }, + "oneway": { + "label": "單程" + }, + "oneway_yes": { + "label": "單程" + }, + "opening_hours": { + "label": "時間" + }, + "operator": { + "label": "承辦商" + }, + "park_ride": { + "label": "泊車轉乖" + }, + "parking": { + "label": "類" + }, + "phone": { + "label": "電話", + "placeholder": "+31 42 123 4567" + }, + "place": { + "label": "類" + }, + "power": { + "label": "類" + }, + "railway": { + "label": "類" + }, + "ref": { + "label": "參攷" + }, + "relation": { + "label": "類" + }, + "religion": { + "label": "宗敎", + "options": { + "christian": "基督敎", + "muslim": "囘敎", + "buddhist": "佛敎", + "jewish": "猶太敎", + "hindu": "印度敎", + "shinto": "神道敎", + "taoist": "道敎" + } + }, + "restriction": { + "label": "類" + }, + "route": { + "label": "類" + }, + "route_master": { + "label": "類" + }, + "sac_scale": { + "label": "行徑難度" + }, + "service": { + "label": "類" + }, + "shelter": { + "label": "天遮" + }, + "shop": { + "label": "類" + }, + "source": { + "label": "來源" + }, + "sport": { + "label": "運動" + }, + "structure": { + "label": "結構", + "placeholder": "未知", + "options": { + "bridge": "橋", + "tunnel": "隧道", + "embankment": "基堤", + "cutting": "開山" + } + }, + "supervised": { + "label": "有人睇" + }, + "surface": { + "label": "表面" + }, + "toilets/disposal": { + "label": "棄置" + }, + "tourism": { + "label": "類" + }, + "towertype": { + "label": "塔類" + }, + "tracktype": { + "label": "類" + }, + "trail_visibility": { + "label": "徑明顯度" + }, + "tree_type": { + "label": "類" + }, + "vending": { + "label": "貨類" + }, + "water": { + "label": "類" + }, + "waterway": { + "label": "類" + }, + "website": { + "label": "網站", + "placeholder": "http://example.com/" + }, + "wetland": { + "label": "類" + }, + "wheelchair": { + "label": "通輪椅" + }, + "wikipedia": { + "label": "維基百科全書" + }, + "wood": { + "label": "類" + } + }, + "presets": { + "address": { + "name": "地埗", + "terms": "地埗,地址,址" + }, + "aeroway": { + "name": "航空", + "terms": "航空" + }, + "aeroway/aerodrome": { + "name": "飛機場", + "terms": "飛機場,機場" + }, + "aeroway/apron": { + "name": "停機坪", + "terms": "停機坪" + }, + "aeroway/gate": { + "name": "機場閘口", + "terms": "機場閘口" + }, + "aeroway/hangar": { + "name": "飛機庫", + "terms": "飛機庫" + }, + "aeroway/helipad": { + "name": "直升機坪", + "terms": "直升機坪,直昇機坪,直昇機場" + }, + "aeroway/runway": { + "name": "跑道", + "terms": "跑道" + }, + "aeroway/taxiway": { + "name": "滑行道", + "terms": "滑行道" + }, + "aeroway/terminal": { + "name": "飛機場大樓", + "terms": "飛機場大樓,機場大樓,機場客運大樓" + }, + "amenity": { + "name": "便利設施", + "terms": "便利設施" + }, + "amenity/arts_centre": { + "name": "美術館", + "terms": "美術館,藝術館,美術中心,藝術中心" + }, + "amenity/atm": { + "name": "提款機", + "terms": "提款機,自動提款機,自動櫃員機,櫃員機" + }, + "amenity/bank": { + "name": "銀行", + "terms": "銀行,銀號" + }, + "amenity/bar": { + "name": "酒吧", + "terms": "酒吧" + }, + "amenity/bench": { + "name": "長椅", + "terms": "長椅,長凳,長櫈" + }, + "amenity/bicycle_parking": { + "name": "泊單車處", + "terms": "泊單車處,單車停泊處,泊單車" + }, + "amenity/bicycle_rental": { + "name": "租單車舖", + "terms": "租單車處,單車租賃,租單車,租單車舖" + }, + "amenity/boat_rental": { + "name": "租艇", + "terms": "租艇" + }, + "amenity/cafe": { + "name": "茶座", + "terms": "茶座,荼座,㗎啡廳,㗎啡室" + }, + "amenity/car_rental": { + "name": "租車舖", + "terms": "租車舖,租車,租車店,汽車租賃" + }, + "amenity/car_sharing": { + "name": "共用車處", + "terms": "共用車處,共用車,汽車共享站" + }, + "amenity/car_wash": { + "name": "洗車舖", + "terms": "洗車舖,洗車,洗車店" + }, + "amenity/childcare": { + "name": "托兒所", + "terms": "托兒所" + }, + "amenity/cinema": { + "name": "電影戲院", + "terms": "電影戲院,戲院,電影院" + }, + "amenity/college": { + "name": "學院", + "terms": "學院,書院,專科學院,專上學院,理工" + }, + "amenity/courthouse": { + "name": "法庭", + "terms": "法庭,臬署,法院,裁判署" + }, + "amenity/drinking_water": { + "name": "飲水處", + "terms": "飲用水,飲水處,飲水" + }, + "amenity/embassy": { + "name": "大使館", + "terms": "大使館,領事館,使館" + }, + "amenity/fast_food": { + "name": "快餐店", + "terms": "快餐店" + }, + "amenity/fire_station": { + "name": "消防局", + "terms": "消防局,水車館" + }, + "amenity/fountain": { + "name": "噴水池", + "terms": "噴水池,噴泉,水景" + }, + "amenity/fuel": { + "name": "油站", + "terms": "油站,加油站,加汽站" + }, + "amenity/grave_yard": { + "name": "墳地", + "terms": "墳地,墓地" + }, + "amenity/hospital": { + "name": "醫院", + "terms": "醫院,醫學中心,療養院" + }, + "amenity/kindergarten": { + "name": "幼稚園", + "terms": "幼稚園,幼兒園" + }, + "amenity/library": { + "name": "圖書館", + "terms": "圖書館" + }, + "amenity/marketplace": { + "name": "街市", + "terms": "街市,市場,菜市場" + }, + "amenity/parking": { + "name": "停車場", + "terms": "停車場" + }, + "amenity/pharmacy": { + "name": "藥房", + "terms": "藥房,藥局" + }, + "amenity/place_of_worship": { + "name": "拜神之所", + "terms": "拜神之所,宗教祟拜場所,崇拜處" + }, + "amenity/place_of_worship/buddhist": { + "name": "佛寺", + "terms": "寺,佛寺,佛廟,和尚寺,尼姑庵,尼庵,庵堂,靜院,精舍,佛堂" + }, + "amenity/place_of_worship/christian": { + "name": "敎堂", + "terms": "敎堂,教堂" + }, + "amenity/place_of_worship/jewish": { + "name": "猶太廟", + "terms": "猶太廟,猶太寺,猶太教堂" + }, + "amenity/place_of_worship/muslim": { + "name": "囘敎寺", + "terms": "囘敎寺,清真寺,回敎寺,回敎寺,囘教寺" + }, + "amenity/police": { + "name": "差館", + "terms": "差館,警察局,警局,派出所,警署" + }, + "amenity/post_box": { + "name": "郵筒", + "terms": "郵筒,郵箱" + }, + "amenity/post_office": { + "name": "郵政局", + "terms": "郵政局,郵局,書信館" + }, + "amenity/pub": { + "name": "酒館", + "terms": "酒館" + }, + "amenity/ranger_station": { + "name": "郊野訪客處", + "terms": "郊野訪客處" + }, + "amenity/restaurant": { + "name": "餐廳", + "terms": "餐廳,飯店,飯館,酒樓,餐館,酒家,茶樓" + }, + "amenity/school": { + "name": "學校", + "terms": "學校,小學,中學" + }, + "amenity/swimming_pool": { + "name": "游水池", + "terms": "游水池,游泳池,泳池" + }, + "amenity/taxi": { + "name": "的士站", + "terms": "的士站,計程車站" + }, + "amenity/telephone": { + "name": "電話", + "terms": "電話" + }, + "amenity/theatre": { + "name": "舞臺戲院", + "terms": "舞臺戲院,戲院,劇院,劇場" + }, + "amenity/toilets": { + "name": "廁所", + "terms": "廁所,公廁,方便,洗手間,便所" + }, + "amenity/townhall": { + "name": "大會堂", + "terms": "大會堂,市政廳" + }, + "amenity/university": { + "name": "大學", + "terms": "大學" + }, + "amenity/vending_machine": { + "name": "售賣機", + "terms": "售賣機" + }, + "amenity/waste_basket": { + "name": "垃圾桶", + "terms": "垃圾桶,廢物箱" + }, + "area": { + "name": "範圍", + "terms": "範圍" + }, + "barrier": { + "name": "阻擋", + "terms": "阻擋" + }, + "barrier/block": { + "name": "路障", + "terms": "路障" + }, + "barrier/bollard": { + "name": "護柱", + "terms": "護柱" + }, + "barrier/cattle_grid": { + "name": "攔畜溝柵", + "terms": "攔畜溝柵" + }, + "barrier/city_wall": { + "name": "城牆", + "terms": "城牆" + }, + "barrier/cycle_barrier": { + "name": "單車減速欄", + "terms": "單車減速欄" + }, + "barrier/ditch": { + "name": "溝", + "terms": "溝" + }, + "barrier/entrance": { + "name": "入口", + "terms": "入口" + }, + "barrier/fence": { + "name": "欄", + "terms": "欄" + }, + "barrier/gate": { + "name": "閘", + "terms": "閘" + }, + "barrier/hedge": { + "name": "樹籬", + "terms": "樹籬" + }, + "barrier/kissing_gate": { + "name": "單人轉門 ", + "terms": "單人轉門 " + }, + "barrier/lift_gate": { + "name": "道閘", + "terms": "道閘" + }, + "barrier/retaining_wall": { + "name": "護土牆", + "terms": "護土牆" + }, + "barrier/stile": { + "name": "梯梃", + "terms": "梯梃" + }, + "barrier/toll_booth": { + "name": "收費亭", + "terms": "收費亭" + }, + "barrier/wall": { + "name": "牆", + "terms": "牆" + }, + "boundary/administrative": { + "name": "行政界", + "terms": "行政界" + }, + "building": { + "name": "屋宇", + "terms": "屋宇" + }, + "building/apartments": { + "name": "公寓", + "terms": "公寓" + }, + "building/commercial": { + "name": "商業樓宇", + "terms": "商業樓宇" + }, + "building/entrance": { + "name": "入口", + "terms": "入口" + }, + "building/garage": { + "name": "車庫", + "terms": "車庫" + }, + "building/house": { + "name": "屋", + "terms": "屋" + }, + "building/hut": { + "name": "屋仔", + "terms": "屋仔" + }, + "building/industrial": { + "name": "工業樓宇", + "terms": "工業樓宇" + }, + "building/residential": { + "name": "住宅樓宇", + "terms": "住宅樓宇" + }, + "emergency/ambulance_station": { + "name": "救護站", + "terms": "救護站" + }, + "emergency/fire_hydrant": { + "name": "消防水龍頭", + "terms": "消防水龍頭" + }, + "emergency/phone": { + "name": "求助電話", + "terms": "求助電話" + }, + "entrance": { + "name": "入口", + "terms": "入口" + }, + "footway/crossing": { + "name": "路口", + "terms": "路口" + }, + "footway/sidewalk": { + "name": "行人路", + "terms": "行人路" + }, + "highway": { + "name": "公路", + "terms": "公路" + }, + "highway/bridleway": { + "name": "馬徑", + "terms": "馬徑" + }, + "highway/bus_stop": { + "name": "巴士站", + "terms": "巴士站" + }, + "highway/crossing": { + "name": "路口", + "terms": "路口" + }, + "highway/cycleway": { + "name": "單車徑", + "terms": "單車徑" + }, + "highway/footway": { + "name": "行人徑", + "terms": "行人徑" + }, + "highway/living_street": { + "name": "居住街道", + "terms": "居住街道" + }, + "highway/mini_roundabout": { + "name": "細迴旋處", + "terms": "細迴旋處" + }, + "highway/motorway": { + "name": "高速公路", + "terms": "高速公路" + }, + "highway/motorway_junction": { + "name": "高速公路口", + "terms": "高速公路口" + }, + "highway/motorway_link": { + "name": "高速公路駁路", + "terms": "高速公路駁路" + }, + "highway/path": { + "name": "徑", + "terms": "徑" + }, + "highway/pedestrian": { + "name": "行人大街", + "terms": "行人大街" + }, + "highway/primary": { + "name": "大路", + "terms": "大路" + }, + "highway/primary_link": { + "name": "大路駁路", + "terms": "大路駁路" + }, + "highway/residential": { + "name": "住宅路", + "terms": "住宅路" + }, + "highway/road": { + "name": "未知嘅路", + "terms": "未知嘅路" + }, + "highway/secondary": { + "name": "中路", + "terms": "中路" + }, + "highway/secondary_link": { + "name": "中路駁路", + "terms": "中路駁路" + }, + "highway/service": { + "name": "支路", + "terms": "支路" + }, + "highway/service/alley": { + "name": "å··", + "terms": "å··" + }, + "highway/service/drive-through": { + "name": "車上用餐", + "terms": "車上用餐" + }, + "highway/service/driveway": { + "name": "宅外車道", + "terms": "宅外車道" + }, + "highway/service/emergency_access": { + "name": "緊急通道", + "terms": "緊急通道" + }, + "highway/service/parking_aisle": { + "name": "泊車通道", + "terms": "泊車通道" + }, + "highway/steps": { + "name": "梯", + "terms": "梯" + }, + "highway/stop": { + "name": "停車標誌", + "terms": "停車標誌,停字標誌,停車路牌" + }, + "highway/tertiary": { + "name": "ç´°è·¯", + "terms": "ç´°è·¯" + }, + "highway/tertiary_link": { + "name": "細路駁路", + "terms": "細路駁路" + }, + "highway/track": { + "name": "分徑", + "terms": "分徑" + }, + "highway/traffic_signals": { + "name": "紅綠燈", + "terms": "紅綠燈" + }, + "highway/trunk": { + "name": "幹路", + "terms": "幹路" + }, + "highway/trunk_link": { + "name": "幹道駁路", + "terms": "幹道駁路" + }, + "highway/turning_circle": { + "name": "迴施處", + "terms": "迴施處" + }, + "highway/unclassified": { + "name": "未歸類之路", + "terms": "未歸類之路" + }, + "historic": { + "name": "史蹟", + "terms": "史蹟" + }, + "historic/archaeological_site": { + "name": "考古地", + "terms": "考古地" + }, + "historic/boundary_stone": { + "name": "界石", + "terms": "界石" + }, + "historic/castle": { + "name": "寨", + "terms": "寨" + }, + "historic/memorial": { + "name": "紀念碑", + "terms": "紀念碑" + }, + "historic/monument": { + "name": "紀念碑", + "terms": "紀念碑" + }, + "historic/ruins": { + "name": "廢墟", + "terms": "廢墟" + }, + "historic/wayside_cross": { + "name": "路邊十字架", + "terms": "路邊十字架" + }, + "historic/wayside_shrine": { + "name": "路邊神祠", + "terms": "路邊神祠" + }, + "landuse": { + "name": "用地", + "terms": "用地" + }, + "landuse/allotments": { + "name": "菜地", + "terms": "菜地" + }, + "landuse/basin": { + "name": "盆地", + "terms": "盆地" + }, + "landuse/cemetery": { + "name": "墳場", + "terms": "墳場" + }, + "landuse/commercial": { + "name": "商地", + "terms": "商地" + }, + "landuse/construction": { + "name": "地盤", + "terms": "地盤" + }, + "landuse/farm": { + "name": "農場", + "terms": "農場" + }, + "landuse/farmyard": { + "name": "地堂", + "terms": "地堂" + }, + "landuse/forest": { + "name": "森", + "terms": "森" + }, + "landuse/grass": { + "name": "草地", + "terms": "草地" + }, + "landuse/industrial": { + "name": "工地", + "terms": "工地" + }, + "landuse/meadow": { + "name": "牧地", + "terms": "牧地" + }, + "landuse/orchard": { + "name": "菓園", + "terms": "菓園" + }, + "landuse/quarry": { + "name": "石塘", + "terms": "石塘" + }, + "landuse/residential": { + "name": "住", + "terms": "住" + }, + "landuse/retail": { + "name": "零售", + "terms": "零售" + }, + "landuse/vineyard": { + "name": "葡萄園", + "terms": "葡萄園" + }, + "leisure": { + "name": "消閒", + "terms": "消閒" + }, + "leisure/common": { + "name": "公地", + "terms": "公地" + }, + "leisure/dog_park": { + "name": "狗公園", + "terms": "狗公園" + }, + "leisure/garden": { + "name": "花園", + "terms": "花園" + }, + "leisure/golf_course": { + "name": "哥夫球場", + "terms": "哥夫球場" + }, + "leisure/marina": { + "name": "遊艇碼頭", + "terms": "遊艇碼頭" + }, + "leisure/park": { + "name": "園", + "terms": "園" + }, + "leisure/pitch": { + "name": "運動場", + "terms": "運動場" + }, + "leisure/pitch/american_football": { + "name": "美式足球場", + "terms": "美式足球場" + }, + "leisure/pitch/baseball": { + "name": "棒球場", + "terms": "棒球場" + }, + "leisure/pitch/basketball": { + "name": "籃球場", + "terms": "籃球場" + }, + "leisure/pitch/skateboard": { + "name": "滑板場", + "terms": "滑板場" + }, + "leisure/pitch/soccer": { + "name": "足球場", + "terms": "足球場" + }, + "leisure/pitch/tennis": { + "name": "網球場", + "terms": "網球場" + }, + "leisure/pitch/volleyball": { + "name": "排球場", + "terms": "排球場" + }, + "leisure/playground": { + "name": "遊樂場", + "terms": "遊樂場" + }, + "leisure/slipway": { + "name": "船排", + "terms": "船排" + }, + "leisure/sports_center": { + "name": "體育館", + "terms": "體育館" + }, + "leisure/stadium": { + "name": "大體育館", + "terms": "大體育館" + }, + "leisure/swimming_pool": { + "name": "游水池", + "terms": "游水池" + }, + "leisure/track": { + "name": "賽車跑道", + "terms": "賽車跑道" + }, + "line": { + "name": "綫", + "terms": "綫" + }, + "man_made": { + "name": "人造", + "terms": "人造" + }, + "man_made/breakwater": { + "name": "防波堤", + "terms": "防波堤" + }, + "man_made/cutline": { + "name": "分割綫", + "terms": "分割綫" + }, + "man_made/lighthouse": { + "name": "燈塔", + "terms": "燈塔" + }, + "man_made/observation": { + "name": "瞭望臺", + "terms": "瞭望臺" + }, + "man_made/pier": { + "name": "埗頭", + "terms": "埗頭" + }, + "man_made/pipeline": { + "name": "水管", + "terms": "水管" + }, + "man_made/survey_point": { + "name": "測量點", + "terms": "測量點" + }, + "man_made/tower": { + "name": "塔", + "terms": "塔" + }, + "man_made/wastewater_plant": { + "name": "廢水廠", + "terms": "廢水廠" + }, + "man_made/water_tower": { + "name": "水塔", + "terms": "水塔" + }, + "man_made/water_well": { + "name": "井", + "terms": "井" + }, + "man_made/water_works": { + "name": "供水廠", + "terms": "供水廠" + }, + "natural": { + "name": "天然", + "terms": "天然" + }, + "natural/bay": { + "name": "灣", + "terms": "灣" + }, + "natural/beach": { + "name": "灘", + "terms": "灘" + }, + "natural/cliff": { + "name": "崖", + "terms": "崖" + }, + "natural/coastline": { + "name": "海岸綫", + "terms": "海岸綫" + }, + "natural/fell": { + "name": "高原荒野", + "terms": "高原荒野" + }, + "natural/glacier": { + "name": "冰川", + "terms": "冰川" + }, + "natural/grassland": { + "name": "草原", + "terms": "草原" + }, + "natural/heath": { + "name": "荒野", + "terms": "荒野" + }, + "natural/peak": { + "name": "峯", + "terms": "峯" + }, + "natural/scree": { + "name": "碎石坡", + "terms": "碎石坡" + }, + "natural/scrub": { + "name": "灌木", + "terms": "灌木" + }, + "natural/spring": { + "name": "泉", + "terms": "泉" + }, + "natural/tree": { + "name": "樹", + "terms": "樹" + }, + "natural/water": { + "name": "æ°´", + "terms": "æ°´" + }, + "natural/water/lake": { + "name": "湖", + "terms": "湖" + }, + "natural/water/pond": { + "name": "塘", + "terms": "塘" + }, + "natural/water/reservoir": { + "name": "水塘", + "terms": "水塘" + }, + "natural/wetland": { + "name": "澤", + "terms": "澤" + }, + "natural/wood": { + "name": "林", + "terms": "林" + }, + "office": { + "name": "寫字樓", + "terms": "寫字樓" + }, + "office/accountant": { + "name": "會計師樓", + "terms": "會計師樓" + }, + "office/administrative": { + "name": "行政樓", + "terms": "行政樓" + }, + "office/architect": { + "name": "則樓", + "terms": "則樓" + }, + "office/company": { + "name": "公司寫字樓", + "terms": "公司寫字樓" + }, + "office/educational_institution": { + "name": "敎育機構", + "terms": "敎育機構" + }, + "office/employment_agency": { + "name": "薦人館", + "terms": "薦人館" + }, + "office/estate_agent": { + "name": "管業處", + "terms": "管業處" + }, + "office/financial": { + "name": "財務部寫字樓", + "terms": "財務部寫字樓" + }, + "office/government": { + "name": "衙門", + "terms": "衙門,ç½²,政府合署" + }, + "office/insurance": { + "name": "保險公司寫字樓", + "terms": "保險公司寫字樓" + }, + "office/it": { + "name": "資訊技藝寫字樓", + "terms": "資訊技藝寫字樓" + }, + "office/lawyer": { + "name": "律師事務所", + "terms": "律師事務所" + }, + "office/newspaper": { + "name": "報社", + "terms": "報社,新聞社,通訊社" + }, + "office/ngo": { + "name": "志顠機構寫字樓", + "terms": "志顠機構寫字樓" + }, + "office/physician": { + "name": "醫生", + "terms": "醫生" + }, + "office/political_party": { + "name": "政黨", + "terms": "政黨" + }, + "office/research": { + "name": "研究所", + "terms": "研究所" + }, + "office/telecommunication": { + "name": "電話公司寫字樓", + "terms": "電話公司寫字樓" + }, + "office/therapist": { + "name": "治療師", + "terms": "治療師" + }, + "office/travel_agent": { + "name": "旅行社", + "terms": "旅行社" + }, + "place": { + "name": "地", + "terms": "地" + }, + "place/city": { + "name": "城", + "terms": "城" + }, + "place/hamlet": { + "name": "村仔", + "terms": "村仔" + }, + "place/island": { + "name": "島", + "terms": "島" + }, + "place/isolated_dwelling": { + "name": "孤離居所", + "terms": "孤離居所" + }, + "place/locality": { + "name": "地方", + "terms": "地方" + }, + "place/town": { + "name": "鎮", + "terms": "鎮" + }, + "place/village": { + "name": "村", + "terms": "村" + }, + "point": { + "name": "點", + "terms": "點" + }, + "power": { + "name": "發電廠", + "terms": "發電廠" + }, + "power/generator": { + "name": "發電機", + "terms": "發電機" + }, + "power/line": { + "name": "供電綫", + "terms": "供電綫" + }, + "power/minor_line": { + "name": "細供電綫", + "terms": "細供電綫" + }, + "power/pole": { + "name": "電綫杆", + "terms": "電綫杆" + }, + "power/sub_station": { + "name": "配電站", + "terms": "配電站" + }, + "power/tower": { + "name": "高壓電塔", + "terms": "高壓電塔" + }, + "power/transformer": { + "name": "火牛房", + "terms": "火牛房" + }, + "railway": { + "name": "鐵路", + "terms": "鐵路" + }, + "railway/abandoned": { + "name": "廢鐵路", + "terms": "廢鐵路" + }, + "railway/disused": { + "name": "停用鐵路", + "terms": "停用鐵路" + }, + "railway/halt": { + "name": "火車細站", + "terms": "火車細站" + }, + "railway/level_crossing": { + "name": "平交道口", + "terms": "平交道口" + }, + "railway/monorail": { + "name": "單軌", + "terms": "單軌" + }, + "railway/platform": { + "name": "月臺", + "terms": "月臺" + }, + "railway/rail": { + "name": "路軌", + "terms": "路軌" + }, + "railway/station": { + "name": "火車站", + "terms": "火車站" + }, + "railway/subway": { + "name": "地下鐵路", + "terms": "地下鐵路" + }, + "railway/subway_entrance": { + "name": "地下鐵路入口", + "terms": "地下鐵路入口" + }, + "railway/tram": { + "name": "電車", + "terms": "電車" + }, + "relation": { + "name": "關係", + "terms": "關係" + }, + "route/ferry": { + "name": "航綫", + "terms": "航綫" + }, + "shop": { + "name": "舖", + "terms": "舖" + }, + "shop/alcohol": { + "name": "酒莊", + "terms": "酒莊" + }, + "shop/bakery": { + "name": "麪飽舖", + "terms": "麪飽舖" + }, + "shop/beauty": { + "name": "美容院", + "terms": "美容院" + }, + "shop/beverages": { + "name": "飲品舖", + "terms": "飲品舖" + }, + "shop/bicycle": { + "name": "單車舖", + "terms": "單車舖" + }, + "shop/books": { + "name": "書局", + "terms": "書局" + }, + "shop/boutique": { + "name": "時裝店", + "terms": "時裝店" + }, + "shop/butcher": { + "name": "肉舖", + "terms": "肉舖" + }, + "shop/car": { + "name": "車行", + "terms": "車行" + }, + "shop/car_parts": { + "name": "汽車零件舖", + "terms": "汽車零件舖" + }, + "shop/car_repair": { + "name": "車房", + "terms": "車房" + }, + "shop/chemist": { + "name": "註冊藥房", + "terms": "註冊藥房" + }, + "shop/clothes": { + "name": "衫舖", + "terms": "衫舖" + }, + "shop/computer": { + "name": "電腦舖", + "terms": "電腦舖" + }, + "shop/confectionery": { + "name": "糖菓舖", + "terms": "糖菓舖" + }, + "shop/convenience": { + "name": "便利店", + "terms": "便利店" + }, + "shop/deli": { + "name": "食肆", + "terms": "食肆" + }, + "shop/department_store": { + "name": "百貨公司", + "terms": "百貨公司" + }, + "shop/doityourself": { + "name": "自組舖", + "terms": "自組舖" + }, + "shop/dry_cleaning": { + "name": "乾洗", + "terms": "乾洗" + }, + "shop/electronics": { + "name": "電子舖", + "terms": "電子舖" + }, + "shop/farm": { + "name": "檔", + "terms": "檔" + }, + "shop/fishmonger": { + "name": "魚檔", + "terms": "魚檔" + }, + "shop/florist": { + "name": "花舖", + "terms": "花舖" + }, + "shop/furniture": { + "name": "傢俬舖", + "terms": "傢俬舖" + }, + "shop/garden_centre": { + "name": "園藝舖", + "terms": "園藝舖" + }, + "shop/gift": { + "name": "禮品舖", + "terms": "禮品舖" + }, + "shop/greengrocer": { + "name": "菜檔", + "terms": "菜檔" + }, + "shop/hairdresser": { + "name": "飛髮舖", + "terms": "飛髮舖" + }, + "shop/hardware": { + "name": "五金舖", + "terms": "五金舖" + }, + "shop/hifi": { + "name": "音響舖", + "terms": "音響舖" + }, + "shop/jewelry": { + "name": "珠寶店", + "terms": "珠寶店" + }, + "shop/kiosk": { + "name": "售賣亭", + "terms": "售賣亭" + }, + "shop/laundry": { + "name": "洗衣舖", + "terms": "洗衣舖" + }, + "shop/locksmith": { + "name": "鎖匠", + "terms": "鎖匠,開鎖佬" + }, + "shop/mall": { + "name": "大商場", + "terms": "大商場" + }, + "shop/mobile_phone": { + "name": "電話舖", + "terms": "電話舖" + }, + "shop/motorcycle": { + "name": "電單車行", + "terms": "電單車行" + }, + "shop/music": { + "name": "唱片舖", + "terms": "唱片舖" + }, + "shop/newsagent": { + "name": "報紙檔", + "terms": "報紙檔" + }, + "shop/optician": { + "name": "眼鏡鋪", + "terms": "眼鏡鋪" + }, + "shop/outdoor": { + "name": "行山舖", + "terms": "行山舖" + }, + "shop/pet": { + "name": "寵物舖", + "terms": "寵物舖" + }, + "shop/photo": { + "name": "影相舖", + "terms": "影相舖" + }, + "shop/shoes": { + "name": "鞋舖", + "terms": "鞋舖" + }, + "shop/sports": { + "name": "運動舖", + "terms": "運動舖" + }, + "shop/stationery": { + "name": "文具舖", + "terms": "文具舖" + }, + "shop/supermarket": { + "name": "超級市場", + "terms": "超級市場" + }, + "shop/toys": { + "name": "玩具舖", + "terms": "玩具舖" + }, + "shop/travel_agency": { + "name": "旅行社", + "terms": "旅行社" + }, + "shop/tyres": { + "name": "軚舖", + "terms": "軚舖" + }, + "shop/vacant": { + "name": "吉舖", + "terms": "吉舖" + }, + "shop/variety_store": { + "name": "雜貨舖", + "terms": "雜貨舖" + }, + "shop/video": { + "name": "影視店", + "terms": "影視店" + }, + "tourism": { + "name": "旅行", + "terms": "旅行" + }, + "tourism/alpine_hut": { + "name": "高山屋仔", + "terms": "高山屋仔" + }, + "tourism/artwork": { + "name": "藝術品", + "terms": "藝術品" + }, + "tourism/attraction": { + "name": "旅行名勝", + "terms": "旅行名勝" + }, + "tourism/camp_site": { + "name": "營地", + "terms": "營地" + }, + "tourism/caravan_site": { + "name": "露營車停車場", + "terms": "露營車停車場" + }, + "tourism/chalet": { + "name": "木屋", + "terms": "木屋" + }, + "tourism/guest_house": { + "name": "賓館", + "terms": "賓館" + }, + "tourism/hostel": { + "name": "旅舍", + "terms": "旅舍" + }, + "tourism/hotel": { + "name": "酒店", + "terms": "酒店" + }, + "tourism/information": { + "name": "資訊處", + "terms": "資訊處" + }, + "tourism/motel": { + "name": "汽車酒店", + "terms": "汽車酒店" + }, + "tourism/museum": { + "name": "博物館", + "terms": "博物館" + }, + "tourism/picnic_site": { + "name": "郊遊地點", + "terms": "郊遊地點" + }, + "tourism/theme_park": { + "name": "主題主園", + "terms": "主題主園" + }, + "tourism/viewpoint": { + "name": "觀景", + "terms": "觀景" + }, + "tourism/zoo": { + "name": "動物園", + "terms": "動物園" + }, + "type/boundary": { + "name": "界", + "terms": "界" + }, + "type/boundary/administrative": { + "name": "行政邊界", + "terms": "行政邊界" + }, + "type/multipolygon": { + "name": "幾多邊形", + "terms": "幾多邊形" + }, + "type/restriction": { + "name": "限制", + "terms": "限制" + }, + "type/route": { + "name": "路綫", + "terms": "路綫" + }, + "type/route/bicycle": { + "name": "單車路綫", + "terms": "單車路綫" + }, + "type/route/bus": { + "name": "巴士路綫", + "terms": "巴士路綫" + }, + "type/route/detour": { + "name": "巡遊路綫", + "terms": "巡遊路綫" + }, + "type/route/ferry": { + "name": "航綫", + "terms": "航綫" + }, + "type/route/foot": { + "name": "行人路綫", + "terms": "行人路綫" + }, + "type/route/hiking": { + "name": "行山路綫", + "terms": "行山路綫" + }, + "type/route/pipeline": { + "name": "供水路綫", + "terms": "供水路綫" + }, + "type/route/power": { + "name": "供電路綫", + "terms": "供電路綫" + }, + "type/route/road": { + "name": "行車路綫", + "terms": "行車路綫" + }, + "type/route/train": { + "name": "火車路綫", + "terms": "火車路綫" + }, + "type/route/tram": { + "name": "電車路綫", + "terms": "電車路綫" + }, + "type/route_master": { + "name": "路綫總管", + "terms": "路綫總管" + }, + "vertex": { + "name": "其他", + "terms": "其他" + }, + "waterway": { + "name": "æ°´è·¯", + "terms": "æ°´è·¯" + }, + "waterway/canal": { + "name": "水道", + "terms": "水道" + }, + "waterway/dam": { + "name": "壩", + "terms": "壩" + }, + "waterway/ditch": { + "name": "溝", + "terms": "溝" + }, + "waterway/drain": { + "name": "排水道", + "terms": "排水道" + }, + "waterway/river": { + "name": "江", + "terms": "江" + }, + "waterway/riverbank": { + "name": "江岸", + "terms": "江岸" + }, + "waterway/stream": { + "name": "涌", + "terms": "涌" + }, + "waterway/weir": { + "name": "å °", + "terms": "å °" + } + } + } +} \ No newline at end of file diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json index 52aef4f05..9ddf066ae 100644 --- a/vendor/assets/iD/iD/locales/zh-CN.json +++ b/vendor/assets/iD/iD/locales/zh-CN.json @@ -18,13 +18,20 @@ "browse": { "title": "浏览", "description": "移动和缩放地图。" + }, + "draw_area": { + "tail": "点击以为这个面添加节点。点击第一点来完成绘制区域。" + }, + "draw_line": { + "tail": "点击以为这线段添加更多节点。点击其他线段以连接它们，点击两下以完成绘制线段。" } }, "operations": { "add": { "annotation": { "point": "添加了一个点。", - "vertex": "向路径添加了一个节点。" + "vertex": "向路径添加了一个节点。", + "relation": "新增一个关系。" } }, "start": { @@ -34,23 +41,56 @@ } }, "continue": { + "key": "A", + "title": "继续", + "description": "继续绘制这条线。", + "not_eligible": "这里没有线可以在继续。", "annotation": { - "line": "继续绘制了一条线。" + "line": "继续绘制了一条线。", + "area": "继续绘制了一个面。" } }, "cancel_draw": { "annotation": "绘制已取消。" }, + "change_role": { + "annotation": "已更改关系成员的角色。" + }, "change_tags": { "annotation": "标记已更改。" }, "circularize": { - "title": "制成圆形", + "title": "环形化", + "description": { + "line": "把此线段环形化。", + "area": "把此区域环形化。" + }, "key": "O", "annotation": { - "line": "添加一个线形圆。", - "area": "制作一个区域圆。" - } + "line": "将线段变成环形。", + "area": "将一区域制成环形。" + }, + "not_closed": "非圈状物件，不能环形化。" + }, + "orthogonalize": { + "title": "直角化", + "description": { + "line": "将这条线上的弯角转化成直角。", + "area": "将这个区域上的弯角转化成直角。" + }, + "key": "S", + "annotation": { + "line": "已将线段上的弯角换成直角。", + "area": "已将区域的弯角换成直角。" + }, + "not_squarish": "因为它不是近似方形的，这不能被直角化。" + }, + "straighten": { + "title": "拉直", + "description": "把这一条线拉直。", + "key": "S", + "annotation": "已拉直了一条线。", + "too_bendy": "因为它弯曲太多，不能拉直。" }, "delete": { "title": "删除", @@ -62,7 +102,14 @@ "area": "删除了一个区域。", "relation": "删除一个关系。", "multiple": "删除了 {n} 个对象。" - } + }, + "incomplete_relation": "此内容暂未下载完成无法删除。" + }, + "add_member": { + "annotation": "增加关系中的成员。" + }, + "delete_member": { + "annotation": "删除关系中的成员。" }, "connect": { "annotation": { @@ -74,13 +121,19 @@ }, "disconnect": { "title": "断开连接", - "key": "D" + "description": "断开这些线。", + "key": "D", + "annotation": "断开线。", + "not_connected": "没有足够的线/面来断开。" }, "merge": { "title": "合并", "description": "合并这些线。", "key": "C", - "annotation": "合并了 {n} 条线。" + "annotation": "合并了 {n} 条线。", + "not_eligible": "这些要素不能被合并。", + "not_adjacent": "这些线段并不连接，不能合并。", + "restriction": "这些线段不能合并，因为其中最少有一条线段是\"{relation}\"关系的成员。" }, "move": { "title": "移动", @@ -96,6 +149,7 @@ }, "rotate": { "title": "旋转", + "description": "绕这个对象的中心点旋转。", "key": "R", "annotation": { "line": "旋转了一条线。", @@ -109,11 +163,20 @@ "annotation": "反转了一条线。" }, "split": { - "title": "切割", + "title": "分割", + "description": { + "line": "在此节点上将这条线分割成两条线。", + "area": "将这个面的边界一分为二。", + "multiple": "在这一节点将线/面的边界一分为二。" + }, "key": "X", "annotation": { - "line": "切割一条线。" - } + "line": "切割一条线。", + "area": "分割一区域的边界。", + "multiple": "分割{n}的项线段/区域的边界。" + }, + "not_eligible": "不能在线段的首尾进行分割。", + "multiple_ways": "太多线段，未能进行分割。" } }, "undo": { @@ -128,6 +191,7 @@ "browser_notice": "本编辑器仅被 Firefox、Chrome、Safari、Opera 和 Internet Explorer 9 以上所支持。请升级您的浏览器或使用 Potlatch 2 来编辑地图。", "translate": { "translate": "翻译", + "localized_translation_label": "多语言名称", "localized_translation_language": "选择语言", "localized_translation_name": "名称" }, @@ -144,6 +208,8 @@ "title": "保存更改", "description_placeholder": "简单说明你的贡献。", "message_label": "提交信息", + "upload_explanation": "你的修改将会在所有使用OpenStreetMap的数据的地图上看得见。", + "upload_explanation_with_user": "你以{user}具名的修改将会在所有使用OpenStreetMap的数据的地图上看得见。", "save": "保存", "cancel": "取消", "warnings": "警告", @@ -155,29 +221,49 @@ "list": "由 {users} 编辑", "truncated_list": "由 {users} 等 {count} 位编辑" }, + "geocoder": { + "search": "在全球搜索...", + "no_results_visible": "在可见地图区域没有结果", + "no_results_worldwide": "没有找到结果" + }, "geolocate": { - "title": "显示我的地理位置" + "title": "显示我的位置" }, "inspector": { - "no_documentation_key": "此键值没有文档。", + "no_documentation_combination": "这个标签组合没有可用的说明", + "no_documentation_key": "这个键值没有可用的说明", "show_more": "显示更多", + "view_on_osm": "在openstreetmap.org中查看", "all_tags": "所有标记", "all_members": "所有成员", + "all_relations": "所有关系", + "new_relation": "新建关系...", + "role": "角色", "choose": "选择标记内容种类。", "results": " 搜索 {search} 有 {n} 个结果。", + "reference": "在OpenStreetMap Wiki中查看", + "back_tooltip": "修改物件", "remove": "删除", "search": "搜索", - "unknown": "未知" + "multiselect": "选择项目", + "unknown": "未知", + "incomplete": "<未有下载>", + "feature_list": "搜索要素", + "edit": "编辑要素", + "none": "空" }, "background": { "title": "背景", "description": "背景设置", + "percent_brightness": "{opacity}%不透明度", + "none": "空", "custom": "自定义", - "fix_misalignment": "修正不对准", + "fix_misalignment": "修复对齐", "reset": "重置" }, "restore": { "heading": "您有未保存的更改", + "description": "您在上一次编辑时仍有未保存的修改，你想恢复这些修改吗？", "restore": "恢复", "reset": "重置" }, @@ -202,11 +288,14 @@ }, "splash": { "welcome": "欢迎使用 iD OpenStreetMap 编辑器", + "text": "ID编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情，请浏览{website}及在{github}报告程序错误。“", "walkthrough": "开始演示", "start": "现在编辑" }, "source_switch": { - "dev": "开发版本" + "live": "实况模式", + "lose_changes": "您有尚未保存的编辑，切换地图服务器会失去这些编辑。您是否确定要切换服务器？", + "dev": "开发模式" }, "tag_reference": { "description": "描述", @@ -214,16 +303,23 @@ "used_with": "使用 {type}" }, "validations": { + "untagged_point": "未标记的点", "untagged_line": "未标记的线", "untagged_area": "未标记的区域", - "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。" + "many_deletions": "您正在删除 {n} 个对象，您确定要这么做吗？这将会把它们从大家所见的 openstreetmap.org 地图上删除。", + "tag_suggests_area": "{tag}的标签所建议的线段应为区域，但这个不是一区域", + "deprecated_tags": "已弃用的标签︰{tags}" }, "zoom": { "in": "放大", "out": "缩小" }, + "cannot_zoom": "在此模式下不能再缩小", "gpx": { - "local_layer": "本地 GPX 文件" + "local_layer": "本地 GPX 文件", + "drag_drop": "拖放GPX文件到页面上，或按一下浏览按钮，", + "zoom": "缩放到GPX轨迹", + "browse": "浏览GPX文件" }, "help": { "title": "帮助" @@ -231,7 +327,8 @@ "intro": { "navigation": { "title": "导航", - "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图！**" + "drag": "主地图区域在背景上展示了 OpenStreetMap 数据。您可以像在其它网络地图一样通过拖动和滚动来移动。**拖动地图！**", + "header": "上方显示要素种类" }, "points": { "title": "点" @@ -244,11 +341,16 @@ }, "startediting": { "title": "开始编辑", + "help": "在这里有更多使用说明，还可以重温简介", + "save": "不要忘了定期保存你的修改！", "start": "开始作图！" } }, "presets": { "categories": { + "category-building": { + "name": "建筑物" + }, "category-landuse": { "name": "土地使用" }, @@ -261,29 +363,90 @@ "category-road": { "name": "道路" }, - "category-water": { - "name": "水体" + "category-route": { + "name": "路线" + }, + "category-water-area": { + "name": "æ°´" + }, + "category-water-line": { + "name": "æ°´" } }, "fields": { "access": { - "placeholder": "未知" + "label": "通行限制", + "placeholder": "未知", + "types": { + "access": "普通", + "foot": "步行", + "motor_vehicle": "汽车", + "bicycle": "自行车", + "horse": "马匹" + }, + "options": { + "yes": { + "title": "允许的", + "description": "按法律及路权，有权使用" + }, + "no": { + "title": "禁止的", + "description": "禁止一般公众进入" + }, + "permissive": { + "title": "获许可进入", + "description": "容许进入，直至拥有者撇回许可" + }, + "private": { + "title": "私人", + "description": "须拥有者个别批准，方可进入" + }, + "designated": { + "title": "特定的", + "description": "只限标志指定或特定本地法律容许人士进入" + }, + "destination": { + "title": "目的地", + "description": "只限前往目的地人士进入" + } + } + }, + "access_toilets": { + "label": "连接" }, "address": { "label": "地址", "placeholders": { + "housename": "房屋名称", + "number": "123号", "street": "街道", - "city": "城市" + "city": "城市", + "postcode": "邮政编码" } }, + "admin_level": { + "label": "行政级别" + }, "aeroway": { "label": "类型" }, "amenity": { "label": "类型" }, + "artist": { + "label": "艺人" + }, + "artwork_type": { + "label": "类型" + }, "atm": { - "label": "自动柜员机" + "label": "ATM" + }, + "backrest": { + "label": "长椅" + }, + "barrier": { + "label": "类型" }, "bicycle_parking": { "label": "类型" @@ -300,15 +463,69 @@ "building_yes": { "label": "建筑物" }, + "capacity": { + "label": "容量", + "placeholder": "50, 100, 200..." + }, + "cardinal_direction": { + "label": "方向" + }, + "clock_direction": { + "label": "方向", + "options": { + "clockwise": "顺时针", + "anticlockwise": "逆时针" + } + }, + "collection_times": { + "label": "收集时间" + }, "construction": { "label": "类型" }, + "country": { + "label": "国家" + }, "crossing": { "label": "类型" }, + "cuisine": { + "label": "美食" + }, + "denomination": { + "label": "教派" + }, + "denotation": { + "label": "意思" + }, "description": { "label": "描述" }, + "elevation": { + "label": "海拔" + }, + "emergency": { + "label": "急诊室" + }, + "entrance": { + "label": "类型" + }, + "fax": { + "label": "传真", + "placeholder": "+31 42 123 4567" + }, + "fee": { + "label": "费用" + }, + "fire_hydrant/type": { + "label": "类型" + }, + "fixme": { + "label": "修复我" + }, + "generator/method": { + "label": "模式" + }, "generator/source": { "label": "来源" }, @@ -321,54 +538,118 @@ "historic": { "label": "类型" }, + "iata": { + "label": "国际航空运输协会IATA" + }, + "icao": { + "label": "国际民航组织ICAO" + }, + "incline": { + "label": "斜度" + }, "internet_access": { + "label": "互联网接入", "options": { "wlan": "无线网络", - "terminal": "终点" + "wired": "有线网络", + "terminal": "终端" } }, "landuse": { "label": "类型" }, + "lanes": { + "label": "车道", + "placeholder": "1, 2, 3..." + }, "layer": { - "label": "层级" + "label": "层" }, "leisure": { "label": "类型" }, "levels": { - "label": "层次" + "label": "层次", + "placeholder": "2, 4, 6..." + }, + "lit": { + "label": "有灯" + }, + "location": { + "label": "位置" }, "man_made": { "label": "类型" }, "maxspeed": { - "label": "限速" + "label": "限速", + "placeholder": "40, 50, 60..." + }, + "name": { + "label": "名称", + "placeholder": "常用名称（如有）" + }, + "natural": { + "label": "自然" }, "network": { "label": "网络" }, + "note": { + "label": "备注" + }, "office": { "label": "类型" }, "oneway": { "label": "单向" }, + "oneway_yes": { + "label": "单向" + }, "opening_hours": { - "label": "小时" + "label": "时间" + }, + "operator": { + "label": "经营者" + }, + "park_ride": { + "label": "停车换乘" + }, + "parking": { + "label": "类型" }, "phone": { - "label": "电话" + "label": "电话", + "placeholder": "+31 42 123 4567" }, "place": { "label": "类型" }, + "power": { + "label": "类型" + }, "railway": { "label": "类型" }, + "ref": { + "label": "参考" + }, "relation": { "label": "类型" }, + "religion": { + "label": "宗教", + "options": { + "christian": "基督教", + "muslim": "穆斯林", + "buddhist": "佛教", + "jewish": "犹太教", + "hindu": "印度教", + "shinto": "神道教", + "taoist": "道教" + } + }, "restriction": { "label": "类型" }, @@ -378,40 +659,1532 @@ "route_master": { "label": "类型" }, + "sac_scale": { + "label": "行径难度" + }, "service": { "label": "类型" }, + "shelter": { + "label": "避难所" + }, + "shop": { + "label": "类型" + }, "source": { "label": "来源" }, "sport": { "label": "运动" }, + "structure": { + "label": "结构", + "placeholder": "未知种类", + "options": { + "bridge": "æ¡¥", + "tunnel": "隧道", + "embankment": "堤岸", + "cutting": "开凿" + } + }, + "supervised": { + "label": "监督" + }, "surface": { "label": "表面" }, + "toilets/disposal": { + "label": "废弃" + }, "tourism": { "label": "类型" }, + "towertype": { + "label": "塔型" + }, + "tracktype": { + "label": "类型" + }, + "trail_visibility": { + "label": "路径可见度" + }, + "tree_type": { + "label": "类型" + }, + "vending": { + "label": "商品类型" + }, + "water": { + "label": "类型" + }, + "waterway": { + "label": "类型" + }, + "website": { + "label": "网站", + "placeholder": "http://example.com/" + }, + "wetland": { + "label": "类型" + }, + "wheelchair": { + "label": "轮椅通道" + }, "wikipedia": { "label": "维基百科" + }, + "wood": { + "label": "类型" } }, "presets": { "address": { - "name": "地址" + "name": "地址", + "terms": "地址,址" + }, + "aeroway": { + "name": "机场相关道路", + "terms": "机场" + }, + "aeroway/aerodrome": { + "name": "机场", + "terms": "机场" + }, + "aeroway/apron": { + "name": "停机坪", + "terms": "停机坪" + }, + "aeroway/gate": { + "name": "机场闸口", + "terms": "机场闸口" + }, + "aeroway/hangar": { + "name": "机库", + "terms": "机库" + }, + "aeroway/helipad": { + "name": "直升机场", + "terms": "直升机场,直升机坪" + }, + "aeroway/runway": { + "name": "跑道", + "terms": "跑道" + }, + "aeroway/taxiway": { + "name": "滑行道", + "terms": "滑行道" + }, + "aeroway/terminal": { + "name": "机场航站楼", + "terms": "机场航站楼,机场大楼,机场客运大楼" + }, + "amenity": { + "name": "便利设施", + "terms": "便利设施" + }, + "amenity/arts_centre": { + "name": "美术馆", + "terms": "美术馆,艺术馆,美术中心,艺术中心" + }, + "amenity/atm": { + "name": "ATM", + "terms": "ATM,提款机,自动提款机" + }, + "amenity/bank": { + "name": "银行", + "terms": "银行" + }, + "amenity/bar": { + "name": "酒吧", + "terms": "酒吧" + }, + "amenity/bench": { + "name": "长椅", + "terms": "长椅,长凳" + }, + "amenity/bicycle_parking": { + "name": "自行车停放处", + "terms": "自行车停放处,单车停放车" + }, + "amenity/bicycle_rental": { + "name": "自行车租赁处", + "terms": "自行车租赁处,租单车" + }, + "amenity/boat_rental": { + "name": "船舶租赁处", + "terms": "船舶租赁处" + }, + "amenity/cafe": { + "name": "咖啡", + "terms": "咖啡,咖啡厅,茶座" + }, + "amenity/car_rental": { + "name": "汽车租赁处", + "terms": "汽车租赁处,租车店" + }, + "amenity/car_sharing": { + "name": "公用车处", + "terms": "公用车处" + }, + "amenity/car_wash": { + "name": "洗车店", + "terms": "洗车店,洗车" + }, + "amenity/childcare": { + "name": "托儿所", + "terms": "托儿所" + }, + "amenity/cinema": { + "name": "电影院", + "terms": "电影院,电影,戏院" + }, + "amenity/college": { + "name": "学院", + "terms": "学院,书院,专科学院" + }, + "amenity/courthouse": { + "name": "法院", + "terms": "法院,法庭" + }, + "amenity/drinking_water": { + "name": "饮水处", + "terms": "饮水处,饮水处,饮水" + }, + "amenity/embassy": { + "name": "使馆", + "terms": "使馆,大使馆,领事馆" + }, + "amenity/fast_food": { + "name": "快餐店", + "terms": "快餐店" + }, + "amenity/fire_station": { + "name": "消防站", + "terms": "消防站,消费局" + }, + "amenity/fountain": { + "name": "喷泉", + "terms": "喷泉,喷水池,水景" + }, + "amenity/fuel": { + "name": "加油站", + "terms": "加油站,加气站,油站" + }, + "amenity/grave_yard": { + "name": "墓地", + "terms": "墓地,坟地" + }, + "amenity/hospital": { + "name": "医院", + "terms": "医院,医疗院,医学中心" + }, + "amenity/kindergarten": { + "name": "幼儿园", + "terms": "幼儿园,幼稚园" + }, + "amenity/library": { + "name": "图书馆", + "terms": "图书馆" + }, + "amenity/marketplace": { + "name": "市场", + "terms": "市场,菜市场" + }, + "amenity/parking": { + "name": "停车场", + "terms": "停车场" + }, + "amenity/pharmacy": { + "name": "药房", + "terms": "药房,药店" + }, + "amenity/place_of_worship": { + "name": "礼拜场所", + "terms": "礼拜场所,宗教礼拜处" + }, + "amenity/place_of_worship/buddhist": { + "name": "寺庙", + "terms": "寺庙,佛堂,和尚寺,尼姑庵" + }, + "amenity/place_of_worship/christian": { + "name": "教堂", + "terms": "教堂" + }, + "amenity/place_of_worship/jewish": { + "name": "犹太教堂", + "terms": "犹太教堂,犹太寺" + }, + "amenity/place_of_worship/muslim": { + "name": "清真寺", + "terms": "清真寺,回教寺" + }, + "amenity/police": { + "name": "警察局", + "terms": "警察局,警局,警署,派出所" + }, + "amenity/post_box": { + "name": "邮箱", + "terms": "邮箱,邮筒" + }, + "amenity/post_office": { + "name": "邮局", + "terms": "邮局,邮政局" + }, + "amenity/pub": { + "name": "酒馆", + "terms": "酒馆" + }, + "amenity/ranger_station": { + "name": "野郊访客处", + "terms": "野郊访客处" + }, + "amenity/restaurant": { + "name": "餐馆", + "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼" + }, + "amenity/school": { + "name": "学校", + "terms": "学校，小学,中学" + }, + "amenity/swimming_pool": { + "name": "游泳池", + "terms": "游泳池,泳池" + }, + "amenity/taxi": { + "name": "出租车站", + "terms": "出租车站,的士站,计程车站" + }, + "amenity/telephone": { + "name": "电话", + "terms": "电话" + }, + "amenity/theatre": { + "name": "剧院", + "terms": "剧院,剧场,戏院" + }, + "amenity/toilets": { + "name": "厕所", + "terms": "厕所,公厕,洗手间" + }, + "amenity/townhall": { + "name": "市政府", + "terms": "市政府,市政厅,大会堂" + }, + "amenity/university": { + "name": "大学", + "terms": "大学" + }, + "amenity/vending_machine": { + "name": "售卖机", + "terms": "售卖机" + }, + "amenity/waste_basket": { + "name": "垃圾箱", + "terms": "垃圾箱,垃圾桶" }, "area": { - "name": "区域" + "name": "区域", + "terms": "区域" + }, + "barrier": { + "name": "屏障", + "terms": "屏障,阻挡" + }, + "barrier/block": { + "name": "路障", + "terms": "路障,障碍物" + }, + "barrier/bollard": { + "name": "护柱", + "terms": "护柱" + }, + "barrier/cattle_grid": { + "name": "家畜栅栏", + "terms": "家畜栅栏" + }, + "barrier/city_wall": { + "name": "城墙", + "terms": "城墙" + }, + "barrier/cycle_barrier": { + "name": "单车减速栏", + "terms": "单车减速栏" + }, + "barrier/ditch": { + "name": "沟", + "terms": "沟" + }, + "barrier/entrance": { + "name": "入口", + "terms": "入口" + }, + "barrier/fence": { + "name": "篱笆", + "terms": "篱笆" + }, + "barrier/gate": { + "name": "门", + "terms": "门" + }, + "barrier/hedge": { + "name": "树篱", + "terms": "树篱" + }, + "barrier/kissing_gate": { + "name": "单人转门", + "terms": "单人转门" + }, + "barrier/lift_gate": { + "name": "道闸", + "terms": "道闸,挡车器" + }, + "barrier/retaining_wall": { + "name": "挡土墙", + "terms": "挡土墙" + }, + "barrier/stile": { + "name": "梯梃", + "terms": "梯梃" + }, + "barrier/toll_booth": { + "name": "收费站", + "terms": "收费站" + }, + "barrier/wall": { + "name": "墙", + "terms": "收费站" + }, + "boundary/administrative": { + "name": "行政区域界线", + "terms": "行政区域界线" + }, + "building": { + "name": "建筑物", + "terms": "建筑物，屋宇" + }, + "building/apartments": { + "name": "公寓", + "terms": "公寓" + }, + "building/commercial": { + "name": "商业建筑物", + "terms": "商业建筑物" + }, + "building/entrance": { + "name": "入口", + "terms": "入口" + }, + "building/garage": { + "name": "车库", + "terms": "车库" + }, + "building/house": { + "name": "房屋", + "terms": "房屋" + }, + "building/hut": { + "name": "棚屋", + "terms": "棚屋" + }, + "building/industrial": { + "name": "工业建筑物", + "terms": "工业建筑物" + }, + "building/residential": { + "name": "住宅建筑物", + "terms": "住宅建筑物" + }, + "emergency/ambulance_station": { + "name": "救护站", + "terms": "救护站" + }, + "emergency/fire_hydrant": { + "name": "消防栓", + "terms": "消防栓" + }, + "emergency/phone": { + "name": "紧急电话", + "terms": "紧急电话" + }, + "entrance": { + "name": "入口", + "terms": "入口" + }, + "footway/crossing": { + "name": "路口", + "terms": "路口" + }, + "footway/sidewalk": { + "name": "行人路", + "terms": "行人路" + }, + "highway": { + "name": "公路", + "terms": "公路" + }, + "highway/bridleway": { + "name": "马道", + "terms": "马道" + }, + "highway/bus_stop": { + "name": "公交车站", + "terms": "公交车站,巴士站" + }, + "highway/crossing": { + "name": "路口", + "terms": "路口" + }, + "highway/cycleway": { + "name": "自行车道", + "terms": "自行车道" + }, + "highway/footway": { + "name": "步行径", + "terms": "步行径" + }, + "highway/living_street": { + "name": "居住街道", + "terms": "居住街道" + }, + "highway/mini_roundabout": { + "name": "小型环岛", + "terms": "小型环岛" + }, + "highway/motorway": { + "name": "高速公路", + "terms": "高速公路" + }, + "highway/motorway_junction": { + "name": "高速公路连接点", + "terms": "高速公路连接点" + }, + "highway/motorway_link": { + "name": "高速公路匝道", + "terms": "高速公路匝道" + }, + "highway/path": { + "name": "路径", + "terms": "路径" + }, + "highway/pedestrian": { + "name": "行人专用路", + "terms": "行人专用路" + }, + "highway/primary": { + "name": "主要道路", + "terms": "主要道路" + }, + "highway/primary_link": { + "name": "主要道路匝道", + "terms": "主要道路匝道" + }, + "highway/residential": { + "name": "住宅区道路", + "terms": "住宅区道路" + }, + "highway/road": { + "name": "未知种类道路", + "terms": "未知种类道路" + }, + "highway/secondary": { + "name": "次要道路", + "terms": "次要道路" + }, + "highway/secondary_link": { + "name": "次要道路匝道", + "terms": "次要道路匝道" + }, + "highway/service": { + "name": "辅助道路", + "terms": "辅助道路" + }, + "highway/service/alley": { + "name": "胡同", + "terms": "胡同,å··" + }, + "highway/service/drive-through": { + "name": "免下车", + "terms": "免下车,免下车餐馆,免下车银行" + }, + "highway/service/driveway": { + "name": "车道", + "terms": "车道" + }, + "highway/service/emergency_access": { + "name": "紧急通道", + "terms": "紧急通道" + }, + "highway/service/parking_aisle": { + "name": "停车场通道", + "terms": "停车场通道" + }, + "highway/steps": { + "name": "楼梯", + "terms": "楼梯" + }, + "highway/stop": { + "name": "停车标志", + "terms": "停车标志" + }, + "highway/tertiary": { + "name": "三级道路", + "terms": "三级道路" + }, + "highway/tertiary_link": { + "name": "三级道路匝道", + "terms": "三级道路匝道" + }, + "highway/track": { + "name": "未铺设路面的车径", + "terms": "未铺设路面的车径" + }, + "highway/traffic_signals": { + "name": "红绿灯", + "terms": "红绿灯" + }, + "highway/trunk": { + "name": "干线道路", + "terms": "干线道路" + }, + "highway/trunk_link": { + "name": "干线道路匝道", + "terms": "干线道路匝道" + }, + "highway/turning_circle": { + "name": "环岛", + "terms": "环岛" + }, + "highway/unclassified": { + "name": "未分级的道路", + "terms": "未分级的道路" + }, + "historic": { + "name": "历史遗迹", + "terms": "历史遗迹,史迹" + }, + "historic/archaeological_site": { + "name": "考古遗址", + "terms": "考古遗址" + }, + "historic/boundary_stone": { + "name": "界桩", + "terms": "界桩" + }, + "historic/castle": { + "name": "城堡", + "terms": "城堡" + }, + "historic/memorial": { + "name": "纪念馆", + "terms": "纪念馆" + }, + "historic/monument": { + "name": "纪念碑", + "terms": "纪念碑,古迹" + }, + "historic/ruins": { + "name": "废墟", + "terms": "废墟" + }, + "historic/wayside_cross": { + "name": "路边十字架", + "terms": "路边十字架" + }, + "historic/wayside_shrine": { + "name": "路边神社", + "terms": "路边神社" + }, + "landuse": { + "name": "土地用途", + "terms": "土地用途" + }, + "landuse/allotments": { + "name": "菜地", + "terms": "菜地,社区花园" + }, + "landuse/basin": { + "name": "æ°´æ± ", + "terms": "æ°´æ± " + }, + "landuse/cemetery": { + "name": "墓地", + "terms": "墓地" + }, + "landuse/commercial": { + "name": "商业区", + "terms": "商业区" + }, + "landuse/construction": { + "name": "建筑物", + "terms": "建筑物" + }, + "landuse/farm": { + "name": "农场", + "terms": "农场" + }, + "landuse/farmyard": { + "name": "农庄", + "terms": "农庄" + }, + "landuse/forest": { + "name": "森林", + "terms": "森林" + }, + "landuse/grass": { + "name": "草地", + "terms": "草地" + }, + "landuse/industrial": { + "name": "工业区", + "terms": "工业区" + }, + "landuse/meadow": { + "name": "牧场", + "terms": "牧场" + }, + "landuse/orchard": { + "name": "果园", + "terms": "果园" + }, + "landuse/quarry": { + "name": "矿场", + "terms": "矿场" + }, + "landuse/residential": { + "name": "住宅区", + "terms": "住宅区" + }, + "landuse/retail": { + "name": "零售", + "terms": "零售" + }, + "landuse/vineyard": { + "name": "葡萄园", + "terms": "葡萄园,酒庄" + }, + "leisure": { + "name": "休闲场所", + "terms": "休闲场所" + }, + "leisure/common": { + "name": "公共用地", + "terms": "公共用地" + }, + "leisure/dog_park": { + "name": "狗公园", + "terms": "狗公园" + }, + "leisure/garden": { + "name": "花园", + "terms": "花园" + }, + "leisure/golf_course": { + "name": "高尔夫球场", + "terms": "高尔夫球场" + }, + "leisure/marina": { + "name": "码头", + "terms": "码头" + }, + "leisure/park": { + "name": "公园", + "terms": "公园" + }, + "leisure/pitch": { + "name": "运动场", + "terms": "运动场,运动场所" + }, + "leisure/pitch/american_football": { + "name": "美式足球场", + "terms": "美式足球场" + }, + "leisure/pitch/baseball": { + "name": "棒球场", + "terms": "棒球场" + }, + "leisure/pitch/basketball": { + "name": "篮球场", + "terms": "篮球场" + }, + "leisure/pitch/skateboard": { + "name": "滑板场", + "terms": "滑板场" + }, + "leisure/pitch/soccer": { + "name": "足球场", + "terms": "足球场" + }, + "leisure/pitch/tennis": { + "name": "网球场", + "terms": "网球场" + }, + "leisure/pitch/volleyball": { + "name": "排球场", + "terms": "排球场" + }, + "leisure/playground": { + "name": "游乐场", + "terms": "游乐场" + }, + "leisure/slipway": { + "name": "船台", + "terms": "船台" + }, + "leisure/sports_center": { + "name": "体育中心", + "terms": "体育中心" + }, + "leisure/stadium": { + "name": "体育场", + "terms": "体育场" + }, + "leisure/swimming_pool": { + "name": "游泳池", + "terms": "游泳池" + }, + "leisure/track": { + "name": "赛车跑道", + "terms": "赛车跑道" }, "line": { - "name": "线" + "name": "线", + "terms": "线" + }, + "man_made": { + "name": "人造物", + "terms": "人造物" + }, + "man_made/breakwater": { + "name": "防波堤", + "terms": "防波堤" + }, + "man_made/cutline": { + "name": "分界线", + "terms": "分界线" + }, + "man_made/lighthouse": { + "name": "灯塔", + "terms": "灯塔" + }, + "man_made/observation": { + "name": "瞭望塔", + "terms": "瞭望塔" + }, + "man_made/pier": { + "name": "码头", + "terms": "码头" + }, + "man_made/pipeline": { + "name": "管道", + "terms": "管道" + }, + "man_made/survey_point": { + "name": "测量点", + "terms": "测量点" + }, + "man_made/tower": { + "name": "塔", + "terms": "塔" + }, + "man_made/wastewater_plant": { + "name": "污水处理厂", + "terms": "污水处理厂" + }, + "man_made/water_tower": { + "name": "水塔", + "terms": "水塔" + }, + "man_made/water_well": { + "name": "水井", + "terms": "水井" + }, + "man_made/water_works": { + "name": "供水厂", + "terms": "供水厂" + }, + "natural": { + "name": "自然", + "terms": "自然" + }, + "natural/bay": { + "name": "æµ·æ¹¾", + "terms": "æµ·æ¹¾" + }, + "natural/beach": { + "name": "海滩", + "terms": "海滩" + }, + "natural/cliff": { + "name": "悬崖", + "terms": "悬崖" + }, + "natural/coastline": { + "name": "海岸线", + "terms": "海岸线" + }, + "natural/fell": { + "name": "高原荒原", + "terms": "高原荒原" + }, + "natural/glacier": { + "name": "冰川", + "terms": "冰川" + }, + "natural/grassland": { + "name": "草原", + "terms": "草原" + }, + "natural/heath": { + "name": "荒野", + "terms": "荒野" + }, + "natural/peak": { + "name": "山峰", + "terms": "山峰" + }, + "natural/scree": { + "name": "碎石坡", + "terms": "碎石坡" + }, + "natural/scrub": { + "name": "灌木丛", + "terms": "灌木丛" + }, + "natural/spring": { + "name": "泉水", + "terms": "泉水" + }, + "natural/tree": { + "name": "树", + "terms": "树" + }, + "natural/water": { + "name": "æ°´", + "terms": "æ°´" + }, + "natural/water/lake": { + "name": "湖泊", + "terms": "湖泊" + }, + "natural/water/pond": { + "name": "池塘", + "terms": "池塘" + }, + "natural/water/reservoir": { + "name": "水库", + "terms": "水库" + }, + "natural/wetland": { + "name": "湿地", + "terms": "湿地" + }, + "natural/wood": { + "name": "树林", + "terms": "树林" + }, + "office": { + "name": "写字楼", + "terms": "办公室,写字楼" + }, + "office/accountant": { + "name": "会计师楼", + "terms": "会计师楼" + }, + "office/administrative": { + "name": "行政楼", + "terms": "行政楼" + }, + "office/architect": { + "name": "建筑师楼", + "terms": "建筑师楼" + }, + "office/company": { + "name": "公司", + "terms": "公司" + }, + "office/educational_institution": { + "name": "教育机构", + "terms": "教育机构" + }, + "office/employment_agency": { + "name": "就业机构", + "terms": "就业机构" + }, + "office/estate_agent": { + "name": "地产代理", + "terms": "地产代理" + }, + "office/financial": { + "name": "财务部写字楼", + "terms": "财务部写字楼" + }, + "office/government": { + "name": "政府楼", + "terms": "政府楼" + }, + "office/insurance": { + "name": "保险公司", + "terms": "保险公司" + }, + "office/it": { + "name": "IT公司", + "terms": "IT公司" + }, + "office/lawyer": { + "name": "律师事务所", + "terms": "律师事务所" + }, + "office/newspaper": { + "name": "报社", + "terms": "报社,通讯社" + }, + "office/ngo": { + "name": "非政府组织", + "terms": "非政府组织" + }, + "office/physician": { + "name": "医生", + "terms": "医生" + }, + "office/political_party": { + "name": "政党", + "terms": "政党" + }, + "office/research": { + "name": "研究所", + "terms": "研究所" + }, + "office/telecommunication": { + "name": "电信公司", + "terms": "电信公司" + }, + "office/therapist": { + "name": "医疗师", + "terms": "医疗师" + }, + "office/travel_agent": { + "name": "旅行社", + "terms": "旅行社" + }, + "place": { + "name": "地点", + "terms": "地点" + }, + "place/city": { + "name": "城市", + "terms": "城市" + }, + "place/hamlet": { + "name": "村庄", + "terms": "村庄" + }, + "place/island": { + "name": "岛屿", + "terms": "岛屿" + }, + "place/isolated_dwelling": { + "name": "孤立居所", + "terms": "孤立居所" + }, + "place/locality": { + "name": "地方", + "terms": "地方,地点" + }, + "place/town": { + "name": "城镇", + "terms": "城镇" + }, + "place/village": { + "name": "村庄", + "terms": "村庄" }, "point": { - "name": "点" + "name": "点", + "terms": "点" + }, + "power": { + "name": "发电厂", + "terms": "发电厂" + }, + "power/generator": { + "name": "发电机", + "terms": "发电机" + }, + "power/line": { + "name": "供电线", + "terms": "供电线" + }, + "power/minor_line": { + "name": "小供电线", + "terms": "小供电线" + }, + "power/pole": { + "name": "电线杆", + "terms": "电线杆" + }, + "power/sub_station": { + "name": "变电站", + "terms": "变电站" + }, + "power/tower": { + "name": "高压电塔", + "terms": "高压电塔" + }, + "power/transformer": { + "name": "变电所", + "terms": "变电所" + }, + "railway": { + "name": "铁路", + "terms": "铁路" + }, + "railway/abandoned": { + "name": "废弃的铁路", + "terms": "废弃的铁路" + }, + "railway/disused": { + "name": "废弃的铁路", + "terms": "废弃的铁路" + }, + "railway/halt": { + "name": "小火车站", + "terms": "小火车站" + }, + "railway/level_crossing": { + "name": "平交道口", + "terms": "平交道口" + }, + "railway/monorail": { + "name": "单轨铁路", + "terms": "单轨铁路" + }, + "railway/platform": { + "name": "站台", + "terms": "站台" + }, + "railway/rail": { + "name": "铁轨", + "terms": "铁轨" + }, + "railway/station": { + "name": "火车站", + "terms": "火车站" + }, + "railway/subway": { + "name": "地铁", + "terms": "地铁" + }, + "railway/subway_entrance": { + "name": "地铁口", + "terms": "地铁口" + }, + "railway/tram": { + "name": "电车", + "terms": "电车" + }, + "relation": { + "name": "关系", + "terms": "关系" + }, + "route/ferry": { + "name": "航线", + "terms": "航线" + }, + "shop": { + "name": "商店", + "terms": "商店" + }, + "shop/alcohol": { + "name": "酒庄", + "terms": "酒庄" + }, + "shop/bakery": { + "name": "面包店", + "terms": "面包店" + }, + "shop/beauty": { + "name": "美容院", + "terms": "美容院" + }, + "shop/beverages": { + "name": "饮品店", + "terms": "饮品店" + }, + "shop/bicycle": { + "name": "自行车店", + "terms": "自行车店" + }, + "shop/books": { + "name": "书店", + "terms": "书店" + }, + "shop/boutique": { + "name": "精品店", + "terms": "精品店" + }, + "shop/butcher": { + "name": "肉铺", + "terms": "肉铺" + }, + "shop/car": { + "name": "车行", + "terms": "车行" + }, + "shop/car_parts": { + "name": "汽车配件店", + "terms": "汽车配件店" + }, + "shop/car_repair": { + "name": "汽车修理店", + "terms": "汽车修理店" + }, + "shop/chemist": { + "name": "药房", + "terms": "药房" + }, + "shop/clothes": { + "name": "服装店", + "terms": "服装店" + }, + "shop/computer": { + "name": "电脑店", + "terms": "电脑店" + }, + "shop/confectionery": { + "name": "甜点店", + "terms": "甜点店" + }, + "shop/convenience": { + "name": "便利店", + "terms": "便利店" + }, + "shop/deli": { + "name": "熟食店", + "terms": "熟食店" + }, + "shop/department_store": { + "name": "百货店", + "terms": "百货店" + }, + "shop/doityourself": { + "name": "DIY商店", + "terms": "DIY商店" + }, + "shop/dry_cleaning": { + "name": "干洗店", + "terms": "干洗店" + }, + "shop/electronics": { + "name": "电器店", + "terms": "电器店" + }, + "shop/farm": { + "name": "农场", + "terms": "农场" + }, + "shop/fishmonger": { + "name": "海产店", + "terms": "海产店" + }, + "shop/florist": { + "name": "花店", + "terms": "花店" + }, + "shop/furniture": { + "name": "家具店", + "terms": "家具店" + }, + "shop/garden_centre": { + "name": "花店", + "terms": "花店" + }, + "shop/gift": { + "name": "礼品店", + "terms": "礼品店" + }, + "shop/greengrocer": { + "name": "果蔬店", + "terms": "果蔬店" + }, + "shop/hairdresser": { + "name": "理发店", + "terms": "理发店" + }, + "shop/hardware": { + "name": "五金店", + "terms": "五金店" + }, + "shop/hifi": { + "name": "音响店", + "terms": "音响店" + }, + "shop/jewelry": { + "name": "珠宝店", + "terms": "珠宝店" + }, + "shop/kiosk": { + "name": "报刊亭", + "terms": "报刊亭" + }, + "shop/laundry": { + "name": "洗衣店", + "terms": "洗衣店" + }, + "shop/locksmith": { + "name": "锁匠铺", + "terms": "锁匠铺" + }, + "shop/mall": { + "name": "商场", + "terms": "商场" + }, + "shop/mobile_phone": { + "name": "手机店", + "terms": "手机店" + }, + "shop/motorcycle": { + "name": "摩托车行", + "terms": "摩托车行" + }, + "shop/music": { + "name": "音乐店", + "terms": "音乐店" + }, + "shop/newsagent": { + "name": "报摊", + "terms": "报摊" + }, + "shop/optician": { + "name": "眼镜店", + "terms": "眼镜店" + }, + "shop/outdoor": { + "name": "户外用品店", + "terms": "户外用品店" + }, + "shop/pet": { + "name": "宠物店", + "terms": "宠物店" + }, + "shop/photo": { + "name": "照相馆", + "terms": "照相馆" + }, + "shop/shoes": { + "name": "鞋店", + "terms": "鞋店" + }, + "shop/sports": { + "name": "体育用品店", + "terms": "体育用品店" + }, + "shop/stationery": { + "name": "文具店", + "terms": "文具店" + }, + "shop/supermarket": { + "name": "超级市场", + "terms": "超级市场" + }, + "shop/toys": { + "name": "玩具店", + "terms": "玩具店" + }, + "shop/travel_agency": { + "name": "旅行社", + "terms": "旅行社" + }, + "shop/tyres": { + "name": "轮胎店", + "terms": "轮胎店" + }, + "shop/vacant": { + "name": "空置铺位", + "terms": "空置铺位" + }, + "shop/variety_store": { + "name": "杂货店", + "terms": "杂货店" + }, + "shop/video": { + "name": "影像店", + "terms": "影像店" + }, + "tourism": { + "name": "旅行", + "terms": "旅行" + }, + "tourism/alpine_hut": { + "name": "高山小屋", + "terms": "高山小屋" + }, + "tourism/artwork": { + "name": "艺术品", + "terms": "艺术品" + }, + "tourism/attraction": { + "name": "旅游名胜", + "terms": "旅游名胜" + }, + "tourism/camp_site": { + "name": "露营区", + "terms": "露营区" + }, + "tourism/caravan_site": { + "name": "房车营地", + "terms": "房车营地" + }, + "tourism/chalet": { + "name": "木屋", + "terms": "木屋" + }, + "tourism/guest_house": { + "name": "宾馆", + "terms": "宾馆" + }, + "tourism/hostel": { + "name": "招待所", + "terms": "招待所" + }, + "tourism/hotel": { + "name": "酒店", + "terms": "酒店" + }, + "tourism/information": { + "name": "资讯处", + "terms": "资讯处" + }, + "tourism/motel": { + "name": "汽车旅馆", + "terms": "汽车旅馆" + }, + "tourism/museum": { + "name": "博物馆", + "terms": "博物馆" + }, + "tourism/picnic_site": { + "name": "郊游地点", + "terms": "郊游地点" + }, + "tourism/theme_park": { + "name": "主题公园", + "terms": "主题公园" + }, + "tourism/viewpoint": { + "name": "景点", + "terms": "景点" + }, + "tourism/zoo": { + "name": "动物园", + "terms": "动物园" + }, + "type/boundary": { + "name": "边界", + "terms": "边界" + }, + "type/boundary/administrative": { + "name": "行政边界", + "terms": "行政边界" + }, + "type/multipolygon": { + "name": "多个面", + "terms": "个多面" + }, + "type/restriction": { + "name": "限制", + "terms": "限制" + }, + "type/route": { + "name": "路线", + "terms": "路线" + }, + "type/route/bicycle": { + "name": "单车路线", + "terms": "单车路线" + }, + "type/route/bus": { + "name": "公共汽车路线", + "terms": "公共汽车路线" + }, + "type/route/detour": { + "name": "巡游路线", + "terms": "巡游路线" + }, + "type/route/ferry": { + "name": "渡轮航线", + "terms": "渡轮航线" + }, + "type/route/foot": { + "name": "行人路线", + "terms": "行人路线" + }, + "type/route/hiking": { + "name": "行山路线", + "terms": "行山路线" + }, + "type/route/pipeline": { + "name": "供水路线", + "terms": "供水路线" + }, + "type/route/power": { + "name": "供电路线", + "terms": "供电路线" + }, + "type/route/road": { + "name": "行车路线", + "terms": "行车路线" + }, + "type/route/train": { + "name": "铁路路线", + "terms": "铁路路线" + }, + "type/route/tram": { + "name": "电车路线", + "terms": "电车路线" + }, + "type/route_master": { + "name": "线路总管", + "terms": "线路总管" }, "vertex": { - "name": "其它" + "name": "其它", + "terms": "其它" + }, + "waterway": { + "name": "航道", + "terms": "航道" + }, + "waterway/canal": { + "name": "运河", + "terms": "运河" + }, + "waterway/dam": { + "name": "水坝", + "terms": "水坝" + }, + "waterway/ditch": { + "name": "沟渠", + "terms": "沟渠" + }, + "waterway/drain": { + "name": "下水道", + "terms": "下水道" + }, + "waterway/river": { + "name": "河流", + "terms": "河流" + }, + "waterway/riverbank": { + "name": "河堤", + "terms": "河堤" + }, + "waterway/stream": { + "name": "溪流", + "terms": "溪流" + }, + "waterway/weir": { + "name": "堤坝", + "terms": "堤坝" } } } diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json index c698e62f2..6202de3a8 100644 --- a/vendor/assets/iD/iD/locales/zh-TW.json +++ b/vendor/assets/iD/iD/locales/zh-TW.json @@ -226,7 +226,6 @@ "title": "背景", "description": "背景圖像設定", "percent_brightness": "{opacity}%的光度", - "fix_misalignment": "校準底圖", "reset": "重設" }, "restore": { @@ -284,16 +283,13 @@ }, "cannot_zoom": "在此模式下不能再縮小。", "gpx": { - "local_layer": "本機GPX檔案", - "drag_drop": "拖放一個.gpx格式的檔案到本頁" + "local_layer": "本機GPX檔案" }, "help": { "title": "幫助", "help": "# 幫助\n\n這是一個[OpenStreetMap](http://www.openstreetmap.org/)的編輯器。\nOpenStreetMap是自由及可編輯的世界地圖。你可以用這個編輯器來添加和更新您所在區域的地圖資料，令這個開源和開放資料的世界地圖變得更好。\n\n您在這個地圖上所做的編輯，所有使用OpenStreetMap的人將可看見。為了進行編輯，你需要一個[免費的OpenStreetMap帳戶](https://www.openstreetmap.org/user/new)。\n\n這個[iD編輯器](http://ideditor.com/) 是一個合作開發的開源系統， [源碼可在GitHub找到](https://github.com/systemed/iD)。\n", "roads": "# 道路\n\n您可以利用這個編輯器創建，修復，及刪除道路。道路可以有很多種：路徑，公路，郊遊徑，單車徑，和更多 － 任何經常使用的路段都可製圖。\n\n### 選擇道路\n\n點擊圖上的道路以選擇該道路。道路的輪廓會以高亮度顯示，而同時地圖上會出現小工具選單，旁邊亦會彈出面板，顯示有關該道路的資訊。\n\n### 修訂道路\n\n您或會經常注意到，道路並非對齊在背景中顯示的衛星圖像或GPS軌跡。您可以調整這些道路，讓他們位於正確的位置。\n\n首先，點擊您想修訂的道路。這會將道路以高亮度顯示，並顯示沿著這道路的節點，你可以拖曳這些節點到更好的位置。如果您想增加細節，可以為道路添加新的節點，點擊兩下道路上沒有節點的部分，便可在該處増加節點。\n\n如果道路連接到另一條道路，但在地圖上並未妥善連接，你可以拖曳道路的其中一個節點到另一條道路上，以連接兩條道路。連接好道路，對地圖非常重要，特別是對提供駕駛指示的應用程序而言，是必要的。\n\n您也可以點擊'移動'工具或按`M`快速鍵，來移動整條道路，然後點擊一下以完成移動的動作。\n\n### 刪除道路\n\n如果一條道路完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將道路刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該道路或許只是新建的。\n\n要刪除道路，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n\n### 繪製新道路\n\n發現某處應有一條道路，但地圖上沒有？點擊編輯器左上方的'線'圖標，或按下`2`快速鍵，以開始繪製線段。\n\n在地圖上點擊道路的開端，以開始繪製道路。如果道路從一條現有的道路分支出來，應點擊兩者連接的地方，以開始繪製。\n\n然後點擊沿著道路的點，以根據衛星影像或GPS軌跡，正確地繪製道路。如果您繪製的道路如果與另一條道路交匯，請點擊相交點以將它們連接起來。當您完成繪製後，可點擊兩下或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\n\n", - "imagery": "# 空照圖\n\n空照圖是重要的製圖來源，包括航空照相，衛星圖，還有其他自由來源的照片，都可以透過編輯器畫面左側的「背景設定」選單變更。\n\n默認情況下，編輯器會顯示[Bing地圖](http://www.bing.com/maps/) 衛星圖層，但是當你平移和縮放地圖到新的地理位置，或可使用新圖像的來源。一些國家，像美國、法國和丹麥，部分地區有非常高質素的圖像。\n\n有時候，由於圖像供應商方面的錯誤，圖像會與地圖數據有所偏移。如果你看見很多的道路與背景有偏移，請不要立刻將它們全部搬移以與背景刎合。相反，你可以在「背景設定」選單中，點擊下方的「校準底圖」，以調整圖像以配合現有地圖數據。\n\n", "addresses": "# 地址 \n\n地址是地圖中最有用的訊息之一。 \n\n雖然地址通常被視為街道的一部分，在 OpenStreetMap 中，它們是沿相關街道的建築物和地方的屬性。 \n\n您可以將地址訊息，添加到以建築物輪廓為代表、或以點為代表的地方之上。地址資料的最佳來源，是實地調查或個人知識 － 與任何其他物件一樣，抄襲商業來源（如谷歌地圖）的資料，是嚴格禁止的。\n", - "inspector": "# 使用檢視面板\n\n檢視面板是畫面右面的用戶界面元素，當您選擇一個物件時便會出現，讓你可編輯物件的詳細資料。\n\n### 選擇物件類型\n\n在您添加一個點、線段或區域後，您可以選擇物件的類型，例如該物件應是高速公路還是住宅區道路，是超級市場還是咖啡廳。檢視面板將顯示常用物件類型的按鈕，要找出其他物件類型，您可以在搜尋框中輸入您所要的物件類型。\n\n點擊物件類型按鈕右下角的'i'字，可顯示物件類型的更多資訊。點擊按鈕以選擇該類型。\n\n### 使用表格和編輯標籤\n\n在您選擇物件類型後，或選擇已經被編配類型的物件時，檢查面板會顯示該物件詳細資料的欄位，\n如名稱和地址。\n\n在欄位下方，您可以點擊圖標，以添加其他詳細資料，如[維基百科](http://www.wikipedia.org/)的條目資料，輪椅可否到達，以及其他更多資料。\n\n在面板的底部，點擊'增加標籤'以添加其他任意的標籤到該物件。您可透過[Taginfo](http://taginfo.openstreetmap.org/)，了解有關常用的標籤組合的更多資料。\n\n您在檢查面板所做的更改，會自動應用到地圖上。您可以隨時點擊'撤消'按鈕，撤消這些更改。\n\n### 關閉檢查面板\n\n您可以點擊檢查面板右上角的關閉按鈕、按’Escape'鍵，或在地圖上點擊，以關閉檢查面板。\n", "buildings": "# 建築物\n\nOpenStreetMap 是世界上最大的建築物的數據庫。您可以建立\n和改善這個數據庫。\n\n### 選擇建築物\n\n您可以點擊建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點擊’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上點擊一下。\n\n要更正建築物的形狀，點擊並拖曳建築物輪廓的節點，以移到更佳的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是 OpenStreetMap 可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點擊所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n" }, "intro": { @@ -359,9 +355,6 @@ }, "category-route": { "name": "路線" - }, - "category-water": { - "name": "æ°´" } }, "fields": { @@ -768,7 +761,8 @@ "name": "法院" }, "amenity/drinking_water": { - "name": "飲水處" + "name": "飲水處", + "terms": "飲水,水源,活水" }, "amenity/embassy": { "name": "使館" @@ -786,14 +780,16 @@ "name": "加油站" }, "amenity/grave_yard": { - "name": "墓地" + "name": "墓地", + "terms": "墳場,墓地" }, "amenity/hospital": { "name": "醫院", "terms": "醫院,醫學中心" }, "amenity/kindergarten": { - "name": "幼稚園" + "name": "幼稚園", + "terms": "幼稚園,幼兒園,托兒所" }, "amenity/library": { "name": "圖書館" @@ -801,11 +797,9 @@ "amenity/marketplace": { "name": "市場" }, - "amenity/parking": { - "name": "停車場" - }, "amenity/pharmacy": { - "name": "藥房" + "name": "藥房", + "terms": "藥房,藥局" }, "amenity/place_of_worship": { "name": "宗教祟拜場所" @@ -824,7 +818,8 @@ "name": "清真寺" }, "amenity/police": { - "name": "警察局" + "name": "警察局", + "terms": "警局,派出所" }, "amenity/post_box": { "name": "郵箱" @@ -836,7 +831,8 @@ "name": "酒館" }, "amenity/restaurant": { - "name": "餐廳" + "name": "餐廳", + "terms": "飯店,飯館,酒樓,餐館" }, "amenity/school": { "name": "學校", @@ -853,16 +849,19 @@ "name": "電話" }, "amenity/theatre": { - "name": "劇院" + "name": "劇院", + "terms": "戲院,電影院,劇場" }, "amenity/toilets": { - "name": "廁所" + "name": "廁所", + "terms": "便所,公廁,洗手間,盥洗室" }, "amenity/townhall": { "name": "市政廳" }, "amenity/university": { - "name": "大學" + "name": "大學", + "terms": "大專" }, "amenity/waste_basket": { "name": "廢物箱" @@ -1367,7 +1366,8 @@ "name": "麵包店" }, "shop/beauty": { - "name": "美容店" + "name": "美容店", + "terms": "理容院,美妝店,護膚中心,指甲美容" }, "shop/beverages": { "name": "飲品店" diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json index c36727d21..fc8d0a9bd 100644 --- a/vendor/assets/iD/iD/locales/zh.json +++ b/vendor/assets/iD/iD/locales/zh.json @@ -225,7 +225,6 @@ "title": "背景", "description": "设置背景", "percent_brightness": "{opacity}% 亮度", - "fix_misalignment": "修复错位", "reset": "重置" }, "restore": { @@ -281,15 +280,12 @@ }, "cannot_zoom": "在当前模式下无法进一步缩小。", "gpx": { - "local_layer": "本地GPX文件", - "drag_drop": "把GPX文件拖到页面上。" + "local_layer": "本地GPX文件" }, "help": { "title": "帮助", "help": "# 帮助\n\n这是一个[OpenStreetMap](http://www.openstreetmap.org/)的编辑器。\nOpenStreetMap是自由及可编辑的世界地图。你可以用这个编辑器来添加和更新您所在区域的地图资料，令这个开源和开放资料的世界地图变得更好。\n\n您在这个地图上所做的编辑，所有使用OpenStreetMap的人将可看见。为了进行编辑，你需要一个[免费的OpenStreetMap帐户](https://www.openstreetmap.org/user/new)。\n\n这个[iD编辑器](http://ideditor.com/) 是一个合作开发的开源系统， [源码可在GitHub找到](https://github.com/systemed/iD)。\n", "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的资讯。\n\n### 修订道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想修订的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n", - "imagery": "# 影像图\n\n影像图是重要的制图来源，包括航空照相，卫星图，还有其他自由来源的照片，都可以透过编辑器画面左侧的「背景设置」选单变更。\n\n默认情况下，编辑器会显示[Bing地图](http://www.bing.com/maps/) 卫星图层，但是当你平移和缩放地图到新的地理位置，或可使用新图像的来源。一些国家，像美国、法国和丹麦，部分地区有非常高质素的图像。\n\n有时候，由于图像供应商方面的错误，图像会与地图数据有所偏移。如果你看见很多的道路与背景有偏移，请不要立刻将它们全部搬移以与背景刎合。相反，你可以在「背景设定」选单中，点击下方的「校准底图」，以调整图像以配合现有地图数据。\n", - "inspector": "# 使用检查面板\n\n检视面板是画面右面的用户界面元素，当您选择一个物件时便会出现，让你可编辑物件的详细资料。\n\n### 选择物件类型\n\n在您添加一个点、线段或区域后，您可以选择物件的类型，例如该物件应是高速公路还是住宅区道路，是超级市场还是咖啡厅。检视面板将显示常用物件类型的按钮，要找出其他物件类型，您可以在搜寻框中输入您所要的物件类型。\n\n点击物件类型按钮右下角的'i'字，可显示物件类型的更多资讯。点击按钮以选择该类型。\n\n### 使用表格和编辑标签\n\n在您选择物件类型后，或选择已经被编配类型的物件时，检查面板会显示该物件详细资料的栏位，\n如名称和地址。\n\n在栏位下方，您可以点击图标，以添加其他详细资料，如[维基百科](http://www.wikipedia.org/)的条目资料，轮椅可否到达，以及其他更多资料。\n\n在面板的底部，点击'增加标签'以添加其他任意的标签到该物件。您可透过[Taginfo](http://taginfo.openstreetmap.org/)，了解有关常用的标签组合的更多资料。\n\n您在检查面板所做的更改，会自动应用到地图上。您可以随时点击'撤消'按钮，撤消这些更改。\n\n### 关闭检查面板\n\n您可以点击检查面板右上角的关闭按钮、按'Escape'键，或在地图上点击，以关闭检查面板。\n", "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立\n和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n" }, "intro": { @@ -355,9 +351,6 @@ }, "category-route": { "name": "路线" - }, - "category-water": { - "name": "æ°´" } }, "fields": { @@ -776,9 +769,6 @@ "amenity/marketplace": { "name": "市场" }, - "amenity/parking": { - "name": "停车场" - }, "amenity/pharmacy": { "name": "药房" },