From: Tom Hughes Date: Wed, 30 Sep 2020 10:57:18 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2838' X-Git-Tag: live~2566 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3b56c005ebac1e5aaef8890057767e1955bb4948?hp=a988ad6f515495233ddd8bf4e866a4da78e8e273 Merge remote-tracking branch 'upstream/pull/2838' --- diff --git a/Gemfile b/Gemfile index 4699438a1..896a840c2 100644 --- a/Gemfile +++ b/Gemfile @@ -145,7 +145,7 @@ group :test do gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "puma", "~> 4.3" + gem "puma", "~> 5.0" gem "rails-controller-testing" gem "rubocop" gem "rubocop-minitest" diff --git a/Gemfile.lock b/Gemfile.lock index 64aba9c97..39f3b312b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,11 +71,11 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.1) - autoprefixer-rails (10.0.0) + autoprefixer-rails (10.0.1.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.370.0) - aws-sdk-core (3.107.0) + aws-partitions (1.376.0) + aws-sdk-core (3.108.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -83,13 +83,13 @@ GEM aws-sdk-kms (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.81.0) + aws-sdk-s3 (1.81.1) aws-sdk-core (~> 3, >= 3.104.3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) - better_errors (2.8.0) + better_errors (2.8.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -113,8 +113,8 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (4.9.1) - browser (4.2.0) + brakeman (4.10.0) + browser (5.0.0) builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) @@ -146,7 +146,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) - dalli (2.7.10) + dalli (2.7.11) debug_inspector (0.0.3) deep_merge (1.2.1) delayed_job (4.1.8) @@ -280,7 +280,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - nio4r (2.5.3) + nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) @@ -326,14 +326,14 @@ GEM omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) parallel (1.19.2) - parser (2.7.1.4) + parser (2.7.1.5) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.5.2) psych (3.2.0) public_suffix (4.0.6) - puma (4.3.6) + puma (5.0.2) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -384,27 +384,29 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.7.1) + regexp_parser (1.8.0) request_store (1.5.0) rack (>= 1.4) rexml (3.2.4) rinku (2.0.6) rotp (6.1.0) - rubocop (0.91.0) + rubocop (0.92.0) parallel (~> 1.10) - parser (>= 2.7.1.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.4.0, < 1.0) + rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.4.0) - parser (>= 2.7.1.4) + rubocop-ast (0.7.0) + parser (>= 2.7.1.5) + strscan (>= 1.0.0) rubocop-minitest (0.10.1) rubocop (>= 0.87) - rubocop-performance (1.8.0) + rubocop-performance (1.8.1) rubocop (>= 0.87.0) + rubocop-ast (>= 0.4.0) rubocop-rails (2.8.1) activesupport (>= 4.2.0) rack (>= 1.1) @@ -444,6 +446,7 @@ GEM sprockets (>= 3.0.0) strong_migrations (0.7.1) activerecord (>= 5) + strscan (1.0.3) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) @@ -533,7 +536,7 @@ DEPENDENCIES openstreetmap-deadlock_retry (>= 1.3.0) pg psych - puma (~> 4.3) + puma (~> 5.0) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb index d97e8774e..b4a2efc7c 100644 --- a/app/controllers/api/users_controller.rb +++ b/app/controllers/api/users_controller.rb @@ -9,9 +9,15 @@ module Api around_action :api_call_handle_error before_action :lookup_user_by_id, :only => [:show] + before_action :set_request_formats, :except => [:gpx_files] + def show if @user.visible? - render :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml + format.json + end else head :gone end @@ -19,7 +25,11 @@ module Api def details @user = current_user - render :action => :show, :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml { render :show } + format.json { render :show } + end end def index @@ -31,7 +41,11 @@ module Api @users = User.visible.find(ids) - render :content_type => "text/xml" + # Render the result + respond_to do |format| + format.xml + format.json + end end def gpx_files diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8adea79a4..052858932 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -23,7 +23,11 @@ class ApplicationController < ActionController::Base if session[:user] self.current_user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first - if current_user.status == "suspended" + if session[:fingerprint] && + session[:fingerprint] != current_user.fingerprint + reset_session + self.current_user = nil + elsif current_user.status == "suspended" session.delete(:user) session_expires_automatically @@ -42,6 +46,8 @@ class ApplicationController < ActionController::Base elsif session[:token] session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end + + session[:fingerprint] = current_user.fingerprint if current_user && session[:fingerprint].nil? rescue StandardError => e logger.info("Exception authorizing user: #{e}") reset_session diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index aa115a228..1cc27d9d9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -183,6 +183,7 @@ class UsersController < ApplicationController if current_user.save token.destroy + session[:fingerprint] = current_user.fingerprint flash[:notice] = t "users.reset_password.flash changed" successful_login(current_user) end @@ -323,6 +324,7 @@ class UsersController < ApplicationController token.destroy session[:user] = user.id + session[:fingerprint] = user.fingerprint redirect_to referer || welcome_path end @@ -366,8 +368,9 @@ class UsersController < ApplicationController else flash[:errors] = current_user.errors end - token.destroy + current_user.tokens.delete_all session[:user] = current_user.id + session[:fingerprint] = current_user.fingerprint redirect_to :action => "account", :display_name => current_user.display_name elsif token flash[:error] = t "users.confirm_email.failure" @@ -552,6 +555,7 @@ class UsersController < ApplicationController # process a successful login def successful_login(user, referer = nil) session[:user] = user.id + session[:fingerprint] = user.fingerprint session_expires_after 28.days if session[:remember_me] target = referer || session[:referer] || url_for(:controller => :site, :action => :index) @@ -642,6 +646,8 @@ class UsersController < ApplicationController end if user.save + session[:fingerprint] = user.fingerprint + set_locale(true) if user.new_email.blank? || user.new_email == user.email diff --git a/app/models/user.rb b/app/models/user.rb index 0bff6868a..7e1f1c6d6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -44,6 +44,7 @@ # class User < ApplicationRecord + require "digest" require "xml/libxml" has_many :traces, -> { where(:visible => true) } @@ -56,7 +57,7 @@ class User < ApplicationRecord has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) } has_many :friends, :through => :friendships, :source => :befriendee - has_many :tokens, :class_name => "UserToken" + has_many :tokens, :class_name => "UserToken", :dependent => :destroy has_many :preferences, :class_name => "UserPreference" has_many :changesets, -> { order(:created_at => :desc) } has_many :changeset_comments, :foreign_key => :author_id @@ -306,6 +307,13 @@ class User < ApplicationRecord ClientApplication.find_by(:key => application_key).access_token_for_user(self) end + def fingerprint + digest = Digest::SHA256.new + digest.update(email) + digest.update(pass_crypt) + digest.hexdigest + end + private def set_defaults diff --git a/app/views/api/users/_user.json.jbuilder b/app/views/api/users/_user.json.jbuilder new file mode 100644 index 000000000..d89b42bef --- /dev/null +++ b/app/views/api/users/_user.json.jbuilder @@ -0,0 +1,69 @@ +json.user do + json.id user.id + json.display_name user.display_name + json.account_created user.creation_time.xmlschema + json.description user.description if user.description + + if current_user && current_user == user + json.contributor_terms do + json.agreed user.terms_agreed.present? + json.pd user.consider_pd + end + else + json.contributor_terms do + json.agreed user.terms_agreed.present? + end + end + + json.img do + json.href user_image_url(user) if user.avatar.attached? || user.image_use_gravatar + end + + json.roles do + json.array! user.roles.map(&:role) + end + + json.changesets do + json.count user.changesets.size + end + + json.traces do + json.count user.traces.size + end + + json.blocks do + json.received do + json.count user.blocks.size + json.active user.blocks.active.size + end + + if user.moderator? + json.issued do + json.count user.blocks_created.size + json.active user.blocks_created.active.size + end + end + end + + if current_user && current_user == user + if user.home_lat && user.home_lon + json.home do + json.lat user.home_lat + json.lon user.home_lon + json.zoom user.home_zoom + end + end + + json.languages user.languages if user.languages? + + json.messages do + json.received do + json.count user.messages.size + json.unread user.new_messages.size + end + json.sent do + json.count user.sent_messages.size + end + end + end +end diff --git a/app/views/api/users/_user.builder b/app/views/api/users/_user.xml.builder similarity index 100% rename from app/views/api/users/_user.builder rename to app/views/api/users/_user.xml.builder diff --git a/app/views/api/users/index.json.jbuilder b/app/views/api/users/index.json.jbuilder new file mode 100644 index 000000000..efc905cfe --- /dev/null +++ b/app/views/api/users/index.json.jbuilder @@ -0,0 +1,3 @@ +json.users(@users) do |user| + json.partial! user +end diff --git a/app/views/api/users/index.builder b/app/views/api/users/index.xml.builder similarity index 100% rename from app/views/api/users/index.builder rename to app/views/api/users/index.xml.builder diff --git a/app/views/api/users/show.json.jbuilder b/app/views/api/users/show.json.jbuilder new file mode 100644 index 000000000..51a85380c --- /dev/null +++ b/app/views/api/users/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! @user diff --git a/app/views/api/users/show.builder b/app/views/api/users/show.xml.builder similarity index 100% rename from app/views/api/users/show.builder rename to app/views/api/users/show.xml.builder diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index 6acc5e01e..77d3a5c16 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -1,5 +1,5 @@ <% if node.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.node"), :version => node.version, @@ -7,17 +7,29 @@ :id => node.redaction.id), node.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => node %> <% unless node.ways.empty? and node.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
    - <% node.ways.uniq.each do |way| %> -
  • <%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
    • - <% end %> - <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %> -
+ <% unless node.ways.empty? %> +
> + <%= t "browse.part_of_ways", :count => node.ways.count %> +
    + <% node.ways.uniq.each do |way| %> +
  • <%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
    • + <% end %> +
+
+ <% end %> + <% unless node.containing_relation_members.empty? %> +
> + <%= t "browse.part_of_relations", :count => node.containing_relation_members.count %> +
    + <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %> +
+
+ <% end %> <% end %>
<% end %> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index b54581b8b..cf9c62b13 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -1,5 +1,5 @@ <% if relation.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.relation"), :version => relation.version, @@ -7,17 +7,27 @@ :id => relation.redaction.id), relation.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => relation %> <% unless relation.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
    <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
+
> + <%= t "browse.part_of_relations", :count => relation.containing_relation_members.count %> +
    + <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %> +
+
<% end %> <% unless relation.relation_members.empty? %>

<%= t ".members" %>

-
    <%= render :partial => "relation_member", :collection => relation.relation_members %>
+
> + <%= t ".members_count", :count => relation.relation_members.count %> +
    + <%= render :partial => "relation_member", :collection => relation.relation_members %> +
+
<% end %>
<% end %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 137d529ff..d99919e64 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,5 +1,5 @@ <% if way.redacted? %> -
+
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), :version => way.version, @@ -7,29 +7,35 @@ :id => way.redaction.id), way.redaction) %>
<% else %> -
+
<%= render :partial => "common_details", :object => way %> <% unless way.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
    - <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %> -
+
> + <%= t "browse.part_of_relations", :count => way.containing_relation_members.count %> +
    + <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %> +
+
<% end %> <% unless way.way_nodes.empty? %>

<%= t ".nodes" %>

-
    - <% way.way_nodes.each do |wn| %> -
  • - <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %> - <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> - <% if related_ways.size > 0 then %> - (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class("way", w), :title => link_title(w) }) }) %>) - <% end %> -
    • - <% end %> -
+
> + <%= t ".nodes_count", :count => way.way_nodes.count %> +
    + <% way.way_nodes.each do |wn| %> +
  • + <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %> + <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> + <% if related_ways.size > 0 then %> + (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class("way", w), :title => link_title(w) }) }) %>) + <% end %> +
    • + <% end %> +
+
<% end %>
<% end %> diff --git a/config/locales/af.yml b/config/locales/af.yml index 22d613020..83387de3e 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1606,8 +1606,6 @@ af: reset_password: title: Herstel wagwoord heading: Herstel wagwoord vir %{user} - password: 'Wagwoord:' - confirm password: 'Bevestig wagwoord:' reset: Herstel wagwoord flash changed: U wagwoord is verander. new: diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 866b86fd9..5c2cdb730 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -1131,8 +1131,6 @@ aln: reset_password: title: Ricakto fjalëkalimin heading: Ricakto fjalëkalimin për %{user} - password: 'Fjalëkalimi:' - confirm password: 'Konfirmo Fjalëkalimin:' reset: Ricakto Fjalëkalimin flash changed: Fjalëkalimi juaj u ndryshua. flash token bad: Sun e gjetëm qat token, kontrolloje URL? diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 97472a085..9ad85193f 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -2140,8 +2140,6 @@ ar: reset_password: title: إعادة ضبط كلمة السر heading: إعادة تعيين كلمة السر %{user} - password: 'كلمة السر:' - confirm password: 'تأكيد كلمة السر:' reset: أعد ضبط كلمة السر flash changed: كلمة مرورك قد تغيرت. flash token bad: لم نجد هذا النموذج، تحقق من المسار ربما؟ diff --git a/config/locales/arz.yml b/config/locales/arz.yml index cb17b7061..85d023e47 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -944,8 +944,6 @@ arz: reset_password: title: إعاده ضبط كلمه المرور heading: إعاده تعيين كلمه المرور %{user} - password: 'كلمه المرور:' - confirm password: 'أكّد كلمه المرور:' reset: إعاده ضبط كلمه المرور flash changed: كلمه المرور الخاصه بك قد تغيرت. flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟ diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 93a4d93bb..165fed1cb 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -2117,8 +2117,6 @@ ast: reset_password: title: Reestablecer contraseña heading: Reestablecer la contraseña de %{user} - password: 'Contraseña:' - confirm password: 'Confirma la contraseña:' reset: Reaniciar contraseña flash changed: Cambióse la contraseña flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique? diff --git a/config/locales/az.yml b/config/locales/az.yml index 7ffeedbf6..e9bc4e6f8 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1064,8 +1064,6 @@ az: reset_password: title: Parolu yenilə heading: '%{user} üçün parolu yenilə' - password: 'Parol:' - confirm password: 'Parolu təkrarla:' reset: Parolu Yenilə flash changed: Parolun indi dəyişildi. new: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 662ba8e0b..f8df760b0 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1345,8 +1345,6 @@ be-Tarask: reset_password: title: Ачысьціць пароль heading: Скінуць пароль для %{user} - password: 'Пароль:' - confirm password: 'Пацьверджаньне паролю:' reset: Ачысьціць пароль flash changed: Ваш пароль быў зьменены. flash token bad: Немагчыма знайсьці такі ключ, можа праверце URL-адрас? diff --git a/config/locales/be.yml b/config/locales/be.yml index 457507c03..f6629ca5e 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2138,8 +2138,6 @@ be: reset_password: title: скінуць пароль heading: Скінуць пароль для %{user} - password: 'Пароль:' - confirm password: 'Пацвердзіце пароль:' reset: 'Скінуць пароль:' flash changed: Ваш пароль быў зменены. flash token bad: Не знайшоў такі токен, можа, праверце URL? diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 6358fc717..1ecf59420 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -91,6 +91,7 @@ bg: allow_write_prefs: променете потребителските им предпочитания allow_write_diary: създай дневник на бележките, коментарите и новите приятелства allow_write_api: промени картата + allow_read_gpx: прочети личните GPS следи allow_write_gpx: Качване на GPS следи allow_write_notes: промени бележки diary_comment: @@ -131,6 +132,7 @@ bg: description: Описание languages: Езици pass_crypt: Парола + pass_crypt_confirmation: Потвърди парола help: trace: tagstring: разделени със запетая @@ -367,6 +369,8 @@ bg: no_more_area: Няма повече списъци с промени в този район. no_more_user: Няма повече списъци с промени от потребителя. load_more: Зареждане на още + timeout: + sorry: Съжаляваме, но списъка с промени който заявихте се зарежда твърде дълго. changeset_comments: comment: comment: Нов коментар към списък с промени № %{changeset_id} на %{author} @@ -375,6 +379,10 @@ bg: comment: Нов коментар към списък с промени № %{changeset_id} на %{author} index: title_all: Дискусия за промяна на OpenStreetMap + title_particular: 'Разговор за промяната #%{changeset_id} на OpenStreetMap' + timeout: + sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда + твърде дълго. diary_entries: new: title: Нова публикация в дневника @@ -411,6 +419,8 @@ bg: no_such_entry: title: Няма такива публикации в дневника heading: Няма бележка със id:%{id} + body: Съжаляваме но в дневника няма запис или коментар със id %{id}. Моля проверете + написаното или може връзката която сте избрали да е грешна. diary_entry: posted_by_html: Написано от %{link_user} на %{created} на %{language_link} comment_link: Коментар към публикацията @@ -421,9 +431,11 @@ bg: other: '%{count} коментара' edit_link: Променяне на публикацията hide_link: Скриване на публикацията + unhide_link: Скриване на публикацията confirm: Потвърждаване report: Докладване на бележката diary_comment: + comment_from_html: Коментар от %{link_user} в %{comment_created_at} hide_link: Скриване на коментара unhide_link: Показване на коментара confirm: Потвърждаване @@ -434,6 +446,9 @@ bg: edit: Променяне coordinates: '%{latitude}; %{longitude}' feed: + user: + title: OpenStreetMap дневник записи за %{user} + description: Последни OpenStreetMap записи в дневника от %{user} all: title: Записи в дневника на OpenStreetMap comments: @@ -444,9 +459,13 @@ bg: older_comments: По-стари коментари friendships: make_friend: + heading: Добави %{user} като приятел? button: Добави като приятел success: Сега сте приятели с %{name}! + failed: Съжаляваме, неуспешно добавяне на %{name} като приятел. + already_a_friend: Вие вече сте приятел с %{name}. remove_friend: + heading: Премахни %{user} от приятели? button: Премахване от приятели success: '%{name} беше премахнат от списъка с приятелите.' not_a_friend: '%{name} не е между вашите приятели.' @@ -466,7 +485,10 @@ bg: aerialway: cable_car: Кабинков лифт chair_lift: Седалков лифт + drag_lift: Влек + gondola: Лифт с Гондола pylon: Пилон + t-bar: Седалков лифт aeroway: aerodrome: Летище apron: Перон @@ -474,6 +496,7 @@ bg: hangar: Хангар helipad: Вертолетна площадка runway: Писта + taxilane: Таксилента taxiway: Път за рулиране terminal: Терминал amenity: @@ -487,6 +510,7 @@ bg: bicycle_parking: Паркинг за велосипеди bicycle_rental: Велосипеди под наем biergarten: Бирария на открито + blood_bank: Кръвна банка boat_rental: Наем на лодки brothel: Бордел bureau_de_change: Обменно бюро @@ -502,6 +526,7 @@ bg: clock: Часовник college: Колеж community_centre: Обществен център + conference_centre: Конферентен център courthouse: Съд crematorium: Крематориум dentist: Зъболекар @@ -517,6 +542,7 @@ bg: gambling: Хазартни игри grave_yard: Гробище hospital: Болница + hunting_stand: Ловна стоянка ice_cream: Сладолед internet_cafe: Интернет Кафе kindergarten: Детска градина @@ -532,6 +558,7 @@ bg: parking: Паркинг parking_entrance: Вход на паркинг parking_space: Паркомясто + payment_terminal: Платежен терминал pharmacy: Аптека place_of_worship: Място за поклонение police: Полиция @@ -546,6 +573,7 @@ bg: school: Училище shelter: Подслон shower: Душ + social_centre: Социален център studio: Студио swimming_pool: Плувен басейн taxi: Такси @@ -554,6 +582,7 @@ bg: toilets: Тоалетна townhall: Кметство university: Университет + vehicle_inspection: Преглед на превозни средства vending_machine: Автомат veterinary: Ветеринарна клиника village_hall: Кметство @@ -564,6 +593,7 @@ bg: administrative: Административна граница national_park: Национален парк protected_area: Защитена зона + "yes": Граница bridge: aqueduct: Акведукт suspension: Висящ мост @@ -593,8 +623,10 @@ bg: hut: Хижа industrial: Индустриална сграда kindergarten: Детска градина + manufacture: Производствена сграда office: Офис Сграда public: Обществена сграда + residential: Жилищна сграда roof: Покрив school: Училище static_caravan: Каравана @@ -610,15 +642,19 @@ bg: brewery: Пивоварна carpenter: Дърводелец electrician: Електротехник + electronics_repair: Ремонт Електроника gardener: Градинар + handicraft: Ръчна изработка painter: Художник photographer: Фотограф plumber: Водопроводчик shoemaker: Обущар tailor: Шивач + window_construction: Изработка на прозорци winery: Винарна "yes": Работилница emergency: + access_point: Тчока за достъп ambulance_station: Станция за линейки defibrillator: Дефибрилатор landing_site: Място за аварийно приземяване @@ -748,11 +784,13 @@ bg: swimming_pool: Плувен басейн water_park: Аквапарк man_made: + antenna: Антена beehive: Кошер bridge: Мост bunker_silo: Бункер chimney: Комин crane: Кран + cross: Кръст flagpole: Пилон kiln: Пещ lighthouse: Фар @@ -760,10 +798,18 @@ bg: mast: Мачта mine: Рудник mineshaft: Шахта на мина + monitoring_station: Наблюдателна станция + petroleum_well: Петролен кладенец pier: Пирс pipeline: Тръбопровод + pumping_station: Помпена станция silo: Силоз + snow_cannon: Снежно оръдие + storage_tank: Резервоар + surveillance: Наблюдение + telescope: Телескоп tower: Кула + wastewater_plant: Пречиствателна станция watermill: Воденица water_tower: Водна кула water_well: Кладенец @@ -773,6 +819,7 @@ bg: airfield: Военно летище barracks: Казарма bunker: Бункер + checkpoint: Контролна точка "yes": Военен mountain_pass: "yes": Планински проход @@ -791,8 +838,10 @@ bg: grassland: Ливада heath: Здраве hill: Хълм + hot_spring: Топъл извор island: Остров land: Земя + marsh: Блато mud: Кал peak: Връх point: Точка @@ -806,10 +855,13 @@ bg: valley: Долина volcano: Вулкан water: Вода + wetland: Мочурище wood: Гора "yes": Природен елемент office: accountant: Счетоводител + administrative: Администрация + advertising_agency: Рекламна агенция architect: Архитект association: Асоциация company: Фирма @@ -820,9 +872,11 @@ bg: financial: Финансова служба government: Правителствена служба insurance: Застрахователно бюро + it: IT офис lawyer: Адвокат ngo: Офис на НПО notary: Нотариус + research: Изследователски офис travel_agent: Туристическа агенция "yes": Офис place: @@ -839,10 +893,12 @@ bg: municipality: Община neighbourhood: Квартал postcode: Пощенски код + quarter: Квартал region: Регион sea: Море square: Площад state: Държава + subdivision: Подразделение suburb: Предградие town: Град village: Село @@ -855,6 +911,7 @@ bg: junction: Железопътен възел level_crossing: Прелез light_rail: Лека железница + miniature: Теснолинейка monorail: Монорелсов път narrow_gauge: Теснолинейка platform: Железопътна платформа @@ -879,11 +936,17 @@ bg: car_parts: Авточасти car_repair: Автосервиз carpet: Магазин за килими + chocolate: Шоколад clothes: Магазин за дрехи + coffee: Магазин за кафе + computer: Магазин за компютри + cosmetics: Козметика + curtain: Магазин за завеси deli: Деликатесен магазин department_store: Универсален магазин doityourself: Направи сам dry_cleaning: Химическо чистене + e-cigarette: Магазин е-цигари electronics: Магазин за електроника erotic: Еротичен магазин estate_agent: Недвижими имоти @@ -945,6 +1008,8 @@ bg: apartment: Ваканционен апартамент artwork: Произведениe на изкуството attraction: Атракция + cabin: Кабина + camp_site: Лагер caravan_site: Къмпинг chalet: Бунгало gallery: Галерия @@ -978,6 +1043,7 @@ bg: level10: Граница на предградията description: types: + cities: Градове towns: Градове places: Места results: @@ -985,24 +1051,59 @@ bg: more_results: Повече резултати issues: index: + title: Проблеми + select_status: Избери статус + select_type: Избери тип + select_last_updated_by: Избери последно променен от + reported_user: Докладван потребител search: Търсене + search_guidance: 'Търсете за проблеми:' + user_not_found: Потребителят не съществува + issues_not_found: Не е открит такъв проблем + status: Състояние reports: Доклади + last_updated: Последна промяна last_updated_time_html: %{time} + last_updated_time_user_html: %{time} by %{user} link_to_reports: Преглед на докладите reports_count: one: 1 доклад other: '%{count} доклада' + reported_item: Докладван елемент states: + ignored: Пренебрегнат + open: Отворен resolved: Решени + update: + new_report: Вашия сигнал е регистриран успешно + successful_update: Вашия сигнал е обновен успешно + provide_details: Моля допълнете с необходимите подробности show: + title: '%{status} Проблем #%{issue_id}' reports: zero: Няма доклади one: 1 доклад other: '%{count} доклада' + report_created_at: Първоначално докладван на %{datetime} last_resolved_at: Последно решена на %{datetime} + last_updated_at: Последно актуализиран на %{datetime} от %{displayname} resolve: Решаване + ignore: Пропусни + reopen: Отново отвори + reports_of_this_issue: Сигнали за този Проблем + read_reports: Прочети Отчети + new_reports: Нови Доклади + other_issues_against_this_user: Други проблеми срещу този потребител + no_other_issues: Няма други проблеми срещу този потребител. + comments_on_this_issue: Коментари за проблема resolve: resolved: Състоянието на проблема е променен на „Решен“ + ignore: + ignored: Проблема е променен на „Пропуснат“ + reopen: + reopened: Проблема е променен на "Отворен" + comments: + comment_from_html: Коментар от %{user_link} в %{comment_created_at} helper: reportable_title: note: Бележка № %{note_id} @@ -1013,18 +1114,36 @@ bg: new: title_html: Докладване на %{link} missing_params: Не може да бъде създаден нов доклад + disclaimer: + intro: 'Преди да изпратите репорта си към страницата на модераторите моля + проверете дали:' + not_just_mistake: Сигурни ли сте че проблема не е просто грешка + resolve_with_user: Вече сте опитали да решите проблема с дадения потребител categories: diary_entry: + spam_label: Този запис от дневник е/съдържа спам + offensive_label: Този запис в дневника е вредна/заплашителна + threat_label: Този запис от дневник съдържа заплаха other_label: Друго diary_comment: + spam_label: Този коментар от дневник е/съдържа спам + offensive_label: Този коментар в дневника е вредна/заплашителна + threat_label: Този коментар от дневник е заплаха other_label: Друго user: + spam_label: Този потребителски профил е/съдържа спам + offensive_label: Този потребителски профил е обиден/непристоен + threat_label: Този потребителски профил съдържа заплаха + vandal_label: Този потребител е вандал other_label: Друго note: spam_label: Бележката е спам personal_label: Бележката съдържа лични данни abusive_label: Бележката е обидна other_label: Друго + create: + successful_report: Вашия сигнал е регистриран успешно + provide_details: Моля допълнете с необходимите подробности layouts: logo: alt_text: Лого на OpenStreetMap @@ -1057,6 +1176,8 @@ bg: partners_bytemark: Bytemark partners_partners: партньори tou: Условия за ползване + osm_offline: Базата на данни на OpenStreetMap в момента е изключена докато се + извършва необходима поддръжка. help: Помощ about: За проекта copyright: Авторски права @@ -1075,6 +1196,10 @@ bg: hi: Здравейте %{to_user}, friendship_notification: hi: Здравейте %{to_user}, + subject: '[OpenStreetMap] %{user} ви добави като приятел' + had_added_you: '%{user} ви добави като приятел на OpenStreetMap.' + see_their_profile: Можете да видите профила му на %{userurl}. + befriend_them: Можете да ги добавите като приятел на %{befriendurl}. gpx_notification: greeting: Здравейте, your_gpx_file: Изглежда, че файлът на GPX @@ -1084,6 +1209,11 @@ bg: failure: subject: '[OpenStreetMap] Грешка при внасяне на GPX' failed_to_import: 'не е внесен. Това е грешката:' + more_info_1: Повече информация за проблеми при импорта на GPX обекти и как + да ги избегнете + more_info_2: 'те могат да бъдат намерени на:' + success: + subject: '[OpenStreetMap] GPX импорта е успешен' signup_confirm: subject: '[OpenStreetMap] Добре дошли в OpenStreetMap' greeting: Здравейте! @@ -1134,6 +1264,7 @@ bg: ви' your_note: '%{commenter} повторно е отворил една от бележките ви към картата в близост до %{place}.' + details: Повече детайли за бележката можете да намерите на %{url}. changeset_comment_notification: hi: Здравейте %{to_user}, greeting: Здравейте, @@ -1168,22 +1299,31 @@ bg: send_message_to_html: Изпращане ново съобщение на %{name} subject: Тема body: Текст + back_to_inbox: Обратно в пощата create: message_sent: Съобщението е изпратено no_such_message: title: Няма такова съобщение heading: Няма такова съобщение + body: Съжаляваме но няма съобщение със това id. outbox: title: Изпратени my_inbox_html: Моят %{inbox_link} inbox: входящи + outbox: Изпратени messages: one: Изпратили сте %{count} съобщение other: Изпратили сте %{count} съобщения to: До subject: Тема date: Дата + no_sent_messages_html: Все още нямате никакви съобщения. Не искате ли да се + свържете с други %{people_mapping_nearby_link}? people_mapping_nearby: картографи в близост + reply: + wrong_user: Вие сте влезли като `%{user}' но съобщението на което искате да + отговорите не е изпратено на този потребител. Моля влезте като правилния потребител + за да можете да отговорите. show: title: Прочетете съобщението from: От @@ -1226,6 +1366,8 @@ bg: mapping_link: картографирате legal_babble: title_html: Авторски права и лиценз + credit_title_html: Как да кредитирате OpenStreetMap + more_title_html: Открийте повече contributors_title_html: Нашите сътрудници contributors_fr_html: |- Франция: Съдържа данни от @@ -1237,10 +1379,12 @@ bg: на тези знаци, моля изпратете Вашите въпроси на работната група по лиценза. index: + js_2: OpenStreetMap използва JavaScript за своята статична карта. permalink: Постоянна връзка shortlink: Къса връзка createnote: Добавяне на бележка edit: + user_page_link: Потребителска страница id_not_configured: iD не е настроен export: title: Изнасяне @@ -1269,12 +1413,16 @@ bg: latitude: 'Геогр. шир:' longitude: 'Геогр. дълж:' output: Изход + paste_html: Копирайте HTML за вграждане в интернет страница export_button: Изнасяне fixthemap: + title: Докладвай проблем/Коригирай картата how_to_help: title: Как да помогна join_the_community: title: Присъединете са към общността + other_concerns: + title: Други съображения help: title: Получаване на помощ welcome: @@ -1323,9 +1471,13 @@ bg: trunk: Междуградски път primary: Главен път secondary: Второстепенен път + unclassified: Некласифициран път track: Полски път bridleway: Конен път cycleway: Велосипедна пътека + cycleway_national: Национална велосипедна алея + cycleway_regional: Регионална велосипедна алея + cycleway_local: Локална велосипедна алея footway: Пътека rail: Железен път subway: Метро @@ -1348,7 +1500,8 @@ bg: park: Парк resident: Жилищна зона common: - 1: ливада + - Обща + - ливада retail: Търговска зона industrial: Промишлена зона commercial: Търговска зона @@ -1374,6 +1527,7 @@ bg: - връх tunnel: Тунел (пунктирана линия) bridge: Мост (плътна линия) + private: Частен достъп construction: Пътища в изграждане bicycle_shop: Магазин за велосипеди bicycle_parking: Паркинг на велосипеди @@ -1433,7 +1587,12 @@ bg: да завършат преди да качвате нови, за да не запълните опашката, на която чакат още потребители. edit: + cancel: Отказ + title: Редактиране трасе %{name} + heading: Редактиране трасе %{name} visibility_help: какво означава това? + update: + updated: Трасето е обновено trace_optionals: tags: Етикети show: @@ -1443,6 +1602,7 @@ bg: uploaded: 'Качено на:' points: 'Точки:' start_coordinates: 'Начални координати:' + coordinates_html: '%{latitude}; %{longitude}' map: карта edit: променяне owner: 'Собственик:' @@ -1450,8 +1610,10 @@ bg: tags: 'Етикети:' none: Няма edit_trace: Променяне на следата + delete_trace: Изтрий това трасе trace_not_found: Следата не е открита! visibility: 'Видимост:' + confirm_delete: Изтрий това трасе? trace_paging_nav: showing_page: Страница %{page} older: По-стари следи @@ -1461,6 +1623,7 @@ bg: count_points: one: 1 точка other: '%{count} точки' + more: още view_map: Вижте на картата edit: променяне edit_map: Редактиране на картата @@ -1478,18 +1641,43 @@ bg: upload_trace: Качване на следи от GPS see_all_traces: Всички следи see_my_traces: Мои следи + georss: + title: OpenStreetMap GPS трасета description: description_with_count: one: файл от GPX с %{count} точка от %{user} other: файл от GPX с %{count} точки от %{user} description_without_count: Файл на GPX от %{user} + application: + permission_denied: Нямате разрешение за достъп до това действие + require_admin: + not_an_admin: Трябва да сте админ за да извършите това действие oauth: authorize: + allow_to: 'Позволи приложението на клиента да:' + allow_read_prefs: прочетете вашите потребителски предпочитания + allow_write_prefs: променете вашите потребителски предпочитания + allow_write_diary: създай дневник на бележките, коментарите и новите приятелства allow_write_api: промени картата. + allow_read_gpx: прочети вашите лични GPS следи. + allow_write_gpx: Качване на GPS следи. allow_write_notes: променяне на бележки. + grant_access: Позволи Достъп + authorize_success: + title: Искането за достъп е разрешено + allowed_html: Вие позволихте на приложение %{app_name} достъп до вашия профил. + verification: Верификационния код е %{code}. + authorize_failure: + title: Искането за достъп не успя revoke: flash: Анулирахте удостоверяването на %{application} oauth_clients: + show: + key: 'Клиентски ключ:' + secret: 'Клиентски секрет:' + edit: Редакция детайли + delete: Изтриване Клиент + confirm: Сигурен ли сте? index: title: Мои данни за OAuth my_tokens: Упълномощени от мен приложения @@ -1497,6 +1685,7 @@ bg: issued_at: Упълномощено на revoke: Анулиране! my_apps: Мои клиентски приложения + oauth: OAuth register_new: Регистриране на приложение users: login: @@ -1510,6 +1699,9 @@ bg: login_button: Влизане register now: Регистрирайте се with external: 'Или използвайте удостоверяване от външен източник:' + new to osm: Нов за OpenStreetMap? + to make changes: За да правите промени в OpenStreetMap data, вие трябва да имате + профил. create account minute: Създайте своя сметка. Отнема само минута. no account: Нямате сметка? auth failure: Съжаляваме, но не можете да влезете с тези данни. @@ -1557,8 +1749,7 @@ bg: notice email cannot find: Съжаляваме, но този електронен адрес не е намерен. reset_password: title: Възстановяване на парола - password: 'Парола:' - confirm password: 'Потвърждаване на паролата:' + heading: Смени Парола за %{user} reset: Нулиране на парола flash changed: Паролата е променена успешно. new: @@ -1597,6 +1788,7 @@ bg: deleted: изтрито show: my diary: Моя дневник + new diary entry: Нова публикация в дневника my edits: Мои промени my traces: Моите следи my notes: Моите бележки @@ -1605,6 +1797,7 @@ bg: my settings: Настройки my comments: Моите коментари oauth settings: Настройки на OAuth + blocks on me: Блокирани от мен blocks by me: Блокирани от мен send message: Изпратете съобщение diary: Дневник @@ -1633,8 +1826,18 @@ bg: m away: '%{count} м от вас' nearby users: Други потребители в близост no nearby users: Все още няма други потребители, които картографират в близост. + role: + administrator: Този потребител е администратор + moderator: Този потребител е модератор + grant: + administrator: Позволи администраторски достъп + moderator: Позволи модераторски достъп comments: Коментари create_block: Блокиране на този потребител + activate_user: Активирай този Потребител + deactivate_user: Деактивирай този Потребител + confirm_user: Потвърди този Потребител + hide_user: Скрий този Потребител delete_user: Изтриване на този потребител confirm: Потвърдете report: Докладване на потребителя @@ -1657,6 +1860,7 @@ bg: enabled: Разрешено. Не е анонимно и можете да променяте данните. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Какво е това? + disabled link text: защо не мога да редактирам? contributor terms: heading: 'Условия за сътрудничество:' agreed: Приели сте новите условия за сътрудничество. @@ -1703,12 +1907,17 @@ bg: showing: one: Страница %{page} (%{first_item} от %{items}) other: Страница %{page} (%{first_item}-%{last_item} от %{items}) + summary_no_ip_html: '%{name} създадено на %{date}' + suspended: + webmaster: webmaster user_role: grant: confirm: Потвърждаване revoke: confirm: Потвърждаване user_blocks: + not_found: + back: Обратно към индекс revoke: revoke: Анулиране! helper: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index df81155c9..4e6c1d990 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -124,6 +124,7 @@ bn: description: বিবরণ languages: ভাষা pass_crypt: পাসওয়ার্ড + pass_crypt_confirmation: পাসওয়ার্ড নিশ্চিত করুন datetime: distance_in_words_ago: about_x_hours: @@ -211,6 +212,9 @@ bn: anonymous: নামহীন no_comment: (কোন মন্তব্য নেই) part_of: অংশ + part_of_relations: + one: ১টি সম্পর্ক + other: '%{count}টি সম্পর্ক' download_xml: XML ডাউনলোড করুন view_history: ইতিহাস দেখুন view_details: বিস্তারিত দেখুন @@ -1480,8 +1484,6 @@ bn: আমরা একটি লিঙ্ক পাঠাবো যার মাধ্যমে আপনি পাসওয়ার্ড পরিবর্তন করতে পারবেন। reset_password: title: পাসওয়ার্ড পুনঃনির্ধারণ - password: 'পাসওয়ার্ড:' - confirm password: 'পাসওয়ার্ড নিশ্চিত করুন:' reset: পাসওয়ার্ড পুনঃনির্ধারণ flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে। new: diff --git a/config/locales/br.yml b/config/locales/br.yml index c93acf57f..d9c3e8758 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -2154,8 +2154,6 @@ br: reset_password: title: Adderaouekaat ar ger-tremen heading: Adderaouekaat ar ger-tremen evit %{user} - password: 'Ger-tremen :' - confirm password: 'Kadarnaat ar ger-tremen :' reset: Adderaouekaat ar ger-tremen flash changed: Cheñchet eo bet ho ker-tremen. flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ? diff --git a/config/locales/bs.yml b/config/locales/bs.yml index e662c27c2..b95335859 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1471,8 +1471,6 @@ bs: reset_password: title: Ponovno postavljanje lozinke heading: Ponovno postavljanje lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrditi lozinku:' reset: Ponovno postavljanje lozinke flash changed: VaÅ¡a lozinka je promjenjena. flash token bad: Niste pronaÅ¡li tz značku, možda da provjerite URL? diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d05040675..cd8b9a030 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -114,8 +114,17 @@ ca: way_tag: Etiqueta de la via attributes: client_application: + name: Nom (Requerit) + url: URL de l'aplicació principal (Requerit) callback_url: URL de devolució de trucada support_url: URL de suport + allow_read_prefs: Llegeix les seves preferències d'usuari + allow_write_prefs: Modifica les seves preferències d'usuari + allow_write_diary: Escriviu entrades de diari, comentaris i feu amics + allow_write_api: Modifica el mapa + allow_read_gpx: Llegeix les seves traces GPS privades + allow_write_gpx: Carrega traces GPS + allow_write_notes: Modifica notes diary_comment: body: Cos diary_entry: @@ -145,6 +154,7 @@ ca: body: Cos recipient: Destinatari report: + category: Trieu un motiu per a la vostra denúncia details: Proporcioneu més detalls del problema (obligatori). user: email: Adreça electrònica @@ -153,6 +163,7 @@ ca: description: Descripció languages: Idiomes pass_crypt: Contrasenya + pass_crypt_confirmation: Confirmeu la contrasenya help: trace: tagstring: separat per comes @@ -2166,8 +2177,6 @@ ca: reset_password: title: Restableix la contrasenya heading: Restableix la contrasenya per a %{user} - password: 'Contrasenya:' - confirm password: 'Confirmeu la contrasenya:' reset: Restableix la contrasenya flash changed: S'ha canviat la contrasenya. flash token bad: No s'ha trobat el testimoni. Comproveu la URL. diff --git a/config/locales/ce.yml b/config/locales/ce.yml index d6c955466..97b99fb6f 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -920,8 +920,6 @@ ce: reset_password: title: Юху а язъе пароль heading: Юху а язъе пароль %{user} - password: 'Пароль:' - confirm password: 'Бакъе пароль:' reset: ХӀоттае пароль flash changed: Хьан пароль хийцина. new: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cdbb0fb4a..e4d763168 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -164,6 +164,7 @@ cs: description: Popis languages: Jazyky pass_crypt: Heslo + pass_crypt_confirmation: Potvrdit heslo help: trace: tagstring: oddělené čárkou @@ -2331,8 +2332,6 @@ cs: reset_password: title: Obnovit heslo heading: Resetovat heslo pro %{user} - password: 'Heslo:' - confirm password: 'Potvrdit heslo:' reset: Resetovat heslo flash changed: VaÅ¡e heslo bylo změněno. flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL? diff --git a/config/locales/cy.yml b/config/locales/cy.yml index e57b73320..96900eec2 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1420,8 +1420,6 @@ cy: reset_password: title: Ailosod cyfrinair heading: Ailosod Cyfinair ar gyfer %{user} - password: 'Cyfrinair:' - confirm password: 'Cadarnhau''r Cyfrinair:' reset: Ailosod Cyfrinair flash changed: Mae'ch cyfrinair wedi'i newid. new: diff --git a/config/locales/da.yml b/config/locales/da.yml index 085e2b7d5..5b18bd517 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -154,6 +154,7 @@ da: description: Beskrivelse languages: Sprog pass_crypt: Adgangskode + pass_crypt_confirmation: Bekræft adgangskode help: trace: tagstring: kommasepareret @@ -2338,8 +2339,6 @@ da: reset_password: title: Nulstil adgangskode heading: Nulstil adgangskode for %{user} - password: 'Adgangskode:' - confirm password: 'Bekræft adgangskode:' reset: Nulstil adgangskode flash changed: Din adgangskode er ændret. flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en? diff --git a/config/locales/de.yml b/config/locales/de.yml index aef484997..07b42aee4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -191,6 +191,7 @@ de: description: Beschreibung languages: Sprachen pass_crypt: Passwort + pass_crypt_confirmation: Passwort bestätigen help: trace: tagstring: durch Komma getrennt @@ -295,6 +296,12 @@ de: anonymous: anonym no_comment: (kein Kommentar) part_of: Teil von + part_of_relations: + one: 1 Relation + other: '%{count} Relationen' + part_of_ways: + one: 1 Weg + other: '%{count} Wege' download_xml: XML herunterladen view_history: Verlauf anzeigen view_details: Details anzeigen @@ -335,6 +342,9 @@ de: title_html: 'Relation: %{name}' history_title_html: 'Relationverlauf: %{name}' members: Mitglieder + members_count: + one: 1 Mitglied + other: '%{count} Mitglieder' relation_member: entry_role_html: '%{type} %{name} als %{role}' type: @@ -589,6 +599,7 @@ de: bicycle_rental: Fahrradverleih bicycle_repair_station: Fahrrad-Reparaturstation biergarten: Biergarten + blood_bank: Blutbank boat_rental: Bootsverleih brothel: Bordell bureau_de_change: Wechselstube @@ -677,6 +688,7 @@ de: village_hall: Gemeindezentrum waste_basket: Mülleimer waste_disposal: Abfallentsorgung + waste_dump_site: Mülldeponie watering_place: Tränke water_point: Wasseranschluss weighbridge: Fahrzeugwaage @@ -1061,6 +1073,7 @@ de: insurance: Versicherungsbüro it: IT-Büro lawyer: Rechtsanwalt + logistics: Logistikbüro newspaper: Büro eines Zeitungsverlags ngo: NGO notary: Notar @@ -1741,8 +1754,7 @@ de: credit_1_html: Wir verlangen die Verwendung des Hinweises „© OpenStreetMap-Mitwirkende“. credit_2_1_html: |- Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz - verfügbar sind, und, sofern du unsere Kartenkacheln verwendest, dass die - Kartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf + verfügbar sind. Du kannst dies tun, indem du auf www.openstreetmap.org/copyright verlinkst. Ersatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst, kannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen @@ -2394,8 +2406,6 @@ de: reset_password: title: Passwort zurücksetzen heading: Passwort für %{user} zurücksetzen - password: 'Passwort:' - confirm password: 'Passwort bestätigen:' reset: Passwort zurücksetzen flash changed: Dein Passwort wurde geändert. flash token bad: Wir konnten dieses Kürzel leider nicht finden. Du hast dich diff --git a/config/locales/diq.yml b/config/locales/diq.yml index ff9be91c9..c9bd6e242 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -930,8 +930,6 @@ diq: reset_password: title: Parola reset ke heading: Parolay %{user} reset ke - password: 'Parola:' - confirm password: 'Parola tesdiq ke:' reset: Parola reset ke new: email address: 'Adresa e-postey:' diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index d5e4ebf92..06840f5ff 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1642,8 +1642,6 @@ dsb: reset_password: title: Gronidło slědk stajiś heading: Gronidło za %{user} slědk stajiś - password: 'Gronidło:' - confirm password: 'Gronidło wobkÅ¡uśiś:' reset: Gronidło slědk stajiś flash changed: Twójo gronidło jo se změniło. flash token bad: Njejo móžno było ten token namakaś, pÅ¡osym pśekontrolěruj URL. diff --git a/config/locales/el.yml b/config/locales/el.yml index 6c0069512..7c8502ff1 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -2190,8 +2190,6 @@ el: reset_password: title: Επαναφορά συνθηματικού heading: Επαναφορά συνθηματικού για τον χρήστη %{user} - password: 'Συνθηματικό:' - confirm password: 'Επιβεβαίωση συνθηματικού:' reset: Επαναφορά συνθηματικού flash changed: Το συνθηματικό σας άλλαξε! flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL; diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e9bcdb560..18760b30b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -76,7 +76,7 @@ en-GB: diary_comment: Diary Comment diary_entry: Diary Entry friend: Friend - issue: Проблем + issue: Issue language: Language message: Message node: Node @@ -205,6 +205,14 @@ en-GB: remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) + auth: + providers: + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -246,6 +254,8 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' + common_details: + coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Changeset: %{id}' belongs_to: Author @@ -347,6 +357,7 @@ en-GB: reopened_by_anonymous: Reactivated by anonymous %{when} hidden_by: Hidden by %{user} %{when} report: Report this note + coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -563,14 +574,14 @@ en-GB: hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream - internet_cafe: Интернет Кафе + internet_cafe: Internet Cafe kindergarten: Nursery School - language_school: Езиково училище + language_school: Language school library: Library marketplace: Marketplace monastery: Monastery motorcycle_parking: Motorcycle Parking - music_school: Музикално училище + music_school: Music School nightclub: Night Club nursing_home: Nursing Home parking: Parking @@ -610,7 +621,7 @@ en-GB: census: Census Boundary national_park: National Park protected_area: Protected Area - "yes": Граница + "yes": Boundary bridge: aqueduct: Aqueduct boardwalk: Promenade @@ -619,17 +630,17 @@ en-GB: viaduct: Viaduct "yes": Bridge building: - apartment: Апартамент - apartments: Апартаменти - cabin: Кабина - college: Сграда Колеж - commercial: Търговска Сграда - construction: Сграда в строеж - garage: Гараж - garages: Гаражи - house: Къща - industrial: Индустриална сграда - roof: Покрив + apartment: Apartment + apartments: Apartments + cabin: Cabin + college: College Building + commercial: Commercial Building + construction: Building under Construction + garage: Garage + garages: Garages + house: House + industrial: Industrial Building + roof: Roof "yes": Building craft: brewery: Brewery @@ -1079,7 +1090,7 @@ en-GB: more_results: More results issues: index: - reports: Отчети + reports: Reports layouts: project_name: title: OpenStreetMap @@ -2001,8 +2012,6 @@ en-GB: reset_password: title: Reset password heading: Reset Password for %{user} - password: 'Password:' - confirm password: 'Confirm Password:' reset: Reset Password flash changed: Your password has been changed. flash token bad: Did not find that token, check the URL maybe? @@ -2534,16 +2543,16 @@ en-GB: unnamed: unnamed road courtesy: Directions courtesy of %{link} exit_counts: - first: 1ви - second: 2ри - third: 3ти - fourth: 4ти - fifth: 5ти - sixth: 6ти - seventh: 7ми - eighth: 8ми - ninth: 9ти - tenth: 10ти + first: 1st + second: 2nd + third: 3rd + fourth: 4th + fifth: 5th + sixth: 6th + seventh: 7th + eighth: 8th + ninth: 9th + tenth: 10th time: Time query: node: Node @@ -2590,5 +2599,5 @@ en-GB: flash: Redaction destroyed. error: There was an error destroying this redaction. validations: - invalid_characters: съдържа невалидни символи + invalid_characters: contains invalid characters ... diff --git a/config/locales/en.yml b/config/locales/en.yml index 997500b3d..ec08012fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -232,6 +232,12 @@ en: anonymous: "anonymous" no_comment: "(no comment)" part_of: "Part of" + part_of_relations: + one: 1 relation + other: "%{count} relations" + part_of_ways: + one: 1 way + other: "%{count} ways" download_xml: "Download XML" view_history: "View History" view_details: "View Details" @@ -265,6 +271,8 @@ en: title_html: "Way: %{name}" history_title_html: "Way History: %{name}" nodes: "Nodes" + nodes_count: + other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" @@ -272,6 +280,9 @@ en: title_html: "Relation: %{name}" history_title_html: "Relation History: %{name}" members: "Members" + members_count: + one: 1 member + other: "%{count} members" relation_member: entry_html: "%{type} %{name}" entry_role_html: "%{type} %{name} as %{role}" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 46992fd60..2ca9b42b1 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -144,6 +144,7 @@ eo: description: Priskribo languages: Lingvoj pass_crypt: Pasvorto + pass_crypt_confirmation: Konfirmi pasvorton help: trace: tagstring: disigitaj per komoj @@ -246,6 +247,12 @@ eo: anonymous: anonimulo no_comment: (neniu komento) part_of: Parto de + part_of_relations: + one: 1 rilato + other: '%{count} rilatoj' + part_of_ways: + one: 1 linio + other: '%{count} linioj' download_xml: Elŝuti XML view_history: Vidi historion view_details: Montri detalojn @@ -280,6 +287,9 @@ eo: title_html: 'Linio: %{name}' history_title_html: 'Historio de linio: %{name}' nodes: Nodoj + nodes_count: + one: 1 nodo + other: '%{count} nodoj' also_part_of_html: one: parto de linio %{related_ways} other: parto de linioj %{related_ways} @@ -287,6 +297,9 @@ eo: title_html: 'Rilato: %{name}' history_title_html: 'Historio de rilato: %{name}' members: Anoj + members_count: + one: 1 ano + other: '%{count} anoj' relation_member: entry_role_html: '%{type} %{name} kiel %{role}' type: @@ -509,10 +522,12 @@ eo: chair_lift: Telfero seĝa drag_lift: Skitelfero gondola: Telfero plur-vagoneta + magic_carpet: Ŝtuparlifto skiada platter: Skitelfero unupersona pylon: Fosto station: Kablovoja stacio t-bar: Skitelfero dupersona + "yes": Kablotransporto aeroway: aerodrome: Aerodromo airstrip: Provizora aerodromo @@ -521,11 +536,15 @@ eo: hangar: Hangaro helipad: Surteriĝejo helikoptera holding_position: Haltejo antaÅ­ aÅ­tokur-strato + navigationaid: Aviada navigad-helpilo parking_position: Aviadil-parkumejo (pozicio) runway: Avia dromo + taxilane: AÅ­tokur-strateto taxiway: AÅ­tokur-strato terminal: Flugstacio + windsock: Ventmontrilo (maniko) amenity: + animal_boarding: Hotelo por hejmbestoj animal_shelter: Azilo por bestoj arts_centre: Belart-centro atm: BankaÅ­tomato @@ -535,7 +554,9 @@ eo: bench: Benko bicycle_parking: Parkumejo bicikla bicycle_rental: Biciklopruntejo + bicycle_repair_station: Bicikla memriparejo biergarten: Bierĝardeno + blood_bank: Sangobanko boat_rental: Boat-pruntejo brothel: Putinejo bureau_de_change: Monŝanĝejo @@ -552,6 +573,7 @@ eo: clock: Horloĝo college: Postmezgrada lernejo community_centre: Komunuma centro + conference_centre: Konferenca centro courthouse: Juĝejo crematorium: Kadavro-bruligejo dentist: Dentistejo @@ -559,6 +581,7 @@ eo: drinking_water: Trinkakvejo driving_school: Stirlernejo embassy: Ambasadejo + events_venue: Domo de ceremonioj fast_food: Rapidmanĝejo ferry_terminal: Pramstacio fire_station: Fajrobrigadejo @@ -571,16 +594,24 @@ eo: hospital: Malsanulejo hunting_stand: Altembusko ĉasada ice_cream: Glaciaĵejo + internet_cafe: Retkafejo kindergarten: Infanĝardeno + language_school: Lingva lernejo library: Biblioteko + loading_dock: Ŝarĝ-kajo + love_hotel: Amor-hotelo marketplace: Bazaro + mobile_money_agent: Agentejo de poŝtelefonaj mon-transigoj monastery: MonaÄ¥ejo + money_transfer: Centro de mon-transigo motorcycle_parking: Parkumejo motorcikla + music_school: Muzika lernejo nightclub: Noktoklubejo nursing_home: Domo de permanenta zorgado parking: Parkumejo parking_entrance: Enveturejo al parkumejo parking_space: Parkumeja loko + payment_terminal: Pag-terminalo pharmacy: Apoteko place_of_worship: Preĝejo police: Policejo @@ -588,9 +619,13 @@ eo: post_office: Poŝtoficejo prison: Malliberejo pub: Taverno + public_bath: Banejo (distro) + public_bookcase: Publika libroŝranko public_building: Konstruaĵo publika + ranger_station: Naturrezerveja oficejo recycling: Recikligejo restaurant: Restoracio + sanitary_dump_station: Stacio de forigo de fekaĵoj school: Lernejo shelter: Ŝirmejo shower: Duŝejo @@ -603,18 +638,27 @@ eo: theatre: Teatro toilets: Necesejo townhall: Urbodomo + training: Ekzercejo university: Universitato + vehicle_inspection: AÅ­tomobil-kontrolejo vending_machine: Vendilo veterinary: Bestokuracistejo village_hall: Komunuma centro (vilaĝo) waste_basket: Rubujo waste_disposal: Rubujego + waste_dump_site: Rubodeponejo neformala + watering_place: Akvotrinkejo por bestoj water_point: Trinkejo + weighbridge: Pesilo por aÅ­tomobiloj + "yes": Servejo boundary: + aboriginal_lands: Rezervejo de indiĝena popolo administrative: Administra limo census: Popolnombrada limo national_park: Nacia parko + political: Limo de balot-distrikto protected_area: Naturprotektejo + "yes": Limo bridge: aqueduct: Akvedukto boardwalk: Ligna trotuaro @@ -623,24 +667,94 @@ eo: viaduct: Viadukto "yes": Ponto building: + apartment: Apartamentaro + apartments: Apartamentaro + barn: Garbejo + bungalow: Bangalo + cabin: Kabano + chapel: Kapelo + church: Kirko + civic: Publika konstruaĵo + college: Postmezgrada lernejo (konstruaĵo) + commercial: Oficeja/komerca konstruaĵo + construction: Konstruaĵo dum konstruado + detached: Liberstaranta domo + dormitory: Studenthejmo + duplex: Ĝemela domo + farm: Ĉefarma domo + farm_auxiliary: Ĉefarma konstruaĵo + garage: Garaĝo + garages: Garaĝaro + greenhouse: Kultivdomo + hangar: Hangaro + hospital: Malsanulejo (konstruaĵo) + hotel: Hotelo (konstruaĵo) + house: Domo + houseboat: Domboato + hut: Ĥato + industrial: Industria konstruaĵo + kindergarten: Infanvartejo (konstruaĵo) + manufacture: Fabriko + office: Oficejo (konstruaĵo) + public: Publika konstruaĵo + residential: Loĝeja konstruaĵo + retail: Komerca konstruaĵo + roof: Tegmento + ruins: Ruinoj de konstruaĵo + school: Lernejo (konstruaĵo) + semidetached_house: Ĝemela domo + service: Serva konstruaĵeto + shed: Budo + stable: Ĉeval-stalo + static_caravan: Movdomo (nemovata) + temple: Templo (konstruaĵo) + terrace: Envicaj domoj + train_station: Fervoj-stacio (konstruaĵo) + university: Universitato (konstruaĵo) + warehouse: Magazeno "yes": Konstruaĵo + club: + scout: Skolta klubejo + sport: Sporta klubejo + "yes": Klubejo craft: + beekeper: Abelejo + blacksmith: Forĝejo brewery: Bierfarejo carpenter: Ĉarpentistejo + caterer: Oficejo de manĝ-provizisto + confectionery: Sukeraĵejo + dressmaker: Laborejo de tajloro electrician: Elektristejo + electronics_repair: Riparejo de elektronikaĵoj gardener: Ĝardenistejo + glaziery: Laborejo de vitristo + handicraft: Laborejo de manmetisto + hvac: Oficejo de isto pri hejtado, aerumado, klimatizado + metal_construction: Laborejo de metal-konstruaĵisto painter: Farbistejo photographer: Fotistejo plumber: Tubistejo + roofer: Oficejo de tegmentisto + sawmill: Segejo shoemaker: Ŝuistejo + stonemason: Laborejo de ŝton-tranĉisto tailor: Tajlorejo + window_construction: Laborejo de fenestr-faristo + winery: Vinejo "yes": Metiejo emergency: + access_point: Vivsava rekonebla signo ambulance_station: Ambulanca stacio assembly_point: Vivsava renkontiĝejo defibrillator: Defibrililo + fire_xtinguisher: Fajestingilo + fire_water_pond: Fajrobrigada akvorezervujo landing_site: Surteriĝejo en urĝo + life_ring: Savoringo phone: Alarma telefono + siren: Alarmsireno + suction_point: Fajrobrigada akvopumpejo water_tank: KontraÅ­brulega akvujo "yes": Je danĝero highway: @@ -653,6 +767,7 @@ eo: cycleway: Bicikovojo elevator: Lifto emergency_access_point: Vivsava rekonebla signo + emergency_bay: Kriokaza strat-golfo footway: Piedvojeto ford: Travadejo give_way: Trafiksigno ‘cedi traveturon’ @@ -683,35 +798,45 @@ eo: tertiary: Vojo tria-ranga tertiary_link: Ligilo al vojo tria-ranga track: Vojo kampa + traffic_mirror: Trafika spegulo traffic_signals: Trafiklumoj + trailhead: Komenco de turisma kurso trunk: Vojo ekspresa trunk_link: Ligilo al vojo ekspresa turning_loop: Ejo por ĝirado U-forma unclassified: Vojo kvara-ranga "yes": Vojo historic: + aircraft: Aviadilo historia archaeological_site: ArÄ¥eologia ejo + bomb_crater: Kratero eksploda battlefield: Batalejo historia boundary_stone: Limŝtono building: Konstruaĵo historia bunker: Bunkro armea + cannon: Pafilego historia castle: Kastelo + charcoal_pile: Karbigejo historia church: Kirko city_gate: Pordego urba citywalls: Muro urba fort: Fortikaĵo heritage: Heredaĵa objekto/ejo + hollow_way: Voja kavo house: Domo manor: Palaceto historia memorial: Memorigaĵo + milestone: Mejloŝtono historia mine: Minejo mine_shaft: Ŝakto monument: Monumento + railway: Historia fervoja objekto roman_road: Romia ŝoseo ruins: Ruinoj historiaj stone: Ŝtonego historia tomb: Tombo tower: Turo + wayside_chapel: Adorejo apudvoja wayside_cross: Krucifikso apudvoja wayside_shrine: Adorejo apudvoja wreck: Ruinoj de ŝipo @@ -720,6 +845,7 @@ eo: "yes": Vojkruciĝo landuse: allotments: Familiaj ĝardenoj + aquaculture: Tereno de akvokulturo basin: Baseno brownfield: AntaÅ­-konstruejo (post-malkonstruado) cemetery: Tombejo @@ -739,9 +865,11 @@ eo: military: Armea tereno mine: Minejo orchard: Fruktoĝardeno + plant_nursery: Arb-plantejo quarry: Minejo subĉiela railway: Fervojo recreation_ground: Ripoza tereno + religious: Religia tereno reservoir: Lago artefarita reservoir_watershed: Baseno artefarita residential: Privatdoma tereno @@ -750,9 +878,15 @@ eo: vineyard: Vinberĝardeno "yes": Utilkampo leisure: + adult_gaming_centre: Hazardludejo + amusement_arcade: Salono de ludoj + bandstand: Orkestrejo beach_resort: Apudmara ripoz-centro bird_hide: Bird-observejo + bleachers: Spektejo + bowling_alley: Kegloludejo common: Publika ripoza tereno + dance: Dancejo dog_park: Hund-parko firepit: Lignofajrejo fishing: Fiŝkaptadejo @@ -765,7 +899,9 @@ eo: marina: JaÄ¥t-haveno miniature_golf: Minigolfludejo nature_reserve: Naturrezervejo + outdoor_seating: Seĝoj eksterdome park: Parko + picnic_table: Piknika tablo pitch: Ludkampo playground: Infana ludejo recreation_ground: Ripoza tereno @@ -780,13 +916,21 @@ eo: "yes": Ripozejo man_made: adit: Minejo horizontala + advertising: Reklamo + antenna: Anteno + avalanche_protection: KontraÅ­-lavanga protektilo beacon: Buo fiksa + beam: Trabo beehive: Abulejo breakwater: Ond-rompilo bridge: Ponto bunker_silo: Bunkro armea + cairn: Ŝtonamaso chimney: Fumtubo + clearcut: Hakita arbaro + communications_tower: Turo telekomunikada crane: Gruo + cross: Kruco dolphin: Dukdalbo dyke: Digo embankment: Surŝutaĵo @@ -795,6 +939,7 @@ eo: groyne: Ond-rompileto kiln: Forno industria lighthouse: Lumturo + manhole: Stratkanala kovrilo mast: Masto mine: Minejo mineshaft: Ŝakto @@ -802,12 +947,20 @@ eo: petroleum_well: Naftoŝakto pier: Marponto pipeline: Konduktubo + pumping_station: Pump-stacio + reservoir_covered: Kovrita akvorezervujo silo: Tur-stokejo + snow_cannon: Neĝokanono + snow_fence: KontraÅ­-neĝa barilo storage_tank: Rezervujo + street_cabinet: Ŝranko distribua surveillance: Supergardo + telescope: Teleskopo tower: Turo + utility_pole: Fosto wastewater_plant: Akvopurigejo watermill: Muelejo akva + water_tap: Akvokrano water_tower: Akvoturo water_well: Puto water_works: Akvotrinkebligejo @@ -818,10 +971,13 @@ eo: airfield: Aerbazo armea barracks: Soldatejo bunker: Bunkro armea + checkpoint: Kontrolejo armea + trench: Tranĉeo armea "yes": Armeo mountain_pass: "yes": Montpasejo natural: + bare_rock: Roka areo bay: Golfo beach: Sablobordo cape: Promontoro @@ -837,6 +993,7 @@ eo: grassland: Herbejo heath: Erikejo hill: Monteto + hot_spring: Tervarma akvofonto island: Insulo land: Tero marsh: Aluvia grundo @@ -860,20 +1017,31 @@ eo: water: Akvejo wetland: Malsekejo wood: Arbaro + "yes": Naturo office: accountant: Oficejo de kontisto administrative: Administra oficejo + advertising_agency: Oficejo de reklamo architect: Oficejo de arÄ¥itekturisto association: Oficejo de asocio company: Oficejo de firmao + diplomatic: Oficejo diplomata educational_institution: Oficejo de edukada institucio employment_agency: Dungoficejo + energy_supplier: Oficejo de elektr-provizanto estate_agent: Oficejo de nemoveblaĵisto + financial: Oficejo financa government: Registara oficejo insurance: Asekurkompaniejo it: Oficejo de informteÄ¥nika firmao lawyer: Oficejo de leĝisto + logistics: Oficejo de ekspedo + newspaper: Oficejo de redakto ngo: Oficejo de ne-registara organizaĵo + notary: Oficejo de notario + religion: Kancelario religia + research: Oficejo de scienca esplorado + tax_advisor: Oficejo de impost-konsilo telecommunication: Telekomunikada oficejo travel_agent: Vojaĝ-oficejo "yes": Oficejo @@ -893,6 +1061,7 @@ eo: locality: Ejo municipality: Municipo neighbourhood: Najbaraĵo + plot: Parcelo postcode: Poŝtkodo quarter: Kvartalo region: Regiono @@ -927,12 +1096,19 @@ eo: switch: Trakforko tram: Tramlinio tram_stop: Haltejo trama + yard: Stacio fervoja vara shop: + agrarian: Agrokultura vendejo alcohol: Alkohol-vendejo antiques: Antikvaĵ-vendejo + appliance: Elektronikaĵega vendejo art: Artaĵ-vendejo + baby_goods: Bebaĵa vendejo + bag: Saka/valiza vendejo bakery: Panejo + bathroom_furnishing: Lavĉambr-akcesoraĵa vendejo beauty: Beligejo + bed: Lita/matraca vendejo beverages: Trinkaĵ-vendejo bicycle: Bicikl-vendejo bookmaker: Vetperisto @@ -944,61 +1120,90 @@ eo: car_repair: AÅ­toriparejo carpet: Tapiŝ-vendejo charity: Almoza vendejo + cheese: Fromaĝa vendejo chemist: Purigaĵ-vendejo + chocolate: Ĉokolada vendejo clothes: Vesta vendejo + coffee: Kafa vendejo computer: Komputil-vendejo confectionery: Sukeraĵejo convenience: Butiko oportuna copyshop: Fotokopiilejo cosmetics: Kosmetikaĵ-vendejo + craft: Materialoj-por-metio-vendejo + curtain: Kurtena vendejo + dairy: Laktaĵa vendejo deli: Delikataĵ-vendejo department_store: Ĉiovendejo discount: Vendejo kun rabatitaj artikoloj doityourself: Memfaradil-vendejo dry_cleaning: Vestaĵ-lavejo (nepolara solvilo) + e-cigarette: Elektronik-cigareda vendejo electronics: Elektronik-vendejo + erotic: Seksumila vendejo estate_agent: Oficejo de nemoveblaĵisto + fabric: Teksaĵa vendejo farm: Terfrukt-vendejo fashion: Vesta vendejo + fishing: Fiŝkaptila vendejo florist: Florvendejo food: Manĝovendejo + frame: Kadroj-de-pentraĵoj-vendejo funeral_directors: Tombistejo furniture: Mebl-vendejo garden_centre: Ĝarden-vendejo + gas: Gasa vendejo general: Ĝeneral-vendejo gift: Suvenir-vendejo greengrocer: Legom-butiko grocery: Manĝovendejo hairdresser: Frizejo hardware: Laboril-vendejo + health_food: Sanig-manĝaĵa vendejo + hearing_aids: AÅ­d-helpila vendejo + herbalist: Herba vendejo hifi: Altfidel-son-vendejo houseware: Mastrum-aparata vendejo + ice_cream: Glaciaĵa vendejo interior_decoration: Ensembl-vendejo jewelry: Juvel-vendejo kiosk: Gazetbudo kitchen: Kuirej-mebla vendejo laundry: Vestaĵ-lavejo (akvo) + locksmith: Laborejo de seruristo lottery: Loteri-vendejo mall: Vendejaro massage: Kabineto de masaĝo + medical_supply: Medicin-aparata vendejo mobile_phone: Poŝtelefon-vendejo + money_lender: Mon-pruntejo motorcycle: Motorcikl-vendejo + motorcycle_repair: Motorcikl-riparejo music: Muzik-vendejo + musical_instrument: Muzik-instrumenta vendejo newsagent: Gazet-vendejo + nutrition_supplements: Diet-suplementa vendejo optician: Optikbutiko organic: Ekologi-manĝaĵa vendejo outdoor: Vojaĝil-vendejo paint: Farb-vendejo + pastry: Kukejo pawnbroker: Mon-pruntejo (kontraÅ­ garantiaĵo) + perfumery: Parfumejo pet: Dombest-vendejo + pet_grooming: Hejmbesta beligejo photo: Fotovendejo seafood: Marfrukt-vendejo second_hand: Brokantejo + sewing: Kudrilar-vendejo shoes: Ŝuo-vendejo sports: Sportovendejo stationery: Papervaro-vendejo + storage_rental: Magazena spaco por lui supermarket: Superbazaro tailor: Tajlorejo + tattoo: Salono de tatuado + tea: Tea vendejo ticket: Bilet-vendejo tobacco: Tabak-vendejo toys: Ludil-vendejo @@ -1007,6 +1212,8 @@ eo: vacant: Forlasita vendejo variety_store: Diversaĵ-vendejo video: Filmovendejo + video_games: Videoluda vendejo + wholesale: Pogranda vendejo wine: Vin-vendejo "yes": Vendejo tourism: @@ -1016,6 +1223,7 @@ eo: attraction: Vidindaĵo bed_and_breakfast: Pensiono 'tranokti k matenmanĝi' cabin: Kabano + camp_pitch: Loko por kampadveturilo/tendo camp_site: Kampadejo caravan_site: Kampadveturil-parkumejo chalet: Dometo feria @@ -1029,6 +1237,7 @@ eo: picnic_site: Piknika ejo theme_park: Amuzparko viewpoint: Belvidejo + wilderness_hut: Sovaĝeja kabano zoo: Bestoĝardeno tunnel: building_passage: Trakonstruaĵa tunelo @@ -2108,8 +2317,6 @@ eo: reset_password: title: Nuligi pasvorton heading: Nuligi Pasvorton por %{user} - password: 'Pasvorto:' - confirm password: 'Konfirmi pasvorton:' reset: Nuligi pasvorton flash changed: Via pasvorto estis ŝanĝita. flash token bad: Netrovebla ĵetono, bonvolu kontroli la URLon. @@ -2717,7 +2924,7 @@ eo: node: Nodo way: Linio relation: Rilato - nothing_found: Neniuj objektoj trovitaj + nothing_found: Neniu objekto trovita error: 'Eraro dum komunikado kun %{server}: %{error}' timeout: Atingis tempolimon dum kontakto kun %{server} context: diff --git a/config/locales/es.yml b/config/locales/es.yml index 3c6721425..d1e93f64c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2194,8 +2194,6 @@ es: reset_password: title: Restablecer contraseña heading: Restablecer contraseña para %{user} - password: 'Contraseña:' - confirm password: 'Confirmar contraseña:' reset: Restablecer contraseña flash changed: Tu contraseña ha sido cambiada. flash token bad: No se ha encontrado este elemento, ¿Quizá debería comprobar diff --git a/config/locales/et.yml b/config/locales/et.yml index 8eeb5f929..56adfb004 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -27,7 +27,7 @@ et: create: Saada client_application: create: Registreeri - update: Redigeeri + update: Uuenda redaction: create: Loo redaktsioon update: Salvesta redaktsioon @@ -89,15 +89,15 @@ et: trace: user: Kasutaja visible: Nähtav - name: Nimi + name: Failinimi size: Suurus latitude: Laius longitude: Pikkus public: Avalik description: Kirjeldus - gpx_file: 'Laadi üles GPX-fail:' - visibility: 'Nähtavus:' - tagstring: 'Sildid:' + gpx_file: Laadi üles GPX-fail + visibility: Nähtavus + tagstring: Sildid message: sender: Saatja title: Teema @@ -390,7 +390,7 @@ et: diary_entry: posted_by_html: Postitas %{link_user} kuupäeval %{created} – %{language_link} comment_link: Kommenteeri seda sissekannet - reply_link: Vasta sellele sissekandele + reply_link: Saada autorile sõnum comment_count: one: '%{count} kommentaar' zero: Kommentaarid puuduvad @@ -946,13 +946,13 @@ et: hi: Tere, %{to_user}! header: '%{from_user} kommenteeris hiljutist OpenStreetMapi päevikusissekannet pealkirjaga %{subject}:' - footer: Loe kommentaari lehel %{readurl}. Võid lisada oma kommentaari lehel - %{commenturl} või vastata kommentaarile lehel %{replyurl}. + footer: Saad lugeda kommentaari aadressil %{readurl}. Samuti saad lisada kommentaari + aadressil %{commenturl} või saata autorile sõnumi aadressil %{replyurl}. message_notification: hi: Tere, %{to_user} header: '%{from_user} on saatnud sulle OpenStreetMapi kaudu sõnumi teemaga %{subject}:' - footer_html: Sõnumit saad lugeda ka aadressil %{readurl} ning vastata saad aadressil - %{replyurl}. + footer_html: Saad lugeda sõnumit ka aadressil %{readurl} ja saata autorile sõnumi + aadressil %{replyurl}. friendship_notification: hi: Tere, %{to_user} subject: '[OpenStreetMap] %{user} lisas sind oma sõbraks' @@ -972,8 +972,10 @@ et: more_info_2: 'neid vältida leiab:' success: subject: '[OpenStreetMap] GPX Importimine õnnestus' - loaded_successfully: laaditi üles edukalt %{trace_points} punkti võimalikust - %{possible_points} punktist. + loaded_successfully: + one: laaditi üles edukalt %{trace_points} punkt võimalikust ühest punktist. + other: laaditi üles edukalt %{trace_points} punkti võimalikust %{possible_points} + punktist. signup_confirm: subject: '[OpenStreetMap] Tere tulemast OpenStreetMapi' greeting: Tere! @@ -1044,10 +1046,10 @@ et: subject_own: '[OpenStreetMap] %{commenter} on kommenteerinud üht sinu muudatuskogumit' subject_other: '[OpenStreetMap] %{commenter} on kommenteerinud muudatuskogumit, millest sa oled huvitunud' - your_changeset: '%{commenter} on jätnud kommentaari ühele sinu muudatuskogumile, - mis on loodud kuupäeval %{time}' - commented_changeset: '%{commenter} on jätnud kommentaari kaardi muudatuskogumile, - mida sa jälgid ja mille on loonud %{changeset_author} kuupäeval %{time}' + your_changeset: '%{commenter} jättis kommentaari ühele sinu muudatuskogumile + (%{time})' + commented_changeset: '%{commenter} jättis kommentaari muudatuskogumile (%{time}), + mida jälgid ja mille on loonud %{changeset_author}' partial_changeset_with_comment: kommentaariga '%{changeset_comment}'. partial_changeset_without_comment: ilma kommentaarita. details: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. @@ -1163,12 +1165,12 @@ et: \nOpenStreetMap Foundation (OSMF) \nkogukonna nimel. Kõigis OSMF-i hallatavates teenustes kehtivad meie kasutustingimused, võrgueeskiri - ja andmekaitsereeglid.\n
\nPalun - võta ühendust OSMF-iga,\nkui - sul on küsimusi litsentseerimise, autoriõiguste või muude õiguslike probleemide - kohta.\n
\nOpenStreetMap, suurendusklaasi logo ja State of the Map on OSMF-i registreeritud - kaubamärgid." + ja andmekaitsereeglid." + legal_2_html: |- + Palun võta ühendust OSMF-iga, + kui sul on küsimusi litsentsimise, autoriõiguse või muude õiguslike teemade kohta. +
+ OpenStreetMap, suurendusklaasi logo ja State of the Map on OSMF-i registreeritud kaubamärgid. partners_title: Partnerid copyright: foreign: @@ -1195,8 +1197,8 @@ et: tulemust levitada ainult sama litsentsi tingimustel. Sinu õigusi ja kohustusi selgitab litsentsi täistekst. intro_3_1_html: |- - Kaardipaanide kujutised ja dokumentatsioon kuuluvad Creative Commonsi - litsentsi "Autorile viitamine + jagamine samadel tingimustel 2.0" (CC BY-SA) alla. + Meie dokumentatsioon kuulub Creative Commonsi + litsentsi "Autorile viitamine + jagamine samadel tingimustel 2.0" (CC BY-SA 2.0) alla. credit_title_html: OpenStreetMapile viitamine credit_1_html: |- Nõuame, et kasutad omistamiseks teksti “© OpenStreetMapi @@ -1212,6 +1214,11 @@ et: aadressidele openstreetmap.org (võimalik, et laiendades teksti "OpenStreetMap" täisaadressiks), opendatacommons.org ja kui vaja, siis ka aadressile creativecommons.org. + credit_3_1_html: "Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org + on\nlitsentsi Open Database License alla kuuluvatest andmetest loodud teos,\nmille + autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane,\nsiis palun + omista need autorile järgmiselt: \n“Aluskaart ja andmed OpenStreetMapist + ja OpenStreetMap Foundationilt”." credit_4_html: |- Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas. Näiteks: @@ -1404,7 +1411,7 @@ et: arupidamiseks ja dokumenteerimiseks. welcome: url: /welcome - title: Tere tulemast OSMi + title: Tere tulemast OpenStreetMapi description: Alusta selle kiirjuhendiga, mis hõlmab OpenStreetMapi põhitõdesid. beginners_guide: url: https://wiki.openstreetmap.org/wiki/Et:Beginners%27_guide @@ -1412,8 +1419,9 @@ et: description: Kogukonna hallatav juhend algajatele. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Esita küsimus või otsi vastuseid OSMi küsimuste ja vastuste veebilehel. + title: Abifoorum + description: Esita küsimus või otsi vastuseid OpenStreetMapi küsimuste ja + vastuste veebilehel. mailing_lists: title: Postiloendid description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes @@ -1431,8 +1439,8 @@ et: võtta OpenStreetMapil põhinevad kaardid ja muud teenused. wiki: url: https://wiki.openstreetmap.org/wiki/Et:Main_Page - title: wiki.openstreetmap.org - description: Sirvi vikis OSMi põhjalikumat dokumentatsiooni. + title: OpenStreetMapi viki + description: Sirvi vikis OpenStreetMapi põhjalikumat dokumentatsiooni. sidebar: search_results: Otsingu tulemused close: Sulge @@ -1621,7 +1629,9 @@ et: newer: Uuemad rajad trace: pending: OOTEL - count_points: '%{count} punkti' + count_points: + one: 1 punkt + other: '%{count} punkti' more: rohkem trace_details: Vaata raja üksikasju view_map: Vaata kaarti @@ -1789,8 +1799,6 @@ et: reset_password: title: Lähtesta parool heading: Kasutaja %{user} parooli lähtestamine - password: 'Parool:' - confirm password: 'Kinnita parool:' reset: Lähtesta parool flash changed: Sinu parool on muudetud. flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index b687c13e8..a255666f5 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -2056,8 +2056,6 @@ eu: reset_password: title: Pasahitza berrezarri heading: '%{user}-ren pasahitza berrezarri' - password: 'Pasahitza:' - confirm password: 'Pasahitza berretsi:' reset: Pasahitza berrezarri flash changed: Zure pasahitza aldatu da. flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada? diff --git a/config/locales/fa.yml b/config/locales/fa.yml index fa6e73c39..4c69ffbd0 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -44,6 +44,8 @@ fa: formats: friendly: '%e %B %Y ساعت %H:%M' helpers: + file: + prompt: انتخاب فایل submit: diary_comment: create: ذخیره @@ -112,6 +114,13 @@ fa: name: نام (اجباری) callback_url: Callback URL support_url: URL پشتیبانی + allow_read_prefs: ترجیحات کاربری آن‌ها را بخواند + allow_write_prefs: ترجیحات کاربری آن‌ها را تغییر دهد + allow_write_diary: روزنوشت ایجاد کند، نظر ثبت کند و دوست اضافه کند + allow_write_api: نقشه را تغییر دهد + allow_read_gpx: ردهای GPS خصوصی آن‌ها را بخواند + allow_write_gpx: ردهای GPS بارگذاری کند + allow_write_notes: یادداشت‌ها را تغییر دهد diary_comment: body: متن diary_entry: @@ -141,6 +150,7 @@ fa: body: متن recipient: گیرنده report: + category: دلیل گزارش خود را انتخاب کنید details: لطفاً جزئیات بیشتری از مشکل ارائه دهید (ضروری است). user: email: ایمیل @@ -149,6 +159,7 @@ fa: description: توضیحات languages: زبان‌ها pass_crypt: گذرواژه + pass_crypt_confirmation: تأیید گذرواژه help: trace: tagstring: جداشده با کاما (,) @@ -249,6 +260,12 @@ fa: anonymous: گمنام no_comment: (بدون توضیح) part_of: بخشی از + part_of_relations: + one: 1 رابطه + other: '%{count} رابطه' + part_of_ways: + one: 1 راه + other: '%{count} راه' download_xml: بارگیری XML view_history: نمایش تاریخچه view_details: نمایش جزئیات @@ -281,6 +298,8 @@ fa: title_html: 'راه: %{name}' history_title_html: 'تاریخچهٔ راه: %{name}' nodes: گره‌ها + nodes_count: + other: '%{count} گره' also_part_of_html: one: بخشی از راه %{related_ways} other: ' بخشی از راه‌های %{related_ways}' @@ -288,6 +307,9 @@ fa: title_html: 'رابطه: %{name}' history_title_html: 'تاریخچهٔ رابطه: %{name}' members: اعضا + members_count: + one: 1 عضو + other: '%{count} عضو' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} با نقش %{role}' @@ -575,11 +597,14 @@ fa: hospital: بیمارستان hunting_stand: شکارگاه ice_cream: بستنی فروشی + internet_cafe: کافی‌نت kindergarten: کودکستان + language_school: آموزشگاه زبان library: کتابخانه marketplace: بازار monastery: صومعه motorcycle_parking: پارکینگ موتور سیکلت + music_school: آموزشگاه موسیقی nightclub: باشگاه شبانه nursing_home: خانه سالمندان parking: پارکینگ @@ -592,6 +617,7 @@ fa: post_office: ادارهٔ پست prison: زندان pub: میخانه + public_bath: حمام عمومی public_building: ساختمان عمومی recycling: نقطه بازیافت restaurant: رستوران @@ -608,6 +634,7 @@ fa: toilets: سرویس های بهداشتی townhall: شهرداری university: دانشگاه + vehicle_inspection: معاینه فنی vending_machine: دستگاه فروش veterinary: جراح دامپزشک village_hall: دهیاری @@ -619,6 +646,7 @@ fa: census: مرز آماری national_park: پارک ملی protected_area: منطقه حفاظت‌شده + "yes": مرز bridge: aqueduct: قنات boardwalk: Boardwalk @@ -627,27 +655,37 @@ fa: viaduct: پل راه آهن روی دره "yes": پل building: - apartments: بلوک آپارتمان + apartment: آپارتمان + apartments: آپارتمان‌ها chapel: کلیسا - church: کلیسا + church: ساختمان کلیسا commercial: ساختمان تجاری + construction: ساختمان در دست ساخت dormitory: خوابگاه دانشجویی - farm: ساختمان در مزرعه + farm: خانهٔ مزرعه garage: گاراژ + greenhouse: گلخانه hospital: ساختمان بیمارستان - hotel: هتل + hotel: ساختمان هتل house: خانه industrial: ساختمان صنعتی + kindergarten: ساختمان مهدکودک office: ساختمان اداری public: ساختمان عمومی residential: ساختمان مسکونی retail: معاملات املاک + roof: سقف + ruins: ساختمان ویران school: ساختمان مدرسه - terrace: تراس - train_station: ایستگاه راه‌آهن + terrace: ردیف ساختمان‌ها + train_station: ساختمان پایانهٔ قطار university: ساختمان دانشگاه + warehouse: انبار "yes": ساختمان + club: + "yes": باشگاه craft: + blacksmith: آهنگر brewery: ابجوسازی carpenter: نجار electrician: متخصص برق @@ -803,6 +841,8 @@ fa: "yes": فراغت man_made: adit: مدخل + advertising: تبلیغات + antenna: آنتن beacon: نشانهٔ دریایی beehive: کندو عسل breakwater: موج‌شکن @@ -818,6 +858,7 @@ fa: groyne: آبشکن kiln: کوره lighthouse: فانوس دریایی + manhole: دریچه بازدید mast: دکل mine: معدن mineshaft: رگه اصلی معدن @@ -995,25 +1036,32 @@ fa: grocery: فروشگاه خواروبار hairdresser: سلمانی hardware: فروشگاه سخت افزار + herbalist: عطاری hifi: Hi-Fi houseware: فروشگاه لوازم خانگی + ice_cream: بستنی‌فروشی interior_decoration: دکوراسیون داخلی jewelry: فروشگاه طلا و جواهر kiosk: فروشگاه کیوسک kitchen: فروشگاه آشپزخانه laundry: خشکشویی + locksmith: قفل‌سازی lottery: بخت آزمایی mall: بازار massage: ماساژ + medical_supply: فروشگاه تجهیزات پزشکی mobile_phone: فروشگاه تلفن همراه motorcycle: فروشگاه موتورسیکلت + motorcycle_repair: تعمیرات موتورسیکلت music: فروشگاه موسیقی + musical_instrument: ادوات موسیقی newsagent: دکه روزنامه optician: عینک سازی organic: فروشگاه مواد غذایی آلی outdoor: فروشگاه رو باز paint: رنگ‌فروشی pawnbroker: كارگشا + perfumery: عطرفروشی pet: فروشگاه حیوانات خانگی photo: فروشگاه عکس seafood: غذای دریایی @@ -1203,6 +1251,7 @@ fa: layouts: project_name: title: OpenStreetMap + h1: اوپن‌استریت‌مپ logo: alt_text: لوگوی OpenStreetMap home: رفتن به محل خانه @@ -2014,7 +2063,7 @@ fa: permission_denied: شما اجازهٔ دسترسی به آن کنش را ندارید. require_cookies: cookies_needed: به‌نظر می‌رسد کوکی‌ها را غیرفعال کرده‌اید - لطفاً قبل از ادامه - کوکی‌های مرورگرتان فعال کنید. + کوکی‌های مرورگرتان را فعال کنید. require_admin: not_an_admin: برای انجام آن کنش باید مدیر باشید. setup_user_auth: @@ -2164,8 +2213,6 @@ fa: reset_password: title: بازنشانی گذرواژه heading: بازنشانی گذرواژه برای %{user} - password: 'گذرواژه:' - confirm password: 'تأیید گذرواژه:' reset: بازنشانی گذرواژه flash changed: گذرواژهٔ شما عوض شد. flash token bad: توکن را نیافتید؟ نشانی را بررسی کنید شاید بیابید. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3004fe70a..d220f4d6d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -2154,8 +2154,6 @@ fi: reset_password: title: Salasanan vaihto heading: Vaihda käyttäjän %{user} salasana - password: 'Salasana:' - confirm password: 'Vahvista salasana:' reset: Vaihda salasana flash changed: Salasanasi on vaihdettu. flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi. diff --git a/config/locales/fit.yml b/config/locales/fit.yml index b70a3a042..e690977aa 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -973,9 +973,6 @@ fit: heading: Unohditko salasanasi? email address: 'E-postiatressi:' new password button: Lähätä salasanan palautusohjeet - reset_password: - password: 'Salasana:' - confirm password: 'Vahvista salasana:' new: title: Luo konttu about: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ba4ad984a..8fcd77f5b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -195,6 +195,7 @@ fr: description: Description languages: Langues pass_crypt: Mot de passe + pass_crypt_confirmation: Confirmer le mot de passe help: trace: tagstring: données séparées par des virgules @@ -299,6 +300,12 @@ fr: anonymous: anonyme no_comment: (aucun commentaire) part_of: Appartient à + part_of_relations: + one: 1 relation + other: '%{count} relations' + part_of_ways: + one: 1 chemin + other: '%{count} chemins' download_xml: Télécharger en XML view_history: Voir l’historique view_details: Afficher les détails @@ -333,6 +340,9 @@ fr: title_html: 'Chemin : %{name}' history_title_html: 'Historique du chemin : %{name}' nodes: Nœuds + nodes_count: + one: 1 nœud + other: '%{count} nœuds' also_part_of_html: one: partie du chemin %{related_ways} other: partie des chemins %{related_ways} @@ -340,6 +350,9 @@ fr: title_html: 'Relation : %{name}' history_title_html: 'Historique de la relation : %{name}' members: Membres + members_count: + one: 1 membre + other: '%{count} membres' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} avec le rôle %{role}' @@ -2420,8 +2433,6 @@ fr: reset_password: title: Réinitialiser le mot de passe heading: Réinitialiser le mot de passe de %{user} - password: 'Mot de passe :' - confirm password: 'Confirmez le mot de passe :' reset: Réinitialiser le mot de passe flash changed: Votre mot de passe a été modifié. flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL. diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 911031b52..c49c99e74 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1121,8 +1121,6 @@ fur: reset_password: title: Azere la password heading: Azere la password par %{user} - password: 'Password:' - confirm password: 'Conferme la password:' reset: Azere la password flash changed: La tô password e je stade cambiade. new: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 751b62dbe..8d74d5e05 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1868,8 +1868,6 @@ ga: reset_password: title: Focal faire a athshocrú heading: Focal Faire le haghaidh %{user} a Athshocrú - password: 'Focal Faire:' - confirm password: 'Deimhnigh an Focal Faire:' reset: Athshocraigh an Focal Faire flash changed: Athraíodh d'fhocal faire. flash token bad: Níor aimsíodh an ceadchomhartha sin, seiceáil an bhfuil an diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 1b22a3802..ceb8e04ed 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1845,8 +1845,6 @@ gd: reset_password: title: Ath-shuidhich am facal-faire heading: Ath-shuidhich am facal-faire aig %{user} - password: 'Facal-faire:' - confirm password: 'Dearbhaich am facal-faire:' reset: Ath-shuidhich am facal-faire flash changed: Chaidh am facal-faire agad atharrachadh. flash token bad: Cha do rinn sinn lorg air an tòcan ud, an toir thu sùil air diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 257c4be14..e5f308cb2 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -2354,8 +2354,6 @@ gl: reset_password: title: Restabelecer o contrasinal heading: Restabelecer o contrasinal de %{user} - password: 'Contrasinal:' - confirm password: 'Confirmar o contrasinal:' reset: Restabelecer o contrasinal flash changed: Mudouse o teu contrasinal. flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo diff --git a/config/locales/he.yml b/config/locales/he.yml index eaa168511..6a07ae633 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -2109,8 +2109,6 @@ he: reset_password: title: איפוס סיסמה heading: איפוס הססמה עבור %{user} - password: 'סיסמה:' - confirm password: 'אימות הסיסמה:' reset: איפוס הססמה flash changed: סיסמתך שונתה. flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור? diff --git a/config/locales/hr.yml b/config/locales/hr.yml index e79862764..87a3c37f3 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1605,8 +1605,6 @@ hr: reset_password: title: Reset lozinke heading: Reset lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrdi zaporku:' reset: Reset lozinke flash changed: VaÅ¡a lozinka je promjenjena. flash token bad: Nije pronađen takav token, provjeri URL? diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 03e00a13e..ac3270d4c 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -2030,8 +2030,6 @@ hsb: reset_password: title: Hesło wróćo stajić heading: Hesło za wužiwarja %{user} wróćo stajić - password: 'Hesło:' - confirm password: 'Hesło wobkrućić:' reset: Hesło wróćo stajić flash changed: Twoje hesło je so změniło. flash token bad: Njemóžachmy tutón kod namakać, proÅ¡u přepruwuj URL. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 5c521a954..0048efa08 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -14,6 +14,7 @@ # Author: GBAB # Author: Glanthor Reviol # Author: Grin +# Author: Hanna Tardos # Author: Kempelen # Author: Leiric # Author: Macofe @@ -36,6 +37,8 @@ hu: formats: friendly: '%Y. %B %e., %H.%M' helpers: + file: + prompt: Válassz egy fájlt submit: diary_comment: create: Mentés @@ -48,7 +51,7 @@ hu: create: Küldés client_application: create: Regisztrálás - update: Szerkesztés + update: Frissítés redaction: create: Módosítás létrehozása update: Módosítás mentése @@ -115,15 +118,15 @@ hu: trace: user: Felhasználó visible: Látható - name: Név + name: Fájlnév size: Méret latitude: Földrajzi szélesség longitude: Földrajzi hosszúság public: Nyilvános description: Leírás - gpx_file: 'GPX fájl feltöltése:' - visibility: 'Láthatóság:' - tagstring: 'Címkék:' + gpx_file: GPX fájl feltöltése + visibility: Láthatóság + tagstring: Címkék message: sender: Küldő title: Tárgy @@ -138,6 +141,7 @@ hu: description: Leírás languages: Nyelvek pass_crypt: Jelszó + pass_crypt_confirmation: Jelszó megerősítése help: trace: tagstring: vesszővel elválasztva @@ -194,6 +198,9 @@ hu: remote: name: Távirányító description: Távirányító (JOSM vagy Merkaartor) + auth: + providers: + wikipedia: Wikipédia api: notes: comment: @@ -231,6 +238,12 @@ hu: anonymous: névtelen no_comment: (nincs hozzászólás) part_of: Része ennek + part_of_relations: + one: 1 kapcsolat + other: '%{count} kapcsolat' + part_of_ways: + one: 1 vonal + other: '%{count} vonal' download_xml: XML letöltése view_history: Előzmények megjelenítése view_details: Részletek megtekintése @@ -263,6 +276,8 @@ hu: title_html: 'Vonal: %{name}' history_title_html: 'Vonal történet: %{name}' nodes: Pontok + nodes_count: + other: '%{count} pont' also_part_of_html: one: '%{related_ways} vonal része' other: '%{related_ways} vonalak része' @@ -270,6 +285,9 @@ hu: title_html: Kapcsolat:%{name} history_title_html: 'Kapcsolat történet: %{name}' members: Tagok + members_count: + one: 1 tag + other: '%{count} tag' relation_member: entry_role_html: '%{type} %{name} mint %{role}' type: @@ -402,6 +420,7 @@ hu: in_language_title: Naplóbejegyzések %{language} nyelven new: Új naplóbejegyzés new_title: Új bejegyzés írása a felhasználói naplómba + my_diary: Naplóm no_entries: Nincsenek naplóbejegyzések recent_entries: Legutóbbi naplóbejegyzések older_entries: Régebbi bejegyzések @@ -424,7 +443,7 @@ hu: diary_entry: posted_by_html: '%{link_user} küldte ekkor: %{created} %{language_link} nyelven' comment_link: Hozzászólás ehhez a bejegyzéshez - reply_link: Válasz a bejegyzésre + reply_link: Üzenet küldése a szerzőnek comment_count: zero: Nincs hozzászólás one: '%{count} hozzászólás' @@ -2117,8 +2136,6 @@ hu: reset_password: title: Jelszó alaphelyzetbe állítása heading: '%{user} jelszavának alaphelyzetbe állítása' - password: 'Jelszó:' - confirm password: 'Jelszó megerősítése:' reset: Jelszó alaphelyzetbe állítása flash changed: Jelszavad megváltozott. flash token bad: Nem található ez az utalvány, ellenőrizd az URL-t. diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 87224f6ab..70f3d556d 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2122,8 +2122,6 @@ ia: reset_password: title: Reinitialisar contrasigno heading: Reinitialisar le contrasigno de %{user} - password: 'Contrasigno:' - confirm password: 'Confirma contrasigno:' reset: Reinitialisar contrasigno flash changed: Tu contrasigno ha essite cambiate. flash token bad: Token non trovate. Verifica le URL. diff --git a/config/locales/id.yml b/config/locales/id.yml index 6070fe01e..25f4fd393 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -2109,8 +2109,6 @@ id: reset_password: title: Setel ulang kata sandi heading: Setel ulang kata sandi untuk %{user} - password: 'Kata Sandi:' - confirm password: 'Konfirmasi Kata Sandi:' reset: Setel Ulang Kata Sandi flash changed: Kata sandi Anda telah diubah. flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin? diff --git a/config/locales/is.yml b/config/locales/is.yml index db4b43dbb..aa9c9579e 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -19,6 +19,8 @@ is: friendly: '%e. %B %Y kl. %H:%M' blog: '%e. %B %Y' helpers: + file: + prompt: Veldu skrá submit: diary_comment: create: Vista @@ -31,7 +33,7 @@ is: create: Senda client_application: create: Nýskrá - update: Breyta + update: Uppfæra redaction: create: Búa til leiðréttingu update: Vista leiðréttingu @@ -84,8 +86,18 @@ is: way_tag: Merki leiðar attributes: client_application: + name: Nafn (krafist) + url: Slóð á aðalforritið (nauðsynleg) callback_url: Svarslóð support_url: Slóð á aðstoð + allow_read_prefs: lesa notandastillingar þeirra + allow_write_prefs: breyta notandastillingum þeirra + allow_write_diary: búa til bloggfærslur, setja inn athugasemdir og bæta við + vinum + allow_write_api: breyta kortagögnunum + allow_read_gpx: lesa einka-GPS-ferlana þeirra + allow_write_gpx: senda inn GPS ferla + allow_write_notes: breyta minnispunktum diary_comment: body: Texti diary_entry: @@ -100,21 +112,22 @@ is: trace: user: Notandi visible: Sýnileg - name: Nafn + name: Skráarheiti size: Stærð latitude: Breiddargráða longitude: Lengdargráða public: Opinbert description: Lýsing - gpx_file: 'Hlaða inn GPX skrá:' - visibility: 'Sýnileiki:' - tagstring: 'Merki:' + gpx_file: Hlaða inn GPX-skrá + visibility: Sýnileiki + tagstring: Merki message: sender: Sendandi title: Fyrirsögn body: Texti recipient: Móttakandi report: + category: Veldu ástæðu fyrir að þú gerir skýrslu details: Tilgreindu öll nauðsynleg atriði um vandamálið (nauðsynlegt). user: email: Netfang @@ -123,6 +136,7 @@ is: description: Lýsing languages: Tungumál pass_crypt: Lykilorð + pass_crypt_confirmation: Staðfestu lykilorð help: trace: tagstring: aðskilið með kommum @@ -229,10 +243,18 @@ is: anonymous: nafnlaus no_comment: (engin athugasemd) part_of: Hluti af + part_of_relations: + one: 1 vensl + other: '%{count} vensl' + part_of_ways: + one: 1 leið + other: '%{count} leiðir' download_xml: Sækja XML view_history: Skoða feril view_details: Skoða nánar location: 'Staðsetning:' + common_details: + coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Breytingasett: %{id}' belongs_to: Höfundur @@ -261,6 +283,9 @@ is: title_html: 'Leið: %{name}' history_title_html: 'Saga leiðar: %{name}' nodes: Hnútar + nodes_count: + one: liður + other: '%{count} liðir' also_part_of_html: one: hluti leiðar %{related_ways} other: hlutar leiða %{related_ways} @@ -268,6 +293,9 @@ is: title_html: 'Vensl: %{name}' history_title_html: 'Ferill vensla: %{name}' members: Meðlimir + members_count: + one: 1 meðlimur + other: '%{count} meðlimir' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} sem „%{role}“' @@ -338,6 +366,7 @@ is: reopened_by_anonymous: Endurvirkjað af nafnlausum notanda fyrir %{when} hidden_by: Falið af %{user} %{when} report: Tilkynna þennan minnispunkt + coordinates_html: '%{latitude}, %{longitude}' query: title: Rannsaka fitjur introduction: Smelltu á kortið til að finna fitjur í nágrenninu. @@ -404,6 +433,7 @@ is: in_language_title: Bloggfærslur á %{language} new: Ný bloggfærsla new_title: Semja nýja færslu á bloggið mitt + my_diary: Bloggið mitt no_entries: Engar bloggfærslur recent_entries: Nýlegar bloggfærslur older_entries: Eldri færslur @@ -425,7 +455,7 @@ is: diary_entry: posted_by_html: Sett inn af %{link_user} %{created} á %{language_link} comment_link: Bæta athugasemd við þessa færslu - reply_link: Svara þessari færslu + reply_link: Senda skilaboð til höfundar comment_count: zero: Engar athugasemdir one: '%{count} athugasemd' @@ -445,6 +475,7 @@ is: location: 'Staðsetning:' view: Skoða edit: Breyta + coordinates: '%{latitude}; %{longitude}' feed: user: title: OpenStreetMap bloggfærslur eftir %{user} @@ -493,10 +524,12 @@ is: chair_lift: Stólalyfta drag_lift: Toglyfta gondola: Eggjalyfta + magic_carpet: Töfrateppislyfta platter: Diskalyfta pylon: Lyftumastur station: Lyftustöð t-bar: T-lyfta + "yes": Víralyfta aeroway: aerodrome: Flugsvæði airstrip: Flugbraut @@ -505,11 +538,15 @@ is: hangar: Flugskýli helipad: Þyrlupallur holding_position: Biðstæði + navigationaid: Aðstoð við flugleiðsögn parking_position: Loftfarastæði runway: Flugbraut + taxilane: Aksturbraut taxiway: Akbraut flugvéla terminal: Flugstöð + windsock: Vindpoki amenity: + animal_boarding: Dýrahótel animal_shelter: Dýraheimili arts_centre: Listamiðstöð atm: Hraðbanki @@ -519,7 +556,9 @@ is: bench: Bekkur bicycle_parking: Hjólastæði bicycle_rental: Reiðhjólaleiga + bicycle_repair_station: Reiðhjólaviðgerðastöð biergarten: Bjórgarður + blood_bank: Blóðbanki boat_rental: Bátaleiga brothel: Hóruhús bureau_de_change: Gjaldeyrisskipti @@ -536,6 +575,7 @@ is: clock: Klukka college: Framhaldsskóli community_centre: Samfélagsmiðstöð + conference_centre: Ráðstefnumiðstöð courthouse: Dómshús crematorium: Bálstofa dentist: Tannlæknir @@ -543,6 +583,7 @@ is: drinking_water: Drykkjarvatn driving_school: Ökuskóli embassy: Sendiráð + events_venue: Aðstaða fyrir atburð fast_food: Skyndibitastaður ferry_terminal: Ferjustöð fire_station: Slökkvistöð @@ -555,16 +596,24 @@ is: hospital: Sjúkrahús hunting_stand: Skotvöllur ice_cream: Ísbúð + internet_cafe: Netkaffi kindergarten: Leikskóli + language_school: Tungumálaskóli library: Bókasafn + loading_dock: Hleðslupallur + love_hotel: Elskendahótel marketplace: Markaður + mobile_money_agent: Afgreiðsla farsímapeninga monastery: Klaustur + money_transfer: Greiðslumiðlun motorcycle_parking: Mótorhjólastæði + music_school: Tónlistarskóli nightclub: Næturklúbbur nursing_home: Hjúkrunarheimili parking: Bílastæði parking_entrance: Aðgangur að bílastæði parking_space: Bílastæði + payment_terminal: Greiðslukassi pharmacy: Lyfjabúð place_of_worship: Tilbeiðslustaður police: Lögreglustöð @@ -572,9 +621,13 @@ is: post_office: Pósthús prison: Fangelsi pub: Krá + public_bath: Almenningsbaðhús + public_bookcase: Almenningsbókakassi public_building: Opinber bygging + ranger_station: Landvarðastöð recycling: Endurvinnsla restaurant: Veitingastaður + sanitary_dump_station: Stöð fyrir hreinlætisúrgang school: Skóli shelter: Skýli shower: Sturta @@ -587,18 +640,27 @@ is: theatre: Leikhús toilets: Klósett townhall: Ráðhús + training: Æfingaaðstaða university: Háskóli + vehicle_inspection: Bifreiðaskoðun vending_machine: Sjálfsali veterinary: Dýraspítali village_hall: Hreppsskrifstofa waste_basket: Ruslafata waste_disposal: Ruslsöfnun + waste_dump_site: Sorplosunarsvæði + watering_place: Vatnsból water_point: Vatnspóstur + weighbridge: Bílavog + "yes": Aðstaða boundary: + aboriginal_lands: Frumbyggjaland administrative: Stjórnsýslumörk census: Manntalsmörk national_park: Þjóðgarður + political: Kjördeilda/kjördæmamörk protected_area: Verndarsvæði + "yes": Mörk bridge: aqueduct: Vatnsveitubrú boardwalk: Plankabrú @@ -607,39 +669,94 @@ is: viaduct: Dalbrú "yes": Brú building: - apartments: Háhýsi + apartment: Íbúð + apartments: Íbúðir + barn: Hlaða + bungalow: Sumarbústaður + cabin: Kofi chapel: Kapellan - church: Kirkjan + church: Kirkjubygging + civic: Almenningsbygging + college: Framhaldsskólabygging commercial: Verslunarhús + construction: Bygging á framkvæmdastigi + detached: Aðskilið hús dormitory: Heimavist + duplex: Parhús farm: Bóndabær + farm_auxiliary: Aðskilin bygging á býli garage: Bílskúr + garages: Verkstæði + greenhouse: Gróðurhús + hangar: Flugskýli hospital: Sjúkrahús - hotel: Hótel + hotel: Hótelbygging house: Hús + houseboat: Húsbátur + hut: Kofi industrial: Iðnaðarhús + kindergarten: Leikskólabygging + manufacture: Verksmiðjubygging office: Skrifstofuhús public: Opinber bygging residential: Íbúðarhús + retail: Verslunarbygging + roof: Þak + ruins: Byggingarústir school: Skóli + semidetached_house: Hálfaðgreint hús + service: Þjónustubygging + shed: Skúr + stable: Hesthús + static_caravan: Hjólhýsi + temple: Trúarleg bygging + terrace: Raðhús + train_station: Lestarstöðvarbygging + university: Háskólabygging + warehouse: Vöruhús "yes": Bygging + club: + scout: Aðstaða skátafélags + sport: Íþróttaklúbbur + "yes": Klúbbur craft: + beekeper: Býflugnabóndi + blacksmith: Járnsmiður brewery: Brugghús carpenter: Trésmiður + caterer: Veisluþjónusta + confectionery: Sælgætisverslun + dressmaker: Klæðskeri electrician: Rafvirki + electronics_repair: Raftækjaviðgerðir gardener: Garðyrkjumaður + glaziery: Glerverkstæði + handicraft: Handverk + hvac: Loftræsti- og hitunarkerfi + metal_construction: Málmsmíði painter: Málari photographer: Ljósmyndari plumber: Pípulagningamaður + roofer: Þaksmiður + sawmill: Sögunarmylla shoemaker: Skósmiður + stonemason: Steinsmiður tailor: Klæðskeri + window_construction: Gluggasmíði + winery: Víngerð "yes": Handverkshús emergency: + access_point: Aðgangspunktur ambulance_station: Sjúkrabílastöð assembly_point: Safnsvæði defibrillator: Hjartastuðtæki + fire_xtinguisher: Slökkvitæki + fire_water_pond: Slökkviliðsvatnsból landing_site: Neyðarlending + life_ring: Björgunarhringur phone: Neyðarsími + siren: Neyðarsírena + suction_point: Soghani fyrir neyðartilfelli water_tank: Vatnstankur fyrir neyðartilfelli "yes": Neyðartilfelli highway: @@ -652,6 +769,7 @@ is: cycleway: Hjólastígur elevator: Lyfta emergency_access_point: Neyðaraðgangur + emergency_bay: Neyðarútskot footway: Göngustígur ford: Vað give_way: Víkja-skilti @@ -682,35 +800,45 @@ is: tertiary: Annar vegur tertiary_link: Annar vegur track: Slóði + traffic_mirror: Umferðarspegill traffic_signals: Umferðarljós + trailhead: Upphaf slóða trunk: Stofnbraut (Hringvegurinn) trunk_link: Stofnbraut (Hringvegurinn) turning_loop: Snúningsslaufa unclassified: Óflokkaður vegur "yes": Vegur historic: + aircraft: Söguleg flugvél archaeological_site: Fornminjar + bomb_crater: Sögulegur sprengjugígur battlefield: Orustuvöllur boundary_stone: Landamerkjasteinn building: Söguleg bygging bunker: Sprengjubyrgi + cannon: Söguleg fallbyssa castle: Kastali + charcoal_pile: Sögulegur kolahaugur church: Kirkja city_gate: Borgarhlið citywalls: Borgarmúrar fort: Virki heritage: Sögulegur staður + hollow_way: Tröð (niðursokkin leið) house: Hús manor: Herragarður memorial: Minnismerki + milestone: Sögulegur kílómetrasteinn mine: Náma mine_shaft: Námugöng monument: Minnisvarði + railway: Sögulegt lestarspor roman_road: Rómverskur vegur ruins: Rústir stone: Steinn tomb: Gröf tower: Turn + wayside_chapel: Vegakapella wayside_cross: Vegakross wayside_shrine: Vegaskrín wreck: Flak @@ -719,6 +847,7 @@ is: "yes": Tenging landuse: allotments: Úthlutuð svæði + aquaculture: Vatnseldi basin: Lægð brownfield: Byggingarsvæði cemetery: Grafreitur @@ -738,9 +867,11 @@ is: military: Hersvæði mine: Náma orchard: Trjágarður + plant_nursery: Græðlingaræktun quarry: Grjótnáma railway: Lestarteinar recreation_ground: Leikvöllur + religious: Trúartengt svæði reservoir: Uppistöðulón reservoir_watershed: Vatnasvið uppistöðulóns residential: Íbúðasvæði @@ -749,9 +880,15 @@ is: vineyard: Vínekra "yes": Landnotkun leisure: + adult_gaming_centre: Spilasalur fyrir fullorðna + amusement_arcade: Spilasalur + bandstand: Hljómsveitarpallur beach_resort: Strandbær bird_hide: Fuglaskoðunarhús + bleachers: Áhorfendapallar + bowling_alley: Keiluhöll common: Almenningur + dance: Danssalur dog_park: Hundagarður firepit: Eldhola fishing: Fiskveiði @@ -764,7 +901,9 @@ is: marina: Bátalægi miniature_golf: Mínigolf nature_reserve: Náttúruverndarsvæði + outdoor_seating: Sæti utandyra park: Almenningsgarður + picnic_table: Nestisborð pitch: Íþróttavöllur playground: Leikvöllur recreation_ground: Leikvöllur @@ -779,13 +918,21 @@ is: "yes": Afþreying man_made: adit: Námuinngangur + advertising: Auglýsing + antenna: Loftnet + avalanche_protection: Snjóflóðavörn beacon: Miðunarmerki + beam: Biti beehive: Býflugnabú breakwater: Brimvarnargarður bridge: Brú bunker_silo: Sprengjubyrgi + cairn: Varða chimney: Skorsteinn + clearcut: Höggvið + communications_tower: Samskiptamastur crane: Krani + cross: Kross dolphin: Bryggjustólpi dyke: Flóðgarður embankment: Stallur @@ -794,6 +941,7 @@ is: groyne: Öldubrjótur kiln: Brennsluofn lighthouse: Viti + manhole: Mannop mast: Mastur mine: Náma mineshaft: Námugöng @@ -801,12 +949,20 @@ is: petroleum_well: Olíulind pier: Bryggja pipeline: Leiðsla + pumping_station: Dælustöð + reservoir_covered: Yfirbyggt vatnsforðabúr silo: Síló + snow_cannon: Snjóbyssa + snow_fence: Snjógirðing storage_tank: Geymslutankur + street_cabinet: Götuklefi surveillance: Eftirlit + telescope: Sjónauki tower: Turn + utility_pole: Strengjamastur wastewater_plant: Vatnshreinsistöð watermill: Vatnsmylla + water_tap: Vatnshani water_tower: Vatnsturn water_well: Brunnur water_works: Vatnsvinnsla @@ -817,10 +973,13 @@ is: airfield: Herflugvöllur barracks: Herbúðir bunker: Sprengjubyrgi + checkpoint: Varðstöð + trench: Skurður "yes": Hernaðar mountain_pass: "yes": Fjallaskarð natural: + bare_rock: Berar klappir bay: Flói beach: Strönd cape: Höfði @@ -836,6 +995,7 @@ is: grassland: Gresja heath: Heiði hill: Hæð + hot_spring: Heit uppspretta island: Eyja land: Land marsh: Votlendi @@ -859,20 +1019,31 @@ is: water: Vatn wetland: Votlendi wood: Skógur + "yes": Náttúrulegt fyrirbrigði office: accountant: Bókari administrative: Stjórnsýsla + advertising_agency: Auglýsingastofa architect: Arkítektar association: Samtök company: Fyrirtæki + diplomatic: Diplómataskrifstofa educational_institution: Menntastofnun employment_agency: Vinnumiðlun + energy_supplier: Skrifstofa orkusala estate_agent: Fasteignasali + financial: Fjármálaskrifstofa government: Stjórnarskrifstofa insurance: Tryggingaskrifstofa it: Upplýsingatækniskrifstofa lawyer: Lögmaður + logistics: Birgðastjórnunarskrifstofa + newspaper: Skrifstofa dagblaðs ngo: Skrifstofa frjálsra félagasamtaka + notary: Lögbókandi + religion: Skrifstofa trúarlegra málefna + research: Rannsóknaskrifstofa + tax_advisor: Skattaráðgjöf telecommunication: Fjarskiptaskrifstofa travel_agent: Ferðaskrifstofa "yes": Skrifstofa @@ -892,6 +1063,7 @@ is: locality: Sveitarfélag municipality: Sveitarfélag neighbourhood: Nágrenni + plot: Lóð postcode: Póstnúmer quarter: Hverfi region: Hérað @@ -926,12 +1098,19 @@ is: switch: Lestarteinaskipting tram: Sporvagn tram_stop: Sporvagnastöð + yard: Járnbrautagerði shop: + agrarian: Landbúnaðarverslun alcohol: Án vínveitingaleyfis antiques: Antíkverslun + appliance: Raftækjaverslun art: Listmunaverslun + baby_goods: Barnavörur + bag: Pokaverslun bakery: Bakarí + bathroom_furnishing: Baðherbergisinnréttingar beauty: Snyrtivöruverslun + bed: Svefnherbergisvörur beverages: Drykkjarfangaverslun bicycle: Hjólaverslun bookmaker: Veðmangari @@ -943,61 +1122,90 @@ is: car_repair: Bílaviðgerðir carpet: Teppabúð charity: Góðgerðaverslun + cheese: Ostabúð chemist: Lyfsali + chocolate: Súkkulaði clothes: Fataverslun + coffee: Kaffiverslun computer: Tölvuverslun confectionery: Sælgætisverslun convenience: Kjörbúð copyshop: Ljósritunarverslun cosmetics: Snyrtivöruverslun + craft: Aðföng fyrir handverk + curtain: Gluggatjaldaverslun + dairy: Mjólkurbúð deli: Sælkeraverslun department_store: Kjörbúð discount: Afsláttarvöruverslun doityourself: Föndurvörur dry_cleaning: Þurrhreinsun + e-cigarette: Rafrettuverslun electronics: Raftækjaverslun + erotic: Erótísk verslun estate_agent: Fasteignasali + fabric: Vefnaðarvöruverslun farm: Beint frá býli fashion: Tískuverslun + fishing: Fiskveiðivöruverslun florist: Blómabúð food: Matvöruverslun + frame: Rammabúð funeral_directors: Útfararstjóri furniture: Húsgögn garden_centre: Garðyrkja + gas: Gasverslun general: Almenn verslun gift: Gjafabúð greengrocer: Grænmetissali grocery: Matvöruverslun hairdresser: Hársnyrting hardware: Verkfærabúð + health_food: Heilsufæðisverslun + hearing_aids: Heyrnartæki + herbalist: Jurtaverslun hifi: Hljómtækjaverslun houseware: Húsbúnaðarverslun + ice_cream: Ísbúð interior_decoration: Innanhúshönnun jewelry: Skartgripaverslun kiosk: Söluturn kitchen: Eldhúsvörur laundry: Þvottahús + locksmith: Lásasmíði lottery: Lottó mall: Verslunarkjarni massage: Nudd + medical_supply: Lækningavöruverslun mobile_phone: Farsímaverslun + money_lender: Peningaútlán motorcycle: Mótorhjólaverslun + motorcycle_repair: Mótorhjólaviðgerðir music: Tónlistarverslun + musical_instrument: Hljóðfæri newsagent: Blaðasali + nutrition_supplements: Fæðubótarefni optician: Sjóntækjafræðingur organic: Verslun með lífrænt fæði outdoor: Útivistarverslun paint: Málningarvöruverslun + pastry: Kökubúð pawnbroker: Veðlánari + perfumery: Ilmvötn pet: Gæludýraverslun + pet_grooming: Snyrting fyrir gæludýr photo: Ljósmyndavöruverslun seafood: Fiskmeti second_hand: Verslun með notað + sewing: Saumabúð shoes: Skóbúð sports: Íþróttavöruverslun stationery: Ritfangaverslun + storage_rental: Leigugeymslur supermarket: Kjörbúð tailor: Klæðskeri + tattoo: Húðflúrstofa + tea: Teverslun ticket: Miðasala tobacco: Tóbaksverslun toys: Leikfangaverslun @@ -1006,6 +1214,8 @@ is: vacant: Laust verslunarrými variety_store: Smávörumarkaður video: Videoleiga + video_games: Tölvuleikjaverslun + wholesale: Heildsöluverslun wine: Vínbúð "yes": Verslun tourism: @@ -1015,6 +1225,7 @@ is: attraction: Aðdráttarafl bed_and_breakfast: BB-gisting og veitingar cabin: Kofi + camp_pitch: Tjaldreitur camp_site: Tjaldstæði caravan_site: Hjólhýsastæði chalet: Fjallakofi @@ -1028,6 +1239,7 @@ is: picnic_site: Nestisaðstaða theme_park: Þemagarður viewpoint: Útsýnisstaður + wilderness_hut: Óbyggðakofi zoo: Dýragarður tunnel: building_passage: Undirgöng í gegnum byggingu @@ -1233,12 +1445,13 @@ is: header: '%{from_user} hefur bætt við athugasemd á OpenStreetMap bloggfærsluna með titlinum „%{subject}“:' footer: Þú getur einnig lesið athugasemdina á %{readurl} og skrifað athugasemd - á %{commenturl} eða svarað á %{replyurl} + á %{commenturl} eða sent skilaboð til höfundarins á %{replyurl} message_notification: subject_header: '[OpenStreetMap] %{subject}' hi: Hæ %{to_user}, header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:' - footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og svarað á %{replyurl} + footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og sent skilaboð + til höfundarins á %{replyurl} friendship_notification: hi: Hæ %{to_user}, subject: '[OpenStreetMap] %{user} bætti þér við sem vin' @@ -1428,8 +1641,8 @@ is: about: next: Næsta copyright_html: ©ÃžÃ¡tttakendur í
OpenStreetMap
verkefninu - used_by_html: '%{name} drífur áfram kortagögn á þúsundum vefsíðna, símaforritum - og tækjum' + used_by_html: '%{name} veitir kortagögn á þúsundum vefsíðna, símaforritum og + tækjum' lede_text: OpenStreetMap er byggt upp af heilu samfélagi kortagerðarfólks sem leggur inn og viðheldur gögnum um vegi, stíga, kaffihús, járnbrautir og margt, margt fleira, út um víða veröld. @@ -1499,10 +1712,8 @@ is: sama leyfi. Leyfistextinn útskýrir réttindi þín og skyldur. - intro_3_1_html: |- - Landupplýsingarnar í kortaflísunum okkar, og í hjálparskjölunum, eru - gefnar út með Creative - Commons Attribution-ShareAlike 2.0 notkunarleyfi (CC BY-SA). + intro_3_1_html: "Hjálparskjölin okkar eru gefin út með \nCreative\nCommons + Attribution-ShareAlike 2.0 notkunarleyfi (CC BY-SA 2.0)." credit_title_html: Hvernig á að vísa til OpenStreetMap credit_1_html: |- Við gerum kröfu um að þú notir tilvísunina “© Þátttakendur í @@ -1516,6 +1727,11 @@ is: mögulegir (t.d. prentuðum verkum), stingum við upp á að\nþú beinir lesendum á openstreetmap.org (mögulega að tengja\n'OpenStreetMap' við fullt vistfang þessarar síðu), á opendatacommons.org, og\nef slíkt á við, á creativecommons.org." + credit_3_1_html: "Kortatíglarnir í “staðlaða stílnum” á www.openstreetmap.org + eru \nunnir af OpenStreetMap Foundation með OpenStreetMap-gögnum \nsem bera + Open Database notkunarleyfi. Ef þú ert að nota þessar kortaflísar skaltu + nota \neftirfarandi tilvísun: \n“Grunnkort og gögn frá OpenStreetMap + og OpenStreetMap Foundation”. \\" credit_4_html: |- Á flettanlegum rafrænum landakortum ætti tilvísunin að birtast í horni kortsins. Til dæmis: @@ -1929,6 +2145,7 @@ is: other: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri ferla til að aðrir notendur komist að. edit: + cancel: Hætta við title: Breyti ferlinum %{name} heading: Breyti ferlinum %{name} visibility_help: hvað þýðir þetta? @@ -1946,6 +2163,7 @@ is: uploaded: 'Hlaðið inn:' points: 'Punktar:' start_coordinates: 'Byrjunarhnit:' + coordinates_html: '%{latitude}; %{longitude}' map: kort edit: breyta owner: 'Eigandi:' @@ -2165,8 +2383,6 @@ is: reset_password: title: Lykilorð endurstillt heading: Endurstillti lykilorð fyrir notandann %{user} - password: 'Lykilorð:' - confirm password: 'Staðfestu lykilorð:' reset: Endurstilla lykilorð flash changed: Lykilorðinu þínu hefur verið breytt flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng? @@ -2209,7 +2425,13 @@ is: title: Skilmálar heading: Skilmálar heading_ct: Skilmálar vegna framlags + read and accept with tou: Vinsamlega lestu samkomulag vegna framlaga auk notkunarskilmálanna, + merktu í báða reitina þegar því er lokið og ýttu á hnappinn til að halda áfram. + contributor_terms_explain: Þessir skilmálar eru forsendur fyrir núverandi- jafnt + sem framtíðar-framlögum þínum. read_ct: Ég hef lesið og samþykki ofangreinda skilmála fyrir framlög þátttakenda + tou_explain_html: Þessi %{tou_link} stýra notkuninni á vefsvæðinu ásamt öðrum + stoðkerfum OSMF. Smelltu á tengilinn, lestu síðan og samþykktu textann. read_tou: Ég hef lesið og samþykki notkunarskilmálana consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög mín verði í almenningseigu (Public Domain) @@ -2619,6 +2841,7 @@ is: cycle_map: Hjólakort transport_map: Umferðarkort hot: Hjálparstarf + opnvkarte: ÖPNVKarte layers: header: Lög á korti notes: Minnispunktar á korti @@ -2631,6 +2854,7 @@ is: terms: Skilmálar vefsvæðis og API-kerfisviðmóts thunderforest: Kortatíglar frá Andy Allan + opnvkarte: Kortatíglar frá MeMoMaps hotosm: Stíll kortatígla frá Humanitarian OpenStreetMap teyminu hýst á OpenStreetMap France diff --git a/config/locales/it.yml b/config/locales/it.yml index 827b1af71..c78af8a85 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -174,6 +174,7 @@ it: description: Descrizione languages: Lingue pass_crypt: Password + pass_crypt_confirmation: Conferma password help: trace: tagstring: delimitato da virgola @@ -276,6 +277,12 @@ it: anonymous: anonimo no_comment: (nessun commento) part_of: Parte di + part_of_relations: + one: 1 relazione + other: '%{count} relazioni' + part_of_ways: + one: 1 percorso + other: '%{count} percorsi' download_xml: Scarica XML view_history: Visualizza cronologia view_details: Vedi dettagli @@ -310,6 +317,9 @@ it: title_html: 'Percorso: %{name}' history_title_html: 'Cronologia percorso: %{name}' nodes: Nodi + nodes_count: + one: 1 nodo + other: '%{count} nodi' also_part_of_html: one: parte del percorso %{related_ways} other: parte dei percorsi %{related_ways} @@ -317,6 +327,9 @@ it: title_html: 'Relazione: %{name}' history_title_html: 'Cronologia relazione: %{name}' members: Membri + members_count: + one: 1 membro + other: '%{count} membri' relation_member: entry_role_html: '%{type} %{name} come %{role}' type: @@ -2320,8 +2333,6 @@ it: reset_password: title: Reimposta password heading: Reimposta password per %{user} - password: 'Password:' - confirm password: 'Conferma password:' reset: Reimposta password flash changed: La propria password è stata modificata. flash token bad: Non è stato possibile trovare il codice. Controllare l'indirizzo diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 16a8ebdb1..f994f10d5 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -2009,8 +2009,6 @@ ja: reset_password: title: パスワードの再設定 heading: '%{user} のパスワードのリセット' - password: 'パスワード:' - confirm password: 'パスワードの確認:' reset: パスワードを初期化 flash changed: あなたのパスワードは変更されました。 flash token bad: キーワードが見つかりません。URL を確認してください。 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 70d884ea8..ca78ea724 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -1044,8 +1044,6 @@ ka: heading: დაგავიწყდათ პაროლი? email address: 'ელ. ფოსტის მისამართი:' reset_password: - password: 'პაროლი:' - confirm password: 'პაროლის დადასტურება:' flash changed: თქვენი პაროლი შეიცვალა. new: title: რეგისტრაცია diff --git a/config/locales/kab.yml b/config/locales/kab.yml index a2cfa6c9f..cb209ecc5 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -1266,8 +1266,6 @@ kab: reset_password: title: Ales awennez n wawal uffir heading: Ales awennez n wawal uffir i %{user} - password: 'Awal uffir:' - confirm password: Sentem awal uffir reset: Ales awennez n wawal uffir flash changed: Awal-ik uffir ibeddel. flash token bad: Ajiá¹­un-agi ulac-it, ahat tuccḍa di tansa URL? diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 721c18fb5..ec21c8aed 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -161,6 +161,7 @@ ko: description: 설명 languages: 언어 pass_crypt: 비밀번호 + pass_crypt_confirmation: 비밀번호 확인 help: trace: tagstring: 쉼표로 구분 @@ -2059,8 +2060,6 @@ ko: reset_password: title: 비밀번호 재설정 heading: '%{user}의 비밀번호 재설정' - password: '비밀번호:' - confirm password: 비밀번호 확인 reset: 비밀번호 재설정 flash changed: 비밀번호가 바뀌었습니다. flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까? diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 731230758..23a21a18b 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -30,7 +30,7 @@ ku-Latn: create: Bişîne client_application: create: Qeyd bibe - update: Biguherîne + update: Rojane bike redaction: create: Redaksiyonê çêbike update: Redaksiyonê qeyd bike @@ -83,6 +83,7 @@ ku-Latn: way_tag: Nîşana rê attributes: client_application: + name: Nav (Hewce ye) callback_url: URLya paşve lêgerînê support_url: URLya piştgirîkirinê diary_comment: @@ -99,21 +100,22 @@ ku-Latn: trace: user: Bikarhêner visible: Xuya - name: Nav + name: Navê dosyeyê size: Mezinbûn latitude: Hêlîpan longitude: Hêlîlar public: Giştî description: Danasîn - gpx_file: Dosyeyek GPXê bar bikeː - visibility: Kî dikare bibîneː - tagstring: Etîketên vêː + gpx_file: Dosyeyek GPXê bar bike + visibility: Kî dikare bibîne + tagstring: Etîketên vê message: sender: Şander title: Mijar body: Nivîs recipient: Wergir report: + category: Ji bo rapora xwe sedemekî bibijêre details: Ji kerema xwe di derbarê pirsgirêkê de zêdetir zanyarî bide (pêwist e). user: @@ -123,6 +125,7 @@ ku-Latn: description: Danasîn languages: Ziman pass_crypt: Şîfre + pass_crypt_confirmation: Şîfreyê Bipejirîne help: trace: tagstring: bi bêhnokê veqetandî @@ -434,7 +437,7 @@ ku-Latn: posted_by_html: Ji alî %{link_user} ve di %{created} de bi %{language_link} hatiye nivîsîn comment_link: Vê nivîsê şîrove bike - reply_link: Cewab bide vê nivîsê + reply_link: Peyamekî bişînê nivîserê comment_count: zero: Bêşîrove one: '%{count} şîrove' @@ -616,8 +619,8 @@ ku-Latn: "yes": Pir building: chapel: Dêra biçûk - church: Dêr - hotel: Otel + church: Avahiya Dêrê + hotel: Avahiya Otelê house: Xanî "yes": Bînahî craft: @@ -1230,7 +1233,8 @@ ku-Latn: header: '%{from_user} nivîsa rojane yê OpenStreetMapê a bi mijara %{subject} şirove kir:' footer: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji ser - %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} dikarî cewab bidî. + %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} peyamekî bişîne + nivîserê. message_notification: hi: Merheba %{to_user}, header: '%{from_user} ji te re bi rêya OpenStreetMapê peyamek bi mijara %{subject} @@ -2151,8 +2155,6 @@ ku-Latn: reset_password: title: Şîfreyê nû bike heading: Şîfreyê nû bike ji bo %{user} - password: 'Şîfre:' - confirm password: 'Şîfreyê bipejirîne:' reset: Şîfreyê nû bike flash changed: Şîfreya te hate guhertin. flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 741795ffe..439ae7dde 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -87,6 +87,7 @@ lb: description: Beschreiwung languages: Sproochen pass_crypt: Passwuert + pass_crypt_confirmation: Passwuert confirméieren help: trace: tagstring: Mat Komma getrennt @@ -1131,8 +1132,6 @@ lb: reset_password: title: Passwuert zrécksetzen heading: Passwuert fir %{user} zrécksetzen - password: 'Passwuert:' - confirm password: 'Passwuert confirméieren:' reset: Passwuert zrécksetzen flash changed: Äert Passwuert gouf geännert. new: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index fc7eb7863..4b3deb3e9 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -2099,8 +2099,6 @@ lt: reset_password: title: IÅ¡ naujo nustatyti slaptažodį heading: IÅ¡ naujo nustatyti naudotojo %{user} slaptažodį - password: 'Slaptažodis:' - confirm password: 'Patvirtinti slaptažodį:' reset: IÅ¡ naujo nustatyti slaptažodį flash changed: JÅ«sų slaptažodis sėkmingai pakeistas. flash token bad: Ženklas nerastas, galbÅ«t bloga nuoroda? diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5c92c9a2e..3af01a946 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -74,6 +74,7 @@ lv: relation: Relācija relation_member: Relācijas loceklis relation_tag: Relācijas birka + report: Ziņot session: Sesija trace: Trase tracepoint: Trases punkts @@ -102,15 +103,15 @@ lv: trace: user: Lietotājs visible: Redzams - name: Nosaukums + name: Faila nosaukums size: Izmērs latitude: Platums longitude: Garums public: Publisks description: Apraksts gpx_file: 'AugÅ¡upielādēt GPX failu:' - visibility: 'RedzamÄ«ba:' - tagstring: 'IezÄ«mes:' + visibility: RedzamÄ«ba + tagstring: IezÄ«mes message: sender: SÅ«tÄ«tājs title: Temats @@ -350,6 +351,7 @@ lv: in_language_title: Dienasgrāmatas ieraksti valodā %{language} new: Jauns dienasgrāmatas ieraksts new_title: Izveidot jaunu ierakstu jÅ«su dienasgrāmatā + my_diary: Mana dienasgrāmata no_entries: Dienasgrāmatā nav ierakstu recent_entries: Pēdējie dienasgrāmatas ieraksti older_entries: Vecāki ieraksti @@ -498,6 +500,7 @@ lv: marketplace: Tirgus monastery: Klosteris motorcycle_parking: Motociklu stāvvieta + music_school: MÅ«zikas skola nightclub: Naktsklubs nursing_home: Pansionāts parking: Autostāvvieta @@ -509,6 +512,7 @@ lv: post_office: Pasts prison: Cietums pub: Krogs + public_bath: Publiskā pirts public_building: Sabiedriskā ēka recycling: Pārstrādes punkts restaurant: Restorāns @@ -548,6 +552,8 @@ lv: dormitory: KopmÄ«tnes farm: SaimniecÄ«bas ēka garage: Garāža + garages: Garāžas + hangar: Angārs hospital: SlimnÄ«cas ēka hotel: ViesnÄ«ca house: Māja @@ -556,11 +562,16 @@ lv: public: Sabiedriskā ēka residential: DzÄ«vojamā ēka retail: MazumtirdzniecÄ«bas ēka + roof: Jumts school: Skolas ēka terrace: Terase train_station: Dzelzceļa stacija university: Universitātes ēka + warehouse: Noliktava "yes": Ēka + club: + sport: Sporta klubs + "yes": Klubs craft: brewery: Alus darÄ«tava carpenter: Galdnieks @@ -569,6 +580,8 @@ lv: painter: Krāsotājs photographer: Fotogrāfs plumber: SantehniÄ·is + roofer: JumiÄ·is + sawmill: Kokzāģētava shoemaker: Kurpnieks tailor: Drēbnieks "yes": Amatnieks @@ -615,6 +628,7 @@ lv: tertiary: PaÅ¡valdÄ«bu autoceļi tertiary_link: PaÅ¡valdÄ«bu autoceļš track: Zemesceļš + traffic_mirror: Satiksmes spogulis traffic_signals: Satiksmes regulators trunk: MaÄ£istrālais ceļš trunk_link: MaÄ£istrālais ceļš @@ -694,6 +708,7 @@ lv: miniature_golf: Minigolfs nature_reserve: Dabas rezervāts park: Parks + picnic_table: Piknika galds pitch: Sporta laukums playground: Spēļu laukums recreation_ground: AtpÅ«tas Zona @@ -715,6 +730,7 @@ lv: lighthouse: Bāka mine: Raktuves pipeline: Cauruļvads + snow_cannon: Sniega lielgabals surveillance: NovēroÅ¡ana tower: Tornis watermill: Ūdens dzirnavas @@ -847,6 +863,7 @@ lv: car_repair: Auto remonts carpet: Paklāju veikals charity: LabdarÄ«bas veikals + cheese: Siera veikals chemist: ĶīmiÄ·is clothes: Apģērbu veikals computer: Datorveikals @@ -1892,8 +1909,6 @@ lv: reset_password: title: AtiestatÄ«t paroli heading: Atcelt %{user} paroli - password: 'Parole:' - confirm password: 'Atkārtot paroli:' reset: Atcelt paroli flash changed: JÅ«su parole ir nomainÄ«ta. flash token bad: Neatradu to pilnvaru, varbÅ«t pārbaudi URL? @@ -2354,7 +2369,7 @@ lv: hide: Slēpt resolve: Atrisināt reactivate: Atkal aktivizēt - comment_and_resolve: Komentēt un Atrisināt + comment_and_resolve: Komentēt un atrisināt comment: Komentēt edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied Å¡eit. directions: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index b6f99ac68..62173e114 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -132,6 +132,7 @@ mk: description: Опис languages: Јазици pass_crypt: Лозинка + pass_crypt_confirmation: Потврдете ја лозинката help: trace: tagstring: одделено со запирка @@ -237,6 +238,12 @@ mk: anonymous: анонимен no_comment: (нема коментари) part_of: Дел од + part_of_relations: + one: 1 однос + other: '%{count} односи' + part_of_ways: + one: 1 пат + other: '%{count} патишта' download_xml: Преземи XML view_history: Погл. историја view_details: Погл. подробности @@ -271,6 +278,9 @@ mk: title_html: 'Пат: %{name}' history_title_html: 'Историја на патот: %{name}' nodes: Јазли + nodes_count: + one: 1 јазол + other: '%{count} јазли' also_part_of_html: one: дел од патот %{related_ways} other: дел од патиштата %{related_ways} @@ -278,6 +288,9 @@ mk: title_html: 'Однос: %{name}' history_title_html: 'Историја на односот: %{name}' members: Членови + members_count: + one: 1 член + other: '%{count} члена' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} како %{role}' @@ -2328,8 +2341,6 @@ mk: reset_password: title: Смени лозинка heading: Смени лозинка за %{user} - password: 'Лозинка:' - confirm password: 'Потврдете ја лозинката:' reset: Смени лозинка flash changed: Лозинката ви е сменета. flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата. diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 4511af1aa..1a5c0c1ce 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1227,8 +1227,6 @@ mr: reset_password: title: परवलीचा शब्द पुनर्स्थापित करा heading: '%{user}साठी परवलीचा शब्द पुनर्स्थापित करा' - password: 'परवलीचा शब्द:' - confirm password: 'परवलीचा शब्द पुन्हा लिहा:' reset: परवलीचा शब्द पुनर्स्थापित करा flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे. new: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 1fa61cf93..d7f769608 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1895,8 +1895,6 @@ ms: reset_password: title: Set semula kata laluan heading: Set Semula Kata Laluan untuk %{user} - password: 'Kata laluan:' - confirm password: 'Sahkan Kata Laluan:' reset: Set Semula Kata Laluan flash changed: Kata laluan anda telah ditukar. flash token bad: Token itu tidak dijumpai; sila semak URL-nya. diff --git a/config/locales/my.yml b/config/locales/my.yml index 755764f9e..bae16c56e 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -744,8 +744,6 @@ my: reset_password: title: စကားဝှက်ကို ပြန်ချိန်ရန် heading: '%{user} အတွက် စကားဝှက်ကို ပြန်ချိန်ရန်' - password: 'စကားဝှက်:' - confirm password: 'စကားဝှက်ကို အတည်ပြုပါ:' reset: စကားဝှက်ကို ပြန်ချိန်ရန် flash changed: သင့်စကားဝှက်ကို ပြောင်းလဲပြီးပါပြီ new: diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 4373ee4b1..35b12acaa 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -2130,8 +2130,6 @@ nb: reset_password: title: Nullstill passord heading: Nullstill passord for %{user} - password: 'Passord:' - confirm password: 'Bekreft passord:' reset: Nullstill passord flash changed: Ditt passord er endret. flash token bad: Kunne ikke finne den nøkkelen. Sjekke URLen kanskje? diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 8177d2a28..b01a4e5fd 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1127,8 +1127,6 @@ ne: reset_password: title: प्रवेस शब्द परिवर्तन गर्ने heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने' - password: 'पासवर्ड:' - confirm password: 'प्रवेशशव्द निश्चित गर्ने:' reset: नयाँ प्रवेशशव्द flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ। new: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 49b360dfa..1f711e302 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -2197,8 +2197,6 @@ nl: reset_password: title: Wachtwoord opnieuw instellen heading: Wachtwoord voor %{user} opnieuw instellen - password: 'Wachtwoord:' - confirm password: 'Wachtwoord bevestigen:' reset: Wachtwoord opnieuw instellen flash changed: Uw wachtwoord is gewijzigd. flash token bad: Het token kon niet gevonden worden. Controleer de URL. diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 9bd8bd343..88e6eb80b 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1676,8 +1676,6 @@ nn: reset_password: title: Nullstill passord heading: Nullstill passord for %{user} - password: 'Passord:' - confirm password: 'Stadfest passord:' reset: Nullstill passord flash changed: Passordet ditt er endra. flash token bad: Kunne ikkje finne den nøkkelen. Sjekke URLen kanskje? diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 4dbf5815e..1bde1ae51 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -2007,8 +2007,6 @@ oc: reset_password: title: Reïnicializar lo senhal heading: Reïnicializar lo senhal de %{user} - password: 'Senhal :' - confirm password: 'Confirmatz lo senhal :' reset: Reïnicializar lo senhal flash changed: Vòstre senhal es estat modificat. flash token bad: Avètz pas trobat aqueste geton, avètz verificat l'URL ? diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 3e1763fcc..6601ae66f 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -1039,8 +1039,6 @@ pa: new password button: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ reset_password: title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ - password: 'ਪਛਾਣ-ਸ਼ਬਦ:' - confirm password: 'ਪਛਾਣ ਸ਼ਬਦ ਤਸਦੀਕ ਕਰੋ:' reset: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ flash changed: ਤੁਹਾਡਾ ਪਛਾਣ ਸ਼ਬਦ ਬਦਲਿਆ ਜਾ ਚੁੱਕਾ ਹੈ। new: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 661db067d..59b1209d8 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -182,6 +182,7 @@ pl: description: Opis languages: Języki pass_crypt: Hasło + pass_crypt_confirmation: Potwierdź hasło help: trace: tagstring: rozdzielone przecinkami @@ -309,6 +310,16 @@ pl: anonymous: Anonimowy użytkownik no_comment: (bez komentarza) part_of: Wchodzi w skład + part_of_relations: + one: 1 relacja + few: '%{count} relacje' + many: '%{count} relacji' + other: '%{count} relacji' + part_of_ways: + one: 1 linia + few: '%{count} linie' + many: '%{count} linii' + other: '%{count} linii' download_xml: Pobierz XML view_history: Wyświetl historię view_details: Wyświetl szczegóły @@ -343,6 +354,11 @@ pl: title_html: 'Linia: %{name}' history_title_html: 'Historia linii: %{name}' nodes: Węzły + nodes_count: + one: 1 węzeł + few: '%{count} węzły' + many: '%{count} węzłów' + other: '%{count} węzła' also_part_of_html: one: część linii %{related_ways} other: część linii %{related_ways} @@ -350,6 +366,11 @@ pl: title_html: 'Relacja: %{name}' history_title_html: 'Historia relacji: %{name}' members: Człony relacji + members_count: + one: 1 człon + few: '%{count} człony' + many: '%{count} członów' + other: '%{count} członu' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} jako %{role}' @@ -2400,8 +2421,6 @@ pl: reset_password: title: Wyczyść hasło heading: Czyszczenie hasła użytkownika %{user} - password: Hasło - confirm password: Potwierdź hasło reset: Wyczyść hasło flash changed: Hasło zostało zmienione. flash token bad: Nie znaleziono tokenu, sprawdź URL diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b03f10465..d200e2f8d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -172,6 +172,7 @@ pt-BR: description: Descrição languages: Idiomas pass_crypt: Senha + pass_crypt_confirmation: Confirmar Senha help: trace: tagstring: separados por vírgulas @@ -277,6 +278,12 @@ pt-BR: anonymous: anônimo no_comment: (nenhum comentário) part_of: Parte de + part_of_relations: + one: 1 relação + other: '%{count} relações' + part_of_ways: + one: 1 via + other: '%{count} vias' download_xml: Baixar XML view_history: Ver histórico view_details: Ver detalhes @@ -311,6 +318,9 @@ pt-BR: title_html: 'Linha: %{name}' history_title_html: 'Histórico da linha: %{name}' nodes: Pontos + nodes_count: + one: 1 nó + other: '%{count} nós' also_part_of_html: one: parte da linha %{related_ways} other: parte das linhas %{related_ways} @@ -318,6 +328,9 @@ pt-BR: title_html: 'Relação: %{name}' history_title_html: 'Histórico da relação: %{name}' members: Membros + members_count: + one: 1 membro + other: '%{count} membros' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} como %{role}' @@ -2379,8 +2392,6 @@ pt-BR: reset_password: title: Redefinir senha heading: Redefinir Senha de %{user} - password: 'Senha:' - confirm password: 'Confirmar senha:' reset: Redefinir Senha flash changed: Sua senha foi alterada. flash token bad: O código não confere, verifique a URL. diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 4ebec7644..0d2c98482 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -161,6 +161,7 @@ pt-PT: description: Descrição languages: Idiomas pass_crypt: Palavra-passe + pass_crypt_confirmation: Confirmar palavra-passe help: trace: tagstring: separadas por vírgulas @@ -263,6 +264,12 @@ pt-PT: anonymous: anónimo no_comment: (sem comentário) part_of: Faz parte de + part_of_relations: + one: 1 relação + other: '%{count} relações' + part_of_ways: + one: 1 via + other: '%{count} vias' download_xml: Receber XML view_history: Ver histórico view_details: Ver detalhes @@ -297,6 +304,9 @@ pt-PT: title_html: 'Linha: %{name}' history_title_html: 'Histórico da Linha: %{name}' nodes: Nós + nodes_count: + one: 1 nó + other: '%{count} nós' also_part_of_html: one: parte da linha %{related_ways} other: parte das linhas %{related_ways} @@ -304,6 +314,9 @@ pt-PT: title_html: 'Relação: %{name}' history_title_html: 'Histórico da Relação: %{name}' members: Membros + members_count: + one: 1 membro + other: '%{count} membros' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} como %{role}' @@ -2360,8 +2373,6 @@ pt-PT: reset_password: title: Repor palavra-passe heading: Repor palavra-passe para %{user} - password: 'Palavra-passe:' - confirm password: 'Confirmar palavra-passe:' reset: Repor palavra-passe flash changed: A tua palavra-passe foi alterada. flash token bad: Não encontrámos esse token. Confere o URL, por favor. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 918094e43..6d213ad95 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -2261,8 +2261,6 @@ ro: reset_password: title: Resetare parolă heading: Resetați parola pentru %{user} - password: 'Parola:' - confirm password: 'Confirmați parola:' reset: Resetează parola flash changed: Parola dumneavoastră a fost schimbată. flash token bad: Nu ați găsit acel simbol, verificați adresa URL? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 359c5d29a..4bdb420bc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -164,8 +164,12 @@ ru: url: Url приложения (обязательно) callback_url: Callback URL support_url: URL пользовательской поддержки - allow_write_gpx: Загрузить GPS треки - allow_write_notes: исправить заметки + allow_read_prefs: читать пользовательские настройки + allow_write_prefs: изменять пользовательские настройки + allow_write_api: редактировать карту + allow_read_gpx: читать частные GPS-треки + allow_write_gpx: загружать GPS-треки + allow_write_notes: исправлять заметки diary_comment: body: Текст diary_entry: @@ -203,6 +207,7 @@ ru: description: Описание languages: Языки pass_crypt: Пароль + pass_crypt_confirmation: Подтверждение пароля help: trace: tagstring: через запятую @@ -602,6 +607,7 @@ ru: bench: Скамья bicycle_parking: Велопарковка bicycle_rental: Прокат велосипедов + bicycle_repair_station: Ремонтная станция велосипедов biergarten: Пивная на открытом воздухе boat_rental: Прокат лодок brothel: Бордель @@ -640,7 +646,9 @@ ru: ice_cream: Мороженое internet_cafe: Интернет кафе kindergarten: Детский сад + language_school: Языковая школа library: Библиотека + love_hotel: Отель любви marketplace: Рынок monastery: Монастырь money_transfer: Перевод денег @@ -699,9 +707,12 @@ ru: chapel: Часовня church: Церковь commercial: Офисное здание + construction: Строящееся здание dormitory: Общежитие farm: Ферма garage: Гараж + garages: Гаражи + hangar: Ангар hospital: Здание больницы hotel: Гостиница house: Дом @@ -712,14 +723,17 @@ ru: residential: Жилой дом retail: Здание на продажу roof: Крыша + ruins: Разрушенное здание school: Здание школы shed: Сарай + temple: Здание храма terrace: Ряд жилых домов train_station: Железнодорожный вокзал university: Университет warehouse: Склад "yes": Здание club: + sport: Спортивный клуб "yes": Клуб craft: brewery: Пивоварня @@ -729,6 +743,7 @@ ru: painter: Художник photographer: Фотограф plumber: Сантехник + sawmill: Лесопилка shoemaker: Сапожник tailor: Портной "yes": Мастерская @@ -1031,6 +1046,8 @@ ru: alcohol: Магазин алкоголя antiques: Антиквариат art: Художественный салон + baby_goods: Товары для детей + bag: Магазин сумок bakery: Булочная beauty: Салон красоты beverages: Магазин напитков @@ -1044,8 +1061,11 @@ ru: car_repair: Автомастерская carpet: Ковры charity: Благотворительный магазин + cheese: Сырный магазин chemist: Магазин бытовой химии + chocolate: Шоколад clothes: Магазин одежды + coffee: Кофейный магазин computer: Компьютерный магазин confectionery: Кондитерская convenience: Продовольственный магазин @@ -1056,11 +1076,13 @@ ru: discount: Магазин распродаж doityourself: Сделай сам dry_cleaning: Химчистка + e-cigarette: Магазин электронных сигарет electronics: Магазин электроники erotic: Магазин эротических товаров estate_agent: Агенство недвижимости farm: Магазин фермерских продуктов fashion: Магазин модной одежды + fishing: Рыболовный магазин florist: Цветочный магазин food: Продукты funeral_directors: Похоронное бюро @@ -1072,8 +1094,10 @@ ru: grocery: Продуктовый магазин hairdresser: Парикмахерская hardware: Хозяйственный магазин + health_food: Магазин здоровой пищи hifi: Магазин аудио/видео аппаратуры houseware: Магазин посуды + ice_cream: Магазин мороженного interior_decoration: Оформление интерьера jewelry: Ювелирный магазин kiosk: Киоск @@ -1085,12 +1109,14 @@ ru: mobile_phone: Магазин мобильных телефонов motorcycle: Магазин по продаже мотоциклов music: Музыкальный магазин + musical_instrument: Музыкальные инструменты newsagent: Газетный киоск optician: Оптика organic: Магазин органических продуктов outdoor: Магазин для активного отдыха paint: Лавка художника pawnbroker: Ломбард + perfumery: Парфюмерия pet: Зоомагазин photo: Фотомагазин seafood: Морепродукты @@ -2238,8 +2264,6 @@ ru: reset_password: title: Повторная установка пароля heading: Повторная установка пароля для %{user} - password: 'Пароль:' - confirm password: 'Подтверждение пароля:' reset: Установить пароль flash changed: Ваш пароль был изменён. flash token bad: Невозможно найти такой код подтверждения, проверьте ссылку. diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 3799e2ff7..115a7e3ed 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -1803,8 +1803,6 @@ scn: reset_password: title: Azzera la palora d'òrdini heading: Azziramentu dâ palora d'òrdini di %{user} - password: 'Palora d''òrdini:' - confirm password: 'Cunferma la palora d''òrdini:' reset: Azzera la palora d'òrdini flash changed: La tò palora d'òrdini fu canciata. flash token bad: Stu còdici nun s'attrova, pirchì nun cuntrolli l'URL? diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 49e1b93af..0cd3dee23 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1767,8 +1767,6 @@ sk: reset_password: title: Resetnúť heslo heading: Resetnúť heslo pre %{user} - password: 'Heslo:' - confirm password: 'PotvrdiÅ¥ heslo:' reset: VynulovaÅ¥ heslo flash changed: VaÅ¡e heslo bolo zmenené. flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index acfb597c6..97db76c11 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1803,8 +1803,6 @@ sl: reset_password: title: Ponastavitev gesla heading: Ponastavi geslo za %{user} - password: 'Geslo:' - confirm password: 'Potrdite geslo:' reset: Ponastavitev gesla flash changed: VaÅ¡e geslo je bilo spremenjeno. flash token bad: Tega žetona ni bilo mogoče najti. Predlagamo, da preverite diff --git a/config/locales/sq.yml b/config/locales/sq.yml index f54a4258c..6334330bc 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1377,8 +1377,6 @@ sq: reset_password: title: Rivendos fjalëkalimin heading: Rivendos fjalëkalimin për %{user} - password: 'Fjalëkalimi:' - confirm password: 'Konfirmo fjalëkalimin:' reset: Rivendos fjalëkalimin flash changed: Fjalëkalimi yt është ndryshuar. flash token bad: Nuk e gjet atë shenjë, kontrollo URL-në? diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index d6a86881f..1cf62d02f 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1305,8 +1305,6 @@ sr-Latn: reset_password: title: PoniÅ¡ti lozinku heading: PoniÅ¡tavanje lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrdite lozinku:' reset: PoniÅ¡ti lozinku flash changed: VaÅ¡a lozinka je promenjena. flash token bad: Takav novčić nije pronađen. Proverite adresu. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 66251fc02..0f44adebc 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -2005,8 +2005,6 @@ sr: reset_password: title: Поништи лозинку heading: Поништавање лозинке за %{user} - password: 'Лозинка:' - confirm password: 'Потврдите лозинку:' reset: Поништи лозинку flash changed: Ваша лозинка је промењена. flash token bad: Такав новчић није пронађен. Проверите адресу. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 931fe6dc2..a1278ea3f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -170,6 +170,7 @@ sv: description: Beskrivning languages: SprÃ¥k pass_crypt: Lösenord + pass_crypt_confirmation: Bekräfta lösenord help: trace: tagstring: kommaseparerad @@ -2268,8 +2269,6 @@ sv: reset_password: title: Återställ lösenord heading: Återställ lösenord för %{user} - password: 'Lösenord:' - confirm password: 'Bekräfta lösenord:' reset: Återställ lösenord flash changed: Ditt lösenord har ändrats. flash token bad: Hittade inte den nyckeln, kontrollera webbadressen. diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 4c80d13c9..570691e7a 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -703,8 +703,6 @@ ta: reset_password: title: கடவுச்சொல்லை மீட்டமை heading: ' %{user}க்கு கடவுச்சொல் மீட்டமை' - password: 'கடவுச்சொல்:' - confirm password: 'கடவுச்சொல்லை உறுதிசெய்:' reset: கடவுச்சொல்லை மீட்டமை flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது. new: diff --git a/config/locales/te.yml b/config/locales/te.yml index 520cadb4e..0f2b142f6 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -693,8 +693,6 @@ te: email address: 'ఈమెయిల్ చిరునామా:' notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు. reset_password: - password: 'సంకేతపదం:' - confirm password: 'సంకేతపదాన్ని నిర్ధారించండి:' flash changed: మీ సంకేతపదాన్ని మార్చాం. new: title: నమోదవ్వండి diff --git a/config/locales/th.yml b/config/locales/th.yml index a95e16cf0..5965e2149 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1773,8 +1773,6 @@ th: reset_password: title: ตั้งรหัสผ่านใหม่ heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}' - password: 'รหัสผ่าน:' - confirm password: 'ยืนยันรหัสผ่าน:' reset: ตั้งรหัสผ่านใหม่ flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย new: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 0be3f7d96..316e7e5be 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1575,8 +1575,6 @@ tl: reset_password: title: Muling itakda ang hudyat heading: Muling itakda ang Hudyat para kay %{user} - password: 'Password:' - confirm password: 'Tiyakin ang Hudyat:' reset: Muling Itakda ang Hudyat flash changed: Napalitan na ang hudyat mo. flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL? diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 05dbc897a..436b2caee 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -31,6 +31,7 @@ # Author: Sadrettin # Author: SalihB # Author: Sayginer +# Author: Stonecy # Author: Sucsuzz # Author: Szoszv # Author: Talha Samil Cakir @@ -2250,8 +2251,6 @@ tr: reset_password: title: Parolayı sıfırla heading: '%{user} İçin Parolayı Sıfırlayın' - password: 'Parola:' - confirm password: 'Sifre Onayla:' reset: Parolayı Sıfırla flash changed: Parolanız değiştirildi. flash token bad: Bu simgeyi bulamadıysanız belki de bağlantıyı kontrol etmelisiniz? diff --git a/config/locales/tt.yml b/config/locales/tt.yml index bbdc347fd..4066a240d 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -704,9 +704,6 @@ tt: logout_button: Чыгу lost_password: email address: 'Электрон почта адресы:' - reset_password: - password: 'Серсүз:' - confirm password: 'Серсүзне раслау:' new: email address: 'Электрон почта адресы:' password: 'Серсүз:' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f4a0933cb..082f7899e 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2188,8 +2188,6 @@ uk: reset_password: title: Перевстановлення пароля heading: Перевстановлення паролю для %{user} - password: 'Пароль:' - confirm password: 'Підтвердження пароля:' reset: Перевстановити пароль flash changed: Ваш пароль було змінено. flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index c9b3b1c8b..243b9c5e8 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -26,6 +26,8 @@ vi: friendly: '%e tháng %m năm %Y lúc %H:%M' blog: '%d tháng %m năm %Y' helpers: + file: + prompt: Chọn tập tin submit: diary_comment: create: LÆ°u @@ -140,6 +142,7 @@ vi: description: Miêu tả languages: Ngôn ngữ pass_crypt: Mật khẩu + pass_crypt_confirmation: Xác nhận mật khẩu help: trace: tagstring: dấu phẩy phân cách @@ -242,6 +245,12 @@ vi: anonymous: vô danh no_comment: (không miêu tả) part_of: Trá»±c thuộc + part_of_relations: + one: '%{count} quan hệ' + other: '%{count} quan hệ' + part_of_ways: + one: '%{count} lối' + other: '%{count} lối' download_xml: Tải về XML view_history: Xem Lịch sá»­ view_details: Xem Chi tiết @@ -276,6 +285,8 @@ vi: title_html: 'Lối: %{name}' history_title_html: 'Lịch sá»­ Lối: %{name}' nodes: Các nốt + nodes_count: + other: '%{count} nốt' also_part_of_html: one: trá»±c thuộc lối %{related_ways} other: trá»±c thuộc các lối %{related_ways} @@ -283,6 +294,9 @@ vi: title_html: 'Quan hệ: %{name}' history_title_html: 'Lịch sá»­ Quan hệ: %{name}' members: Thành viên + members_count: + one: '%{count} thành viên' + other: '%{count} thành viên' relation_member: entry_role_html: '%{type} %{name} với vai trò %{role}' type: @@ -520,6 +534,7 @@ vi: runway: Đường băng taxiway: Đường lăn terminal: Nhà ga Sân bay + windsock: Ống gió amenity: animal_shelter: Trạm Bảo vệ Động vật arts_centre: Trung tâm Nghệ thuật @@ -530,7 +545,9 @@ vi: bench: Ghế bicycle_parking: Chỗ Đậu Xe đạp bicycle_rental: Chỗ Mướn Xe đạp + bicycle_repair_station: Trạm sá»­a xe đạp biergarten: Quán rượu Ngoài trời + blood_bank: Ngân hàng máu boat_rental: Cho thuê Tàu brothel: Nhà chứa bureau_de_change: Tiệm Đổi tiền @@ -547,6 +564,7 @@ vi: clock: Đồng hồ college: Trường Cao đẳng community_centre: Trung tâm Cộng đồng + conference_centre: Trung tâm hội nghị courthouse: Tòa crematorium: Lò Hỏa táng dentist: Nha sÄ© @@ -567,10 +585,13 @@ vi: hunting_stand: Ghế Dá»±ng để Săn bắn ice_cream: Tiệm Kem kindergarten: Tiểu học + language_school: TrÆ°Æ¡ng học ngôn ngữ library: ThÆ° viện + love_hotel: Khách sạn tình yêu marketplace: Chợ phiên monastery: Nhà tu motorcycle_parking: Chỗ Đậu Xe máy + music_school: Trường Âm nhạc nightclub: Câu lạc bộ Đêm nursing_home: Viện Dưỡng lão parking: Chỗ Đậu xe @@ -583,6 +604,8 @@ vi: post_office: BÆ°u điện prison: Nhà tù pub: Quán rượu + public_bath: Nhà tắm công cộng + public_bookcase: Tủ sách công cộng public_building: Tòa nhà Công cộng recycling: Trung tâm hoặc Thùng Tái sinh restaurant: Nhà hàng @@ -605,11 +628,14 @@ vi: waste_basket: Thùng rác waste_disposal: Thùng rác water_point: Trạm Đóng Bình Nước uống + weighbridge: Cầu cân xe + "yes": Tiện nghi boundary: administrative: Biên giới Hành chính census: Biên giới Điều tra Dân số national_park: Vườn quốc gia protected_area: Khu bảo tồn + "yes": Biên giới bridge: aqueduct: Cống nước boardwalk: Lối đi có Lót Ván @@ -618,34 +644,53 @@ vi: viaduct: Cầu Cạn "yes": Cầu building: + apartment: Chung cÆ° apartments: Căn hộ + barn: Chuồng + bungalow: Boongalô + cabin: Túp lều chapel: Nhà nguyện church: Nhà thờ + college: Tòa nhà Cao đẳng commercial: Tòa nhà ThÆ°Æ¡ng mại dormitory: Ký túc xá farm: Nông trại garage: Ga ra + garages: Ga ra + greenhouse: Nhà kính + hangar: Nhà Máy bay hospital: Tòa nhà Bệnh viện hotel: Khách sạn house: Nhà ở + hut: Túp lều industrial: Tòa nhà Công nghiệp office: Tòa nhà Văn phòng public: Tòa nhà Công cộng residential: Nhà ở retail: Tòa nhà Cá»­a hàng + roof: Mái che school: Nhà trường + shed: Lán + stable: Ổn định terrace: Thềm train_station: Nhà ga university: Tòa nhà Đại học + warehouse: Nhà kho "yes": Tòa nhà + club: + "yes": Câu lạc bộ craft: + blacksmith: Thợ rèn brewery: Nhà máy Bia carpenter: Thợ Đóng Đồ Gỗ + dressmaker: Thợ may electrician: Thợ Lắp điện gardener: Thợ Làm vườn painter: Thợ SÆ¡n photographer: Nhà Chụp hình plumber: Thợ Sá»­a Ống nước + roofer: Thợ lợp mái + sawmill: Xưởng cÆ°a shoemaker: Thợ Đóng giày tailor: Tiệm May "yes": Doanh nghiệp Thủ công @@ -655,6 +700,7 @@ vi: defibrillator: Máy Khá»­ Rung Tim landing_site: NÆ¡i Hạ cánh Khẩn cấp phone: Điện thoại Khẩn cấp + siren: Còi Báo động water_tank: Bể Chứa Nước Khẩn cấp "yes": Khẩn cấp highway: @@ -756,6 +802,7 @@ vi: quarry: Mỏ Đá railway: Đường sắt recreation_ground: Sân Giải trí + religious: Đất Tôn giáo reservoir: Bể nước reservoir_watershed: LÆ°u vá»±c Hồ Nhân tạo residential: Khu vá»±c Nhà ở @@ -780,6 +827,7 @@ vi: miniature_golf: Golf Nhỏ nature_reserve: Khu Bảo tồn Thiên niên park: Công viên + picnic_table: Bàn ăn Ngoài trời pitch: Sân cỏ playground: Sân chÆ¡i recreation_ground: Sân Giải trí @@ -794,13 +842,17 @@ vi: "yes": Giải trí man_made: adit: Lối vào + advertising: Quảng cáo + antenna: Ăng ten beacon: Đèn hiệu beehive: Tổ ong breakwater: Đê chắn sóng bridge: Cầu bunker_silo: Boong ke chimney: Ống khói + communications_tower: Tháp Viễn thông crane: Cần cẩu + cross: Thánh Giá dolphin: Cột neo đậu dyke: Đê embankment: Đê @@ -809,6 +861,7 @@ vi: groyne: Đê biển kiln: Lò lighthouse: Hải đăng + manhole: Miệng Cống mast: Cột mine: Mỏ mineshaft: Hầm Mỏ @@ -816,9 +869,11 @@ vi: petroleum_well: Giếng dầu pier: Cầu tàu pipeline: Ống dẫn + pumping_station: Trạm BÆ¡m silo: Xi lô storage_tank: Bể chứa surveillance: Giám sát + telescope: Kính Thiên văn tower: Tháp wastewater_plant: Nhà máy Nước thải watermill: Cối xay nước @@ -888,6 +943,9 @@ vi: it: Văn phòng CNTT lawyer: Luật sÆ° ngo: Văn phòng Tổ chức Phi chính phủ + religion: Văn phòng Tôn giáo + research: Văn phòng Nghiên cứu + tax_advisor: Cố vấn Thuế telecommunication: Văn phòng Viễn thông travel_agent: Văn phòng Du lịch "yes": Văn phòng @@ -960,6 +1018,7 @@ vi: carpet: Tiệm Thảm charity: Cá»­a hàng Từ thiện chemist: Tiệm Dược phẩm + chocolate: Sô cô la clothes: Tiệm Quần áo computer: Tiệm Máy tính confectionery: Tiệm Kẹo @@ -988,6 +1047,7 @@ vi: hardware: Tiệm NgÅ© kim hifi: Cá»­a hàng Hi-fi houseware: Cá»­a hàng gia dụng + ice_cream: Tiệm Kem interior_decoration: Trang trí Nội thất jewelry: Tiệm Kim hoàn kiosk: Quán @@ -1004,6 +1064,7 @@ vi: organic: Tiệm Thá»±c phẩm Hữu cÆ¡ outdoor: Tiệm Thể thao Ngoài trời paint: Tiệm SÆ¡n + pastry: Tiệm Bánh ngọt pawnbroker: Tiệm Cầm đồ pet: Tiệm Vật nuôi photo: Tiệm Rá»­a Hình @@ -1895,6 +1956,7 @@ vi: đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng đợi kịp. edit: + cancel: Hủy bỏ title: Sá»­a đổi tuyến đường %{name} heading: Sá»­a đổi tuyến đường %{name} visibility_help: điều này có nghÄ©a là gì? @@ -2127,8 +2189,6 @@ vi: reset_password: title: Đặt lại mật khẩu heading: Đặt lại Mật khẩu của %{user} - password: 'Mật khẩu:' - confirm password: 'Xác nhận Mật khẩu:' reset: Đặt lại Mật khẩu flash changed: Mật khẩu của bạn đã được thay đổi. flash token bad: Không tìm thấy dấu hiệu đó. Có lẽ kiểm tra URL? diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index c8b1b3bf8..06f12b72d 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -18,6 +18,7 @@ # Author: Hydra # Author: Hzy980512 # Author: Impersonator 1 +# Author: Irati # Author: Jienus # Author: Jiwei # Author: Josephine W. @@ -136,7 +137,7 @@ zh-CN: support_url: 支持 URL allow_read_prefs: 读取其用户设置 allow_write_prefs: 修改他们的用户首选项 - allow_write_diary: 创建日记文章、评论与结交朋友。 + allow_write_diary: 创建日记文章、评论并结交朋友。 allow_write_api: 修改地图 allow_read_gpx: 读取他们的私人GPS轨迹 allow_write_gpx: 上传GPS轨迹 @@ -179,6 +180,7 @@ zh-CN: description: 描述 languages: 语言 pass_crypt: 密码 + pass_crypt_confirmation: 确认密码 help: trace: tagstring: 用逗号分隔 @@ -284,6 +286,12 @@ zh-CN: anonymous: 匿名用户 no_comment: (无注释) part_of: 属于 + part_of_relations: + one: 1 relation + other: '%{count} 个关系' + part_of_ways: + one: 1 way + other: '%{count} 条路径' download_xml: 下载 XML view_history: 查看历史 view_details: 查看详情 @@ -317,6 +325,8 @@ zh-CN: title_html: 路径：%{name} history_title_html: 路径历史：%{name} nodes: 节点 + nodes_count: + other: '%{count} 个节点' also_part_of_html: one: 属于路径 %{related_ways} other: 属于路径 %{related_ways} @@ -324,6 +334,9 @@ zh-CN: title_html: 关系：%{name} history_title_html: 关系历史：%{name} members: 成员 + members_count: + one: 1 member + other: '%{count} 位成员' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} 作为%{role}' @@ -662,7 +675,7 @@ zh-CN: administrative: 行政区边界 census: 人口普查边界 national_park: 国家公园 - political: 选举边界 + political: 选区边界 protected_area: 保护区 "yes": 边界 bridge: @@ -2066,8 +2079,6 @@ zh-CN: reset_password: title: 重置密码 heading: 重置%{user}的密码 - password: 密码： - confirm password: 确认密码： reset: 重置密码 flash changed: 您的密码已经更改。 flash token bad: 未找到标记，建议检查 URL? diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 73e8debe6..e73b8d8ed 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -117,8 +117,13 @@ zh-TW: way_tag: 路徑標籤 attributes: client_application: + name: 名稱（必需） + url: 主程式 URL（必需） callback_url: 回呼 (Callback) URL support_url: 支援 URL + allow_read_prefs: 讀取他們的使用者偏好設定 + allow_write_prefs: 修改他們的使用者偏好設定 + allow_write_diary: 建立日記、評論和加入好友 allow_write_api: 修改地圖 allow_read_gpx: 讀取他們的私人 GPS 軌跡 allow_write_gpx: 上傳 GPS 軌跡 @@ -161,6 +166,7 @@ zh-TW: description: 說明 languages: 語言 pass_crypt: 密碼 + pass_crypt_confirmation: 確認密碼 help: trace: tagstring: 以逗點分隔 @@ -265,6 +271,12 @@ zh-TW: anonymous: 匿名 no_comment: (沒有評論) part_of: 屬於： + part_of_relations: + one: 1 個關聯 + other: '%{count} 個關聯' + part_of_ways: + one: 1 條路 + other: '%{count} 條路' download_xml: 下載 XML view_history: 檢視歷史 view_details: 檢視詳細資料 @@ -298,6 +310,8 @@ zh-TW: title_html: 路徑：%{name} history_title_html: 路徑歷史：%{name} nodes: 節點 + nodes_count: + other: '%{count} 個節點' also_part_of_html: one: 路徑 %{related_ways} 的部份 other: 路徑 %{related_ways} 的部份 @@ -305,6 +319,9 @@ zh-TW: title_html: 關聯：%{name} history_title_html: 關聯歷史：%{name} members: 成員 + members_count: + one: 1 個成員 + other: '%{count} 個成員' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} 作為 %{role}' @@ -524,6 +541,7 @@ zh-TW: chair_lift: 升降吊椅 drag_lift: 上山牽引梯 gondola: 小型纜車 + magic_carpet: 滑雪升降機 platter: 纜椅 pylon: 高壓電塔 station: 空中纜車車站 @@ -537,11 +555,15 @@ zh-TW: hangar: 機棚 helipad: 直升機停機坪 holding_position: 等待位置 + navigationaid: 航空導航輔助 parking_position: 停車位置 runway: 跑道 + taxilane: 滑行道 taxiway: 滑行道 terminal: 航廈 + windsock: 布製風標 amenity: + animal_boarding: 動物寄宿 animal_shelter: 動物收容所 arts_centre: 藝術中心 atm: 提款機 @@ -551,7 +573,9 @@ zh-TW: bench: 長椅 bicycle_parking: 自行車停車場 bicycle_rental: 自行車出租 + bicycle_repair_station: 自行車維修站 biergarten: 啤酒庭園 + blood_bank: 血液銀行 boat_rental: 船艇出租 brothel: 妓院 bureau_de_change: 外匯兌換店 @@ -568,6 +592,7 @@ zh-TW: clock: 時鐘 college: 學院 community_centre: 社區中心 + conference_centre: 會議中心 courthouse: 法院 crematorium: 火葬場 dentist: 牙醫 @@ -575,6 +600,7 @@ zh-TW: drinking_water: 飲用水 driving_school: 駕訓班 embassy: 大使館 + events_venue: 活動會場 fast_food: 速食 ferry_terminal: 渡輪碼頭 fire_station: 消防隊 @@ -594,7 +620,9 @@ zh-TW: loading_dock: 卸貨平台 love_hotel: 愛情賓館 marketplace: 市場 + mobile_money_agent: 行動支付代理 monastery: 修道院 + money_transfer: 匯款 motorcycle_parking: 機車停車場 music_school: 音樂學校 nightclub: 夜總會 @@ -602,16 +630,21 @@ zh-TW: parking: 停車場 parking_entrance: 停車場入口 parking_space: 停車位 + payment_terminal: 互動式資訊服務站 pharmacy: 藥房 - place_of_worship: 宗教場所 + place_of_worship: 禮拜場所 police: 警察 post_box: 郵筒 post_office: 郵局 prison: 監獄 pub: 酒館 + public_bath: 公共浴場 + public_bookcase: 公共書櫃 public_building: 公共建築 + ranger_station: 護林員站 recycling: 回收點 restaurant: 餐廳 + sanitary_dump_station: 衛生排污站 school: 學校 shelter: 涼亭 shower: 淋浴 @@ -624,19 +657,27 @@ zh-TW: theatre: 劇院 toilets: 廁所 townhall: 市政廳 + training: 訓練設施 university: 大學 + vehicle_inspection: 車輛檢測 vending_machine: 自動販賣機 veterinary: 獸醫 village_hall: 村政廳 waste_basket: 垃圾桶 waste_disposal: 垃圾子車 + waste_dump_site: 垃圾掩埋場 + watering_place: 集水地點 water_point: 取水點 + weighbridge: 地磅 "yes": 便利設施 boundary: + aboriginal_lands: 原住民土地 administrative: 行政區邊界 census: 人口普查邊界 national_park: 國家公園 + political: 選區分界 protected_area: 保護區 + "yes": 邊界 bridge: aqueduct: 高架水道 boardwalk: 木板走道 @@ -645,37 +686,94 @@ zh-TW: viaduct: 高架橋 "yes": 橋 building: + apartment: 公寓 + apartments: 公寓 barn: 穀倉 bungalow: 平房 cabin: 小木屋 chapel: 禮拜堂 church: 教堂建築 + civic: 城市建築 + college: 學院建物 + commercial: 商業建築 + construction: 在建建築 + detached: 獨立式住宅 + dormitory: 宿舍 + duplex: 複式住宅 + farm: 農舍 + farm_auxiliary: 附屬農舍建築 + garage: 車庫 + garages: 車庫 greenhouse: 溫室 + hangar: 機棚 + hospital: 醫院建築 hotel: 旅館建築 house: 房屋 + houseboat: 船屋 + hut: 小屋 + industrial: 工業建築 + kindergarten: 幼稚園建築 + manufacture: 製造業建築 + office: 辦公建築 + public: 公共建築 + residential: 住宅建築 + retail: 零售建物 roof: 屋頂 + ruins: 已毀損建築 + school: 學校建物 + semidetached_house: 半獨立房 + service: 服務建築 + shed: 舍 + stable: 馬廄 + static_caravan: 旅行拖車 + temple: 廟宇建築 + terrace: 陽台建築 + train_station: 車站建物 + university: 大學建築 + warehouse: 倉庫 "yes": 建築物 club: + scout: 童軍團團部 sport: 體育會 "yes": 俱樂部 craft: + beekeper: 養蜂人家 + blacksmith: 鐵匠 brewery: 釀酒廠 carpenter: 木匠 + caterer: 外燴承辦 + confectionery: 糖果店 + dressmaker: 女裝裁縫 electrician: 電工 + electronics_repair: 電子維修 gardener: 園丁 + glaziery: 玻璃工 + handicraft: 手工藝 + hvac: 暖通空調製作 + metal_construction: 金屬建造 painter: 畫家 photographer: 攝影師 plumber: 管道工 + roofer: 屋頂工 + sawmill: 鋸木廠 shoemaker: 鞋匠 + stonemason: 石工 tailor: 裁縫師 + window_construction: 窗戶建設 winery: 酒廠 "yes": 工藝品店 emergency: + access_point: 進入點 ambulance_station: 急救站 assembly_point: 集合處 defibrillator: 除顫器 + fire_xtinguisher: 滅火器 + fire_water_pond: 消防水塘 landing_site: 緊急降落點 + life_ring: 緊急救生圈 phone: 緊急電話 + siren: 緊急警報器 + suction_point: 緊急吸水點 water_tank: 緊急水箱 "yes": 緊急 highway: @@ -688,6 +786,7 @@ zh-TW: cycleway: 自行車道 elevator: 電梯 emergency_access_point: 緊急聯絡點 + emergency_bay: 緊急臨停空間 footway: 步道 ford: 河床便道 give_way: 讓路標誌 @@ -718,35 +817,45 @@ zh-TW: tertiary: 三級道路 tertiary_link: 地區道路聯絡道 track: 產業道路 + traffic_mirror: 道路反射鏡 traffic_signals: 交通號誌 + trailhead: 小徑入口處 trunk: 快速道路 trunk_link: 快速道路聯絡道 turning_loop: 環形迴車道 unclassified: 無編制道路 "yes": 道路 historic: + aircraft: 歷史飛行機 archaeological_site: 考古遺址 + bomb_crater: 彈坑遺跡 battlefield: 古戰場 boundary_stone: 界石 building: 歷史建築 bunker: 掩體 + cannon: 古砲 castle: 城堡 + charcoal_pile: 歷史木炭堆 church: 教堂 city_gate: 城門 citywalls: 城牆 fort: 堡壘 heritage: 遺蹟 + hollow_way: 低窪道路 house: 房屋 manor: 莊園 memorial: 紀念館 + milestone: 歷史里程碑 mine: 礦場 mine_shaft: 礦井 monument: 古蹟 + railway: 歷史鐵路 roman_road: 羅馬道路 ruins: 廢墟 stone: 石造史蹟 tomb: 墳墓 tower: 塔 + wayside_chapel: 路邊教堂 wayside_cross: 路邊十字架 wayside_shrine: 路邊神龕 wreck: 殘骸 @@ -755,6 +864,7 @@ zh-TW: "yes": 路口 landuse: allotments: 社區農園 + aquaculture: 水產養殖 basin: 盆地 brownfield: 低污染再利用地 cemetery: 墓地 @@ -774,9 +884,11 @@ zh-TW: military: 軍事區 mine: 礦場 orchard: 果園 + plant_nursery: 植物苗圃 quarry: 露天礦場 railway: 鐵路 recreation_ground: 遊樂場 + religious: 宗教場地 reservoir: 蓄水設施 reservoir_watershed: 蓄水設施集水區 residential: 住宅區 @@ -785,9 +897,15 @@ zh-TW: vineyard: 葡萄園 "yes": 土地利用 leisure: + adult_gaming_centre: 成人遊戲中心 + amusement_arcade: 電子遊樂場 + bandstand: 演奏台 beach_resort: 海灘遊樂區 bird_hide: 賞鳥亭 + bleachers: 露天看台 + bowling_alley: 保齡球場 common: 公共用地 + dance: 舞廳 dog_park: 遛狗公園 firepit: 火坑 fishing: 垂釣區 @@ -800,7 +918,9 @@ zh-TW: marina: 小船塢 miniature_golf: 小型高爾夫球場 nature_reserve: 自然保護區 + outdoor_seating: 戶外座椅 park: 公園 + picnic_table: 野餐桌 pitch: 運動場 playground: 遊樂區 recreation_ground: 遊樂場 @@ -815,14 +935,21 @@ zh-TW: "yes": 休閒 man_made: adit: 坑道 + advertising: 廣告 antenna: 天線 + avalanche_protection: 雪崩防護 beacon: 信標台 + beam: 橫樑 beehive: 蜂巢 breakwater: 防波堤 bridge: 橋 bunker_silo: 掩體 + cairn: 石標 chimney: 煙囪 + clearcut: 皆伐區域 + communications_tower: 通訊塔 crane: 起重機 + cross: 十字架 dolphin: 繫船柱 dyke: å ¤ embankment: å ¤ @@ -839,14 +966,20 @@ zh-TW: petroleum_well: 油井 pier: 碼頭 pipeline: 管線 + pumping_station: 泵站 + reservoir_covered: 有蓋蓄水槽 silo: 筒倉 snow_cannon: 雪砲 + snow_fence: 雪欄 storage_tank: 儲油罐 + street_cabinet: 街櫃 surveillance: 監視攝影機 telescope: 望遠鏡 tower: 塔 + utility_pole: 電線桿 wastewater_plant: 污水處理處 watermill: 水車 + water_tap: 水龍頭 water_tower: 水塔 water_well: 牆 water_works: 供水設施 @@ -857,10 +990,13 @@ zh-TW: airfield: 軍用機場 barracks: 軍營 bunker: 掩體 + checkpoint: 檢查站 + trench: 溝渠 "yes": 軍事 mountain_pass: "yes": 埡口 natural: + bare_rock: 裸露岩石 bay: 灣 beach: 海灘 cape: 海角 @@ -904,6 +1040,7 @@ zh-TW: office: accountant: 會計師事務所 administrative: 管理局 + advertising_agency: 廣告代理 architect: 建築師事務所 association: 協會 company: 公司 @@ -917,7 +1054,13 @@ zh-TW: insurance: 保險公司辦公室 it: IT 辦公室 lawyer: 律師 + logistics: 物流辦公處 + newspaper: 報社 ngo: 非政府組織辦公室 + notary: 公證人 + religion: 宗教辦公處 + research: 研究室 + tax_advisor: 稅務顧問 telecommunication: 電信業辦事處 travel_agent: 旅行社 "yes": 辦公室 @@ -937,6 +1080,7 @@ zh-TW: locality: 地區 municipality: 自治市 neighbourhood: 社區 + plot: 地塊 postcode: 郵遞區號 quarter: 住處 region: 區域 @@ -973,12 +1117,17 @@ zh-TW: tram_stop: 路面電車停靠站 yard: 鐵路站場 shop: + agrarian: 農業商品店 alcohol: 酒館 antiques: 古董店 + appliance: 家用電器店 art: 藝品店 + baby_goods: 嬰兒用品 bag: 包包店 bakery: 麵包店 + bathroom_furnishing: 浴室裝潢 beauty: 美容店 + bed: 寢具 beverages: 飲料店 bicycle: 自行車店 bookmaker: 投注處 @@ -1000,7 +1149,9 @@ zh-TW: convenience: 便利商店 copyshop: 複印店 cosmetics: 化妝品店 + craft: 工藝品供應店 curtain: 窗簾店 + dairy: 乳品店 deli: 高級食品店 department_store: 百貨商店 discount: 特價商品店 @@ -1010,20 +1161,25 @@ zh-TW: electronics: 電子材料行 erotic: 情趣用品店 estate_agent: 房地產仲介 + fabric: 布料行 farm: 農場商店 fashion: 時裝店 + fishing: 釣魚用品店 florist: 花店 food: 食品店 frame: 相框店 funeral_directors: 葬儀社 furniture: 傢俱行 garden_centre: 園藝中心 + gas: 加油站 general: 一般商店 gift: 禮品店 greengrocer: 生鮮食品店 grocery: 雜貨店 hairdresser: 理髮店 hardware: 五金行 + health_food: 保健食品店 + hearing_aids: 助聽器 herbalist: 藥草供應商 hifi: 音響店 houseware: 生活用品店 @@ -1037,12 +1193,15 @@ zh-TW: lottery: 樂透 mall: 購物商場 massage: 按摩店 + medical_supply: 醫療用品店 mobile_phone: 行動通訊行 + money_lender: 貸款 motorcycle: 機車行 motorcycle_repair: 機車維修行 music: 唱片行 musical_instrument: 樂器 newsagent: 新聞代理商 + nutrition_supplements: 營養補品 optician: 驗光師 organic: 有機食品店 outdoor: 戶外用品店 @@ -1073,6 +1232,7 @@ zh-TW: variety_store: 雜貨店 video: 影音店 video_games: 電子遊戲專賣店 + wholesale: 批發商 wine: 葡萄酒館 "yes": 商店 tourism: @@ -1082,6 +1242,7 @@ zh-TW: attraction: 景點 bed_and_breakfast: 家庭旅館 cabin: 小木屋 + camp_pitch: 營地 camp_site: 營地 caravan_site: RV 宿營區 chalet: 小木屋 @@ -1095,6 +1256,7 @@ zh-TW: picnic_site: 野餐地 theme_park: 主題公園 viewpoint: 觀景點 + wilderness_hut: 荒野小屋 zoo: 動物園 tunnel: building_passage: 建築物通道 @@ -1267,7 +1429,7 @@ zh-TW: intro_header: 歡迎來到 OpenStreetMap！ intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。 intro_2_create_account: 建立使用者帳號 - hosting_partners_html: 主機由 %{ucl}、%{bytemark}，和其他 %{partners} 所支援。 + hosting_partners_html: 主機由%{ucl}、%{bytemark}，和其他%{partners}所支援。 partners_ucl: 倫敦大學學院 partners_bytemark: Bytemark 主機代管 partners_partners: 合作夥伴 @@ -1455,7 +1617,7 @@ zh-TW: about: next: 下一頁 copyright_html: ©OpenStreetMap
貢獻者 - used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬件提供地圖資料' + used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬體提供地圖資料' lede_text: OpenStreetMap 是由製圖者社群所建立，他們提供及不斷更新包括有關世界各地的道路、路徑、咖啡館、火車站等等的資料。 local_knowledge_title: 地方知識 local_knowledge_html: |- @@ -1465,7 +1627,7 @@ zh-TW: community_driven_title: 社群推動 community_driven_html: |- OpenStreetMap 的社群多元化、懷有熱情，而且日益壯大。我們的貢獻者包括地圖製作愛好者，地理訊息系統的專業人員，提供 OSM 伺服器的工程師，為受災害影響區域製圖的人道主義志願人士，以及其他各界人士。 - 想進一步了解這個社群，請參閱 OpenStreetMap 部落格、使用者日記, + 想進一步了解這個社群，請參閱 OpenStreetMap 部落格、使用者日記、 社群部落格，以及 OSM 基金會 網站。 open_data_title: 開放資料 open_data_html: OpenStreetMap 是開放資料的：您可以自由地使用作任何用途，前提是您須標明作者為 OpenStreetMap @@ -1473,8 +1635,8 @@ zh-TW: legal_title: 法律資訊 legal_1_html: 本站以及許多相關的服務正式由 OpenStreetMap 基金會（OSMF）代表社群所營運。所有使用的 OSMF 運行服務皆符合我們的使用條款、可接受使用方針< - /a>、和隱私政策。 + href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">可接受使用方針、和隱私政策。 legal_2_html: |- 若您有任何授權、版權或其他法律諮詢，請聯絡 OSMF 。
@@ -1732,7 +1894,7 @@ zh-TW: subway: 地下鐵 tram: - 輕軌 - - 輕軌 + - 電車軌道 cable: - 大型纜車 - 升降吊椅 @@ -2067,8 +2229,6 @@ zh-TW: reset_password: title: 重設密碼 heading: 重設 %{user} 的密碼 - password: 密碼： - confirm password: 確認密碼： reset: 重設密碼 flash changed: 您的密碼已經變更。 flash token bad: 找不到該密鑰，可能要檢查一下 URL？ diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb index 7ebe50d7b..5ce30d6a6 100644 --- a/test/controllers/api/users_controller_test.rb +++ b/test/controllers/api/users_controller_test.rb @@ -9,10 +9,18 @@ module Api { :path => "/api/0.6/user/1", :method => :get }, { :controller => "api/users", :action => "show", :id => "1" } ) + assert_routing( + { :path => "/api/0.6/user/1.json", :method => :get }, + { :controller => "api/users", :action => "show", :id => "1", :format => "json" } + ) assert_routing( { :path => "/api/0.6/user/details", :method => :get }, { :controller => "api/users", :action => "details" } ) + assert_routing( + { :path => "/api/0.6/user/details.json", :method => :get }, + { :controller => "api/users", :action => "details", :format => "json" } + ) assert_routing( { :path => "/api/0.6/user/gpx_files", :method => :get }, { :controller => "api/users", :action => "gpx_files" } @@ -21,6 +29,10 @@ module Api { :path => "/api/0.6/users", :method => :get }, { :controller => "api/users", :action => "index" } ) + assert_routing( + { :path => "/api/0.6/users.json", :method => :get }, + { :controller => "api/users", :action => "index", :format => "json" } + ) end def test_show @@ -28,7 +40,7 @@ module Api # check that a visible user is returned properly get api_user_path(:id => user.id) assert_response :success - assert_equal "text/xml", response.media_type + assert_equal "application/xml", response.media_type # check the data that is returned assert_select "description", :count => 1, :text => "test" @@ -69,6 +81,15 @@ module Api # check that a non-existent user is not returned get api_user_path(:id => 0) assert_response :not_found + + # check that a visible user is returned properly in json + get api_user_path(:id => user.id, :format => "json") + assert_response :success + assert_equal "application/json", response.media_type + + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal user.id, js["user"]["id"] end def test_details @@ -84,7 +105,7 @@ module Api auth_header = basic_authorization_header user.email, "test" get user_details_path, :headers => auth_header assert_response :success - assert_equal "text/xml", response.media_type + assert_equal "application/xml", response.media_type # check the data that is returned assert_select "description", :count => 1, :text => "test" @@ -130,16 +151,25 @@ module Api get api_users_path(:users => user1.id) assert_response :success - assert_equal "text/xml", response.media_type + assert_equal "application/xml", response.media_type assert_select "user", :count => 1 do assert_select "user[id='#{user1.id}']", :count => 1 assert_select "user[id='#{user2.id}']", :count => 0 assert_select "user[id='#{user3.id}']", :count => 0 end + # Test json + get api_users_path(:users => user1.id, :format => "json") + assert_response :success + assert_equal "application/json", response.media_type + + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 1, js["users"].count + get api_users_path(:users => user2.id) assert_response :success - assert_equal "text/xml", response.media_type + assert_equal "application/xml", response.media_type assert_select "user", :count => 1 do assert_select "user[id='#{user1.id}']", :count => 0 assert_select "user[id='#{user2.id}']", :count => 1 @@ -148,7 +178,7 @@ module Api get api_users_path(:users => "#{user1.id},#{user3.id}") assert_response :success - assert_equal "text/xml", response.media_type + assert_equal "application/xml", response.media_type assert_select "user", :count => 2 do assert_select "user[id='#{user1.id}']", :count => 1 assert_select "user[id='#{user2.id}']", :count => 0 diff --git a/yarn.lock b/yarn.lock index fb4b5048b..3a68a33fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -215,12 +215,12 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-scope@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" eslint-utils@^2.1.0: @@ -236,9 +236,9 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint@^7.3.1: - version "7.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337" - integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA== + version "7.10.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" + integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.1.3" @@ -248,7 +248,7 @@ eslint@^7.3.1: debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.0" + eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^1.3.0" espree "^7.3.0" @@ -299,14 +299,14 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -316,6 +316,11 @@ estraverse@^5.1.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"