From: Tom Hughes Date: Wed, 17 Jan 2024 18:32:39 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4483' X-Git-Tag: live~1322 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/84c898173778ece298b6bcd6d9839c207a831a86?hp=9c3ab20fbafeb6f69da9b38a5d41c0173038668e Merge remote-tracking branch 'upstream/pull/4483' --- diff --git a/.rubocop.yml b/.rubocop.yml index 1e18afd83..ddfb63cae 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -68,6 +68,9 @@ Rails/SkipsModelValidations: - 'db/migrate/*.rb' - 'app/controllers/users_controller.rb' +Style/ArgumentsForwarding: + Enabled: false + Style/Documentation: Enabled: false diff --git a/Gemfile.lock b/Gemfile.lock index 0135ebb87..96dea6362 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,8 +96,8 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.877.0) - aws-sdk-core (3.190.1) + aws-partitions (1.880.0) + aws-sdk-core (3.190.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -126,7 +126,7 @@ GEM bigdecimal (3.1.5) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.17.0) + bootsnap (1.17.1) msgpack (~> 1.2) bootstrap (5.3.2) autoprefixer-rails (>= 9.1.0) @@ -153,7 +153,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) config (5.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) @@ -289,7 +289,7 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - image_size (3.3.0) + image_size (3.4.0) in_threads (1.6.0) io-console (0.7.1) irb (1.11.1) @@ -333,7 +333,7 @@ GEM mini_portile2 (2.8.5) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) - minitest (5.20.0) + minitest (5.21.1) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) @@ -401,7 +401,7 @@ GEM omniauth (~> 2.0) openstreetmap-deadlock_retry (1.3.1) parallel (1.24.0) - parser (3.3.0.2) + parser (3.3.0.4) ast (~> 2.4.1) racc pg (1.5.4) @@ -485,11 +485,11 @@ GEM rouge (4.2.0) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.59.0) + rubocop (1.60.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 83ab69ee2..c7080595c 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -25,12 +25,6 @@ class Ability can [:index, :show, :data, :georss, :picture, :icon], Trace can [:terms, :new, :create, :save, :suspended, :show, :auth_success, :auth_failure], User can [:index, :show, :blocks_on, :blocks_by], UserBlock - can [:index, :show], Node - can [:index, :show, :full, :ways_for_node], Way - can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation - can [:history, :version], OldNode - can [:history, :version], OldWay - can [:history, :version], OldRelation end if user&.active? diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb index 4876380d0..0eae46f82 100644 --- a/app/abilities/api_ability.rb +++ b/app/abilities/api_ability.rb @@ -5,7 +5,6 @@ class ApiAbility def initialize(user) can :show, :capability - can :index, :change can :index, :map can :show, :permission can :show, :version @@ -22,17 +21,9 @@ class ApiAbility can [:history, :version], OldWay can [:history, :version], OldRelation can [:show], UserBlock - end - - if user&.active? - can :welcome, :site - can [:revoke, :authorize], :oauth - if Settings.status != "database_offline" - can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication - can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message + if user&.active? can [:comment, :close, :reopen], Note - can [:new, :create], Report can [:create, :show, :update, :destroy, :data], Trace can [:details, :gpx_files], User can [:index, :show, :update, :update_all, :destroy], UserPreference diff --git a/app/assets/images/key/cyclemap/beach.png b/app/assets/images/key/cyclemap/beach.png new file mode 100644 index 000000000..256732b6e Binary files /dev/null and b/app/assets/images/key/cyclemap/beach.png differ diff --git a/app/assets/images/key/cyclemap/bicycle_parking.png b/app/assets/images/key/cyclemap/bicycle_parking.png index c900a4495..e5a781d13 100644 Binary files a/app/assets/images/key/cyclemap/bicycle_parking.png and b/app/assets/images/key/cyclemap/bicycle_parking.png differ diff --git a/app/assets/images/key/cyclemap/bicycle_parking_small.svg b/app/assets/images/key/cyclemap/bicycle_parking_small.svg new file mode 100644 index 000000000..753fab746 --- /dev/null +++ b/app/assets/images/key/cyclemap/bicycle_parking_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/images/key/cyclemap/bicycle_rental.png b/app/assets/images/key/cyclemap/bicycle_rental.png new file mode 100644 index 000000000..190e52755 Binary files /dev/null and b/app/assets/images/key/cyclemap/bicycle_rental.png differ diff --git a/app/assets/images/key/cyclemap/bicycle_rental_small.svg b/app/assets/images/key/cyclemap/bicycle_rental_small.svg new file mode 100644 index 000000000..fa0399c16 --- /dev/null +++ b/app/assets/images/key/cyclemap/bicycle_rental_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index e45d28321..706647ef5 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -346,10 +346,6 @@ $(document).ready(function () { }); } }); - - $(".colour-preview-box").each(function () { - $(this).css("background-color", $(this).data("colour")); - }); } page.unload = function () { diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d598d10e3..f0746117d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -645,12 +645,6 @@ tr.turn:hover { tr:last-child th, tr:last-child td { border-bottom: 0; } - - .colour-preview-box { - width: 14px; - height: 14px; - // add color via inline css on element: background-color: ; - } } span.action-button:hover { diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 961be4024..ab13f93be 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -104,11 +104,11 @@ class UsersController < ApplicationController render :action => "new" elsif current_user.auth_provider.present? # Verify external authenticator before moving on - session[:new_user] = current_user.attributes.slice("email", "display_name", "pass_crypt") + session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation") redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect else # Save the user record - session[:new_user] = current_user.attributes.slice("email", "display_name", "pass_crypt") + session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation") redirect_to :action => :terms end end diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index 1bda7dcb7..04d9a6c20 100644 --- a/app/helpers/browse_tags_helper.rb +++ b/app/helpers/browse_tags_helper.rb @@ -34,7 +34,11 @@ module BrowseTagsHelper end safe_join(phones, "; ") elsif colour_value = colour_preview(key, value) - tag.span("", :class => "colour-preview-box float-end m-1 border border-dark border-opacity-10", :"data-colour" => colour_value, :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value + svg = tag.svg :width => 14, :height => 14, :class => "float-end m-1" do + concat tag.title t("browse.tag_details.colour_preview", :colour_value => colour_value) + concat tag.rect :x => 0.5, :y => 0.5, :width => 13, :height => 13, :fill => colour_value, :stroke => "#2222" + end + svg + colour_value else safe_join(value.split(";", -1).map { |x| linkify(h(x)) }, ";") end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 8ca186aad..d1ad60b2c 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -44,11 +44,13 @@ class UserMailer < ApplicationMailer def gpx_success(trace, possible_points) with_recipient_locale trace.user do @to_user = trace.user.display_name + @trace_url = show_trace_url(trace.user, trace) @trace_name = trace.name @trace_points = trace.size @trace_description = trace.description @trace_tags = trace.tags @possible_points = possible_points + @my_traces_url = url_for(:controller => "traces", :action => "mine") mail :to => trace.user.email, :subject => t(".subject") diff --git a/app/models/user.rb b/app/models/user.rb index 5790d81e5..b04f8e2b9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -34,12 +34,13 @@ # # Indexes # -# users_auth_idx (auth_provider,auth_uid) UNIQUE -# users_display_name_idx (display_name) UNIQUE -# users_display_name_lower_idx (lower((display_name)::text)) -# users_email_idx (email) UNIQUE -# users_email_lower_idx (lower((email)::text)) -# users_home_idx (home_tile) +# users_auth_idx (auth_provider,auth_uid) UNIQUE +# users_display_name_canonical_idx (lower(NORMALIZE(display_name, NFKC))) +# users_display_name_idx (display_name) UNIQUE +# users_display_name_lower_idx (lower((display_name)::text)) +# users_email_idx (email) UNIQUE +# users_email_lower_idx (lower((email)::text)) +# users_home_idx (home_tile) # class User < ApplicationRecord @@ -95,7 +96,7 @@ class User < ApplicationRecord validates :display_name, :presence => true, :length => 3..255, :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended] validates :display_name, :if => proc { |u| u.display_name_changed? }, - :uniqueness => { :case_sensitive => false } + :normalized_uniqueness => { :case_sensitive => false } validates :display_name, :if => proc { |u| u.display_name_changed? }, :characters => { :url_safe => true }, :whitespace => { :leading => false, :trailing => false } @@ -119,7 +120,6 @@ class User < ApplicationRecord alias_attribute :created_at, :creation_time - after_initialize :encrypt_password before_save :encrypt_password before_save :update_tile after_save :spam_check @@ -133,7 +133,7 @@ class User < ApplicationRecord user = find_by("email = ? OR display_name = ?", options[:username].strip, options[:username]) if user.nil? - users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username].strip, options[:username]) + users = where("LOWER(email) = LOWER(?) OR LOWER(NORMALIZE(display_name, NFKC)) = LOWER(NORMALIZE(?, NFKC))", options[:username].strip, options[:username]) user = users.first if users.count == 1 end diff --git a/app/validators/normalized_uniqueness_validator.rb b/app/validators/normalized_uniqueness_validator.rb new file mode 100644 index 000000000..eb3600c7b --- /dev/null +++ b/app/validators/normalized_uniqueness_validator.rb @@ -0,0 +1,18 @@ +class NormalizedUniquenessValidator < ActiveModel::EachValidator + def validate_each(record, attribute, value) + relation = if options.fetch(:case_sensitive, true) + record.class.where("NORMALIZE(#{attribute}, NFKC) = NORMALIZE(?, NFKC)", value) + else + record.class.where("LOWER(NORMALIZE(#{attribute}, NFKC)) = LOWER(NORMALIZE(?, NFKC))", value) + end + + relation = relation.where.not(record.class.primary_key => [record.id_in_database]) if record.persisted? + + if relation.exists? + error_options = options.except(:case_sensitive) + error_options[:value] = value + + record.errors.add(attribute, :taken, **error_options) + end + end +end diff --git a/app/views/user_mailer/_gpx_description.html.erb b/app/views/user_mailer/_gpx_description.html.erb index 50fcd6960..85b4c7cae 100644 --- a/app/views/user_mailer/_gpx_description.html.erb +++ b/app/views/user_mailer/_gpx_description.html.erb @@ -1,7 +1,8 @@ <% trace_name = tag.strong(@trace_name) %> +<% trace_name = link_to(trace_name, @trace_url) if @trace_url %> <% trace_description = tag.em(@trace_description) %> <% if @trace_tags.length > 0 %> - <% tags = @trace_tags.map(&:tag).join(" ") %> + <% tags = safe_join @trace_tags.map { |trace_tag| tag.em trace_tag.tag }, ", " %> <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %> <% else %> <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %> diff --git a/app/views/user_mailer/gpx_success.html.erb b/app/views/user_mailer/gpx_success.html.erb index ad60408bd..4354db20a 100644 --- a/app/views/user_mailer/gpx_success.html.erb +++ b/app/views/user_mailer/gpx_success.html.erb @@ -4,3 +4,7 @@ <%= render :partial => "gpx_description" %> <%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>

+ +

+ <%= t ".all_your_traces_html", :url => link_to(@my_traces_url, @my_traces_url) %> +

diff --git a/config/key.yml b/config/key.yml index 1003535eb..a78dbb282 100644 --- a/config/key.yml +++ b/config/key.yml @@ -22,16 +22,16 @@ mapnik: - { min_zoom: 8, name: light_rail, width: 52, height: 1, fill: "#ccc" } - { min_zoom: 10, name: light_rail, width: 52, height: 1, fill: "#aaa" } - { min_zoom: 13, name: light_rail, width: 52, height: 2, fill: "#666" } - - { min_zoom: 12, name: tram_only, width: 52, height: 1, line: "#6e6e6e", line-width: 0.75 } - - { min_zoom: 14, name: tram_only, width: 52, height: 3, line: "#6e6e6e", line-width: 1 } - - { min_zoom: 15, name: tram_only, width: 52, height: 3, line: "#6e6e6e", line-width: 1.5 } - - { min_zoom: 17, name: tram_only, width: 52, height: 2, line: "#6e6e6e", line-width: 2 } + - { min_zoom: 12, name: tram, width: 52, height: 1, line: "#6e6e6e", line-width: 0.75 } + - { min_zoom: 14, name: tram, width: 52, height: 3, line: "#6e6e6e", line-width: 1 } + - { min_zoom: 15, name: tram, width: 52, height: 3, line: "#6e6e6e", line-width: 1.5 } + - { min_zoom: 17, name: tram, width: 52, height: 2, line: "#6e6e6e", line-width: 2 } - { min_zoom: 12, name: [cable_car, chair_lift], image: cable.png } - - { min_zoom: 11, name: [runway_only, taxiway], image: runway11.svg } - - { min_zoom: 12, name: [runway_only, taxiway], image: runway12.svg } - - { min_zoom: 13, name: [runway_only, taxiway], image: runway13.svg } - - { min_zoom: 14, name: [runway_only, taxiway], image: runway14.svg } - - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss + - { min_zoom: 11, name: [runway, taxiway], image: runway11.svg } + - { min_zoom: 12, name: [runway, taxiway], image: runway12.svg } + - { min_zoom: 13, name: [runway, taxiway], image: runway13.svg } + - { min_zoom: 14, name: [runway, taxiway], image: runway14.svg } + - { min_zoom: 11, name: apron, width: 26, height: 10, fill: "#dadae0" } # landcover.mss # administrative boundaries: admin.mss - { name: admin, width: 52, height: 2, fill: "#8d618b88" } # places: placenames.mss @@ -40,18 +40,18 @@ mapnik: - { min_zoom: 4, max_zoom: 5, name: city, image: city4.svg } - { min_zoom: 6, max_zoom: 7, name: city, image: city6.svg } # landcover z5: landcover.mss, water.mss - - { name: [lake_only, reservoir], width: 26, height: 10, fill: "#aad3df" } + - { name: [lake, reservoir], width: 26, height: 10, fill: "#aad3df" } - { name: intermittent_water, image: intermittent_water.svg } - { min_zoom: 5, name: glacier, width: 26, height: 10, fill: "#ddecec", border: "#9cf" } - { min_zoom: 10, name: glacier, width: 26, height: 10, fill: "#ddecec", border: "#9cf", border-dasharray: "4 2" } - { min_zoom: 10, name: reef, image: reef.png } - { min_zoom: 10, name: wetland, image: wetland.png } - - { min_zoom: 5, name: [forest_only, wood], width: 26, height: 10, fill: "#bddab1" } - - { min_zoom: 12, name: [forest_only, wood], width: 26, height: 10, fill: "#add19e" } - - { min_zoom: 5, name: [orchard_only, vineyard], width: 26, height: 10, fill: "#bee5b5" } - - { min_zoom: 12, name: [orchard_only, vineyard], width: 26, height: 10, fill: "#aedfa3" } - - { min_zoom: 5, name: [grass_only, meadow], width: 26, height: 10, fill: "#d7efc0" } - - { min_zoom: 12, name: [grass_only, meadow], width: 26, height: 10, fill: "#cdebb0" } + - { min_zoom: 5, name: [forest, wood], width: 26, height: 10, fill: "#bddab1" } + - { min_zoom: 12, name: [forest, wood], width: 26, height: 10, fill: "#add19e" } + - { min_zoom: 5, name: [orchard, vineyard], width: 26, height: 10, fill: "#bee5b5" } + - { min_zoom: 12, name: [orchard, vineyard], width: 26, height: 10, fill: "#aedfa3" } + - { min_zoom: 5, name: [grass, meadow], width: 26, height: 10, fill: "#d7efc0" } + - { min_zoom: 12, name: [grass, meadow], width: 26, height: 10, fill: "#cdebb0" } - { min_zoom: 5, name: farmland, width: 26, height: 10, fill: "#f1f3dd" } - { min_zoom: 12, name: farmland, width: 26, height: 10, fill: "#eef0d5" } - { min_zoom: 5, name: heathland, width: 26, height: 10, fill: "#dee1b2" } @@ -83,7 +83,7 @@ mapnik: - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" } - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss - { min_zoom: 8, name: military, image: military.svg } - - { min_zoom: 13, name: [school_only, university, hospital], image: school.svg } + - { min_zoom: 13, name: [school, university, hospital], image: school.svg } # buildings: buildings.mss - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" } - { min_zoom: 15, name: building, width: 10, height: 10, fill: "#b9a99c", border: "#a99a8d" } @@ -93,7 +93,7 @@ mapnik: - { min_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" } - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" } # other - - { min_zoom: 11, name: [summit_only, peak], image: summit.svg } # amenity-points.mss + - { min_zoom: 11, name: [summit, peak], image: summit.svg } # amenity-points.mss - { min_zoom: 13, name: tunnel, width: 50, height: 5, casing: grey, casing-dasharray: "4 2", casing-dashoffset: 1 } # roads.mss - { min_zoom: 13, name: bridge, width: 50, height: 5, casing: black } # roads.mss - { min_zoom: 15, name: private, image: private.png } @@ -133,13 +133,25 @@ cyclemap: - { min_zoom: 13, name: footway, width: 50, height: 3, line: "#bd6d6e", line-width: 1.5, line-dasharray: "6 2" } - { min_zoom: 7, name: rail, width: 50, height: 3, line: "#999999", line-width: 1.5 } - { min_zoom: 14, name: rail, width: 50, height: 4, fill: "#999999", line: white, line-dasharray: 4, line-width: 2 } - - { min_zoom: 1, name: [lake_only, reservoir], width: 26, height: 10, fill: "#addeff" } - - { min_zoom: 9, name: [forest_only, wood], width: 26, height: 10, fill: "#b3d6a4" } + - { min_zoom: 1, name: [lake, reservoir], width: 26, height: 10, fill: "#addeff" } + - { min_zoom: 9, name: [forest, wood], width: 26, height: 10, fill: "#b3d6a4" } - { min_zoom: 10, name: meadow, width: 26, height: 10, fill: "#c0de9c" } - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#cbe4c4" } - - { min_zoom: 10, name: common_only, width: 26, height: 10, fill: "#d4f0d1" } + - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#d4f0d1" } + - { min_zoom: 10, name: heathland, width: 26, height: 10, fill: "#eaf0d6" } + - { min_zoom: 11, max_zoom: 13, name: resident, width: 26, height: 10, fill: "#e2e2e2" } + - { min_zoom: 11, name: industrial, width: 26, height: 10, fill: "#f1dede" } + - { min_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d7d7b1" } + - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#abcfb1" } + - { min_zoom: 12, name: pitch, width: 26, height: 10, fill: "#ade0c5" } + - { min_zoom: 13, name: centre, width: 26, height: 10, fill: "#b4e9cd" } + - { min_zoom: 13, name: beach, image: beach.png } + - { min_zoom: 13, name: [school, university], width: 26, height: 10, fill: "#f0f0d8" } - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png } + - { min_zoom: 15, name: bicycle_rental, image: bicycle_rental_small.svg } + - { min_zoom: 17, name: bicycle_rental, image: bicycle_rental.png } - { min_zoom: 15, name: bicycle_parking, image: bicycle_parking.png } + - { min_zoom: 16, name: bicycle_parking_small, image: bicycle_parking_small.svg } - { min_zoom: 16, name: toilets, image: toilets.png } opnvkarte: - { min_zoom: 6, name: rail, width: 52, height: 1, fill: "#868686" } @@ -156,10 +168,10 @@ opnvkarte: - { min_zoom: 12, name: light_rail, width: 52, height: 4, fill: "#66ff66" } - { min_zoom: 14, name: light_rail, width: 52, height: 8, fill: "#66ff66" } - { min_zoom: 16, name: light_rail, width: 52, height: 10, fill: "#66ff66" } - - { min_zoom: 10, name: tram_only, width: 52, height: 3, fill: "#3333fe" } - - { min_zoom: 12, name: tram_only, width: 52, height: 4, fill: "#3333fe" } - - { min_zoom: 14, name: tram_only, width: 52, height: 8, fill: "#3333fe" } - - { min_zoom: 16, name: tram_only, width: 52, height: 10, fill: "#3333fe" } + - { min_zoom: 10, name: tram, width: 52, height: 3, fill: "#3333fe" } + - { min_zoom: 12, name: tram, width: 52, height: 4, fill: "#3333fe" } + - { min_zoom: 14, name: tram, width: 52, height: 8, fill: "#3333fe" } + - { min_zoom: 16, name: tram, width: 52, height: 10, fill: "#3333fe" } - { min_zoom: 10, name: subway, width: 52, height: 3, fill: "#33339f" } - { min_zoom: 12, name: subway, width: 52, height: 4, fill: "#33339f" } - { min_zoom: 14, name: subway, width: 52, height: 8, fill: "#33339f" } @@ -189,9 +201,9 @@ opnvkarte: - { min_zoom: 15, name: main_road, width: 52, height: 13, fill: "#dddddd", casing: "#a1968b" } - { min_zoom: 17, name: main_road, width: 52, height: 17, fill: "#dddddd", casing: "#a1968b" } # landcover - - { min_zoom: 0, name: [lake_only, reservoir], width: 26, height: 10, fill: "#a1cbea" } - - { min_zoom: 8, name: [lake_only, reservoir], width: 26, height: 10, fill: "#bfd3ef" } - - { min_zoom: 4, name: [forest_only, wood], width: 26, height: 10, fill: "#b9c5a3" } + - { min_zoom: 0, name: [lake, reservoir], width: 26, height: 10, fill: "#a1cbea" } + - { min_zoom: 8, name: [lake, reservoir], width: 26, height: 10, fill: "#bfd3ef" } + - { min_zoom: 4, name: [forest, wood], width: 26, height: 10, fill: "#b9c5a3" } - { min_zoom: 4, name: built_up, width: 26, height: 10, fill: "#d8d8d8" } - { min_zoom: 9, name: farmland, width: 26, height: 10, fill: "#eae8d6" } - { min_zoom: 12, name: [park, allotments], width: 26, height: 10, fill: "#c2d89a" } diff --git a/config/locales/af.yml b/config/locales/af.yml index 5337d0813..8e46d6266 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1306,9 +1306,9 @@ af: resolved: Opgelos show: title: '%{status} Probleem #%{issue_id}' - report_created_at: Eerste vermelding op %{datetime} - last_resolved_at: Laas geregmaak op %{datetime} - last_updated_at: Laaste opgedateer op %{datetime} deur %{displayname} + report_created_at_html: Eerste vermelding op %{datetime} + last_resolved_at_html: Laas geregmaak op %{datetime} + last_updated_at_html: Laaste opgedateer op %{datetime} deur %{displayname} resolve: Los op ignore: Ignoreer reopen: Heropen @@ -1721,21 +1721,21 @@ af: subway: Ondergrondse spoorweg cable_car: Sweefspoor chair_lift: stoelhyser - runway_only: Aanloopbaan + runway: Aanloopbaan taxiway: vliegtuigrybaan - apron_only: Lughaweplatform + apron: Lughaweplatform admin: Administratiewe grens - forest_only: Woud + forest: Woud wood: Bos golf: Gholfbaan park: Park - common_only: Gemeen + common: Gemeen resident: Woongebied retail: Kleinhandel-gebied industrial: Nywerheidsgebied commercial: Handelsgebied heathland: Heide - lake_only: Meer + lake: Meer reservoir: reservoir farm: Plaas brownfield: Braakveldterrein @@ -1745,11 +1745,11 @@ af: centre: Sportsentrum reserve: Natuurreservaat military: Militêre gebied - school_only: Skool + school: Skool university: universiteit building: Betekenisvolle gebou station: Spoorwegstasie - summit_only: Piek + summit: Piek peak: piek tunnel: Strepieomhulsel = tonnel bridge: Swart omhulsel = brug diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 6d6053eda..8d6ff74d6 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -914,21 +914,21 @@ aln: subway: Metro cable_car: teleferik chair_lift: heqë karrige - runway_only: Aeroporti i pistës + runway: Aeroporti i pistës taxiway: taxiway - apron_only: aeroportit Aeroporti + apron: aeroportit Aeroporti admin: kufitare administrative - forest_only: Pyll + forest: Pyll wood: Druri golf: fushë e golfit park: Park - common_only: I përbashkët + common: I përbashkët resident: Zonë Rezidenciale retail: zonë me pakicë industrial: Zonë Industriale commercial: Zona Tregtare heathland: Heathland - lake_only: Liqe + lake: Liqe reservoir: rezervuar farm: Ferm brownfield: site Brownfield @@ -938,11 +938,11 @@ aln: centre: Qendër Sportive reserve: rezervë Natyra military: Zonë Ushtarake - school_only: Shkollë + school: Shkollë university: universitet building: ndërtimin e rëndësishme station: Stacion hekurudhor - summit_only: Samiti i + summit: Samiti i peak: pik tunnel: tunel zorrë thye = bridge: Shtresë e jashtme e Zi = urë diff --git a/config/locales/ar.yml b/config/locales/ar.yml index b687bfb5f..ec6693043 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1481,9 +1481,9 @@ ar: few: '%{count} تقرير' many: '%{count} تقارير' other: '%{count} تقرير' - report_created_at: أول بلاغ تم في %{datetime} - last_resolved_at: آخر حل تم في %{datetime} - last_updated_at: آخر تحديث تم في %{datetime} بواسطة %{displayname} + report_created_at_html: أول بلاغ تم في %{datetime} + last_resolved_at_html: آخر حل تم في %{datetime} + last_updated_at_html: آخر تحديث تم في %{datetime} بواسطة %{displayname} resolve: حل ignore: تجاهل reopen: إعادة فتح @@ -2213,21 +2213,21 @@ ar: subway: قطار الأنفاق cable_car: عربة أسلاك chair_lift: تلفريك - runway_only: مدرج مطار + runway: مدرج مطار taxiway: مدرج مطار لمناورات الطائرات - apron_only: ساحة مطار + apron: ساحة مطار admin: حدود إدارية - forest_only: غابة + forest: غابة wood: غابة golf: ملعب غولف park: منتزه - common_only: شائع + common: شائع resident: منطقة سكنية retail: منطقة بيع بالمفرق industrial: منطقة صناعية commercial: منطقة تجارية heathland: أرض بور - lake_only: بحيرة + lake: بحيرة reservoir: خزان farm: مزرعة brownfield: موقع مخلفات @@ -2237,11 +2237,11 @@ ar: centre: مركز رياضي reserve: محمية طبيعية military: منطقة عسكرية - school_only: مدرسة + school: مدرسة university: جامعة building: مبنى كبير station: محطة قطار - summit_only: قمة + summit: قمة peak: ذروة tunnel: غطاء متقطع = نفق bridge: غطاء أسود = جسر diff --git a/config/locales/arz.yml b/config/locales/arz.yml index 2e64be514..26ac7d1cd 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -780,20 +780,20 @@ arz: footway: طريق مشاة rail: سكه حديدية subway: قطار الأنفاق - runway_only: مدرج مطار للإقلاع/الهبوط + runway: مدرج مطار للإقلاع/الهبوط taxiway: مدرج مطار لمناورات الطائرات - apron_only: ساحه مطار + apron: ساحه مطار admin: حدود إدارية - forest_only: غابة + forest: غابة wood: غابة golf: ملعب غولف park: منتزه - common_only: شائع + common: شائع resident: منطقه سكنية retail: منطقه بيع بالمفرق industrial: منطقه صناعية commercial: منطقه تجارية - lake_only: بحيرة + lake: بحيرة reservoir: خزان farm: أرض زراعية cemetery: مقبرة @@ -802,11 +802,11 @@ arz: centre: مركز رياضي reserve: محميه طبيعية military: منطقه عسكرية - school_only: مدرسة + school: مدرسة university: جامعة building: مبنى كبير station: محطه قطار - summit_only: قمة + summit: قمة peak: ذروة private: استخدام خصوصي construction: الطرق تحت الإنشاء diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 2666262ed..199bddf75 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1136,9 +1136,9 @@ ast: zero: Nun hai informes one: 1 informe other: '%{count} informes' - report_created_at: Hora del primer informe %{datetime} - last_resolved_at: Hora de la última resolución %{datetime} - last_updated_at: Hora del últimu anovamientu %{datetime} por %{displayname} + report_created_at_html: Hora del primer informe %{datetime} + last_resolved_at_html: Hora de la última resolución %{datetime} + last_updated_at_html: Hora del últimu anovamientu %{datetime} por %{displayname} resolve: Resolver ignore: Inorar reopen: Reabrir @@ -1708,21 +1708,21 @@ ast: subway: Metro cable_car: Teleféricu chair_lift: telesilla - runway_only: Pista d'aeropuertu + runway: Pista d'aeropuertu taxiway: cai de rodaxe - apron_only: Aparcamientu d'aviones + apron: Aparcamientu d'aviones admin: Llende alministrativa - forest_only: Área forestal + forest: Área forestal wood: Viesca golf: Campu de golf park: Parque - common_only: Espaciu comunal + common: Espaciu comunal resident: Área residencial retail: Área de tiendes industrial: Área industrial commercial: Área comercial heathland: Berezal - lake_only: Llagu + lake: Llagu reservoir: banzáu farm: Casería brownfield: Terrén en derribu @@ -1732,11 +1732,11 @@ ast: centre: Centru deportivu reserve: Reserva natural military: Área militar - school_only: Escuela + school: Escuela university: universidá building: Edificiu destacáu station: Estación de tren - summit_only: Cume + summit: Cume peak: picu tunnel: Borde de rayes = túnel bridge: Borde prietu = ponte diff --git a/config/locales/az.yml b/config/locales/az.yml index a731c37b9..97f9e0f31 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -986,26 +986,26 @@ az: footway: Piyada yolu rail: Dəmir yolu subway: Metro - runway_only: Aeroport uçuş-enmə zolağı + runway: Aeroport uçuş-enmə zolağı admin: Administrativ sərhəd - forest_only: Meşə + forest: Meşə park: Park resident: Yaşayış sahəsi retail: Ticarət sahəsi industrial: Sənaye sahəsi commercial: Ticarət sahəsi - lake_only: Göl + lake: Göl reservoir: su anbarı farm: Ferma cemetery: Məzarlıq centre: Ä°dman mərkəzi reserve: Təbiət Qoruğu military: Hərbi ərazi - school_only: Məktəb + school: Məktəb university: universitet building: Əhəmiyyətli bina station: Dəmiryol stansiyası - summit_only: Zirvə + summit: Zirvə peak: pik private: Xüsusi giriş traces: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 5f47c628d..16cd8d624 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1171,21 +1171,21 @@ be-Tarask: subway: Мэтро cable_car: Канатная дарога chair_lift: крэславы пад’ёмнік - runway_only: Узьлётная паласа + runway: Узьлётная паласа taxiway: рулёжная дарога - apron_only: Пэрон аэрапорта + apron: Пэрон аэрапорта admin: Адміністрацыйная мяжа - forest_only: Лес + forest: Лес wood: Пушча golf: Поле для гольфу park: Парк - common_only: Грамадзкая зямля + common: Грамадзкая зямля resident: Жылы раён retail: Гандлёвы раён industrial: Прамысловы раён commercial: Камэрцыйны раён heathland: Пусташ - lake_only: Возера + lake: Возера reservoir: вадасховішча farm: Фэрма brownfield: Закінутая тэрыторыя @@ -1195,11 +1195,11 @@ be-Tarask: centre: Спартовы цэнтар reserve: Запаведнік military: Вайсковая тэрыторыя - school_only: Школа + school: Школа university: унівэрсытэт building: Значны будынак station: Чыгуначная станцыя - summit_only: Вяршыня + summit: Вяршыня peak: пік tunnel: Пункцір = тунэль bridge: Чорная лінія = мост diff --git a/config/locales/be.yml b/config/locales/be.yml index 036146588..ad37e3ec3 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1155,9 +1155,9 @@ be: zero: Няма паведамленняў one: 1 паведамленне other: '%{count} паведамленняў' - report_created_at: Упершыню паведамлена %{datetime} - last_resolved_at: Апошні раз вырашана %{datetime} - last_updated_at: Апошняе абнаўленне %{datetime} карыстальнікам %{displayname} + report_created_at_html: Упершыню паведамлена %{datetime} + last_resolved_at_html: Апошні раз вырашана %{datetime} + last_updated_at_html: Апошняе абнаўленне %{datetime} карыстальнікам %{displayname} resolve: Вырашыць ignore: Ігнараваць reopen: Пераадчыніць @@ -1726,21 +1726,21 @@ be: bus: Аўтобус cable_car: Канатная дарога chair_lift: Крэсельны пад'ёмнік - runway_only: Узлетна-пасадачная паласа + runway: Узлетна-пасадачная паласа taxiway: рулёжная дарожка - apron_only: Перон аэрапорта + apron: Перон аэрапорта admin: Адміністрацыйная мяжа - forest_only: Лес + forest: Лес wood: пушча golf: Поле для гольфа park: Парк - common_only: Агульныя + common: Агульныя resident: Жылы раён retail: Гандлевая плошча industrial: Прамысловая зона commercial: Камерцыйная зона heathland: Пустка - lake_only: Возера + lake: Возера reservoir: вадасховішча glacier: Ляднік farm: Ферма @@ -1751,11 +1751,11 @@ be: centre: Спартыўны цэнтр reserve: Запаведнік military: Ваенная зона - school_only: Школа + school: Школа university: універсітэт building: Значны будынак station: Чыгуначны вакзал - summit_only: Вяршыня + summit: Вяршыня peak: пік tunnel: Тунэль (пункцірам) bridge: Мост (суцэльная лінія) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 93f85a4d3..ff1229ca8 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1133,9 +1133,9 @@ bg: reports: one: '%{count} доклад' other: '%{count} доклада' - report_created_at: Първоначално докладван на %{datetime} - last_resolved_at: Последно решена на %{datetime} - last_updated_at: Последно актуализиран на %{datetime} от %{displayname} + report_created_at_html: Първоначално докладван на %{datetime} + last_resolved_at_html: Последно решена на %{datetime} + last_updated_at_html: Последно актуализиран на %{datetime} от %{displayname} resolve: Решаване ignore: Пропусни reopen: Отново отвори @@ -1667,21 +1667,21 @@ bg: subway: Метро cable_car: Кабинков лифт chair_lift: седалков лифт - runway_only: Летищна писта + runway: Летищна писта taxiway: път за рулиране - apron_only: Летищен перон + apron: Летищен перон admin: Административна граница - forest_only: Гора + forest: Гора wood: Дървета golf: Игрище за голф park: Парк - common_only: Обща + common: Обща resident: Жилищна зона retail: Търговска зона industrial: Промишлена зона commercial: Търговска зона heathland: Пустош - lake_only: Езеро + lake: Езеро reservoir: язовир farm: Ферма brownfield: Място за строеж @@ -1691,11 +1691,11 @@ bg: centre: Спортен център reserve: Природен резерват military: Военна зона - school_only: Училище + school: Училище university: Университет building: Значима сграда station: Железопътна гара - summit_only: Било + summit: Било peak: връх tunnel: Тунел (пунктирана линия) bridge: Мост (плътна линия) diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 60e89546f..8217c7ad2 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -7,6 +7,7 @@ # Author: Anupamdutta73 # Author: Bellayet # Author: Bodhisattwa +# Author: Borhan # Author: Ehsanulhb # Author: Elias Ahmmad # Author: Greatder @@ -1741,31 +1742,31 @@ bn: train: রেলগাড়ি subway: ভূগর্ভস্থ পথ ferry: ফেরি - tram_only: ট্রাম + tram: ট্রাম bus: বাস cable_car: ক্যাবল কার admin: প্রশাসনিক সীমানা - orchard_only: ফলবাগিচা + orchard: ফলবাগিচা vineyard: আঙুর খেত - forest_only: অরণ্য + forest: অরণ্য wood: কাঠ farmland: কৃষিজমি meadow: তৃণভূমি sand: বালু golf: গল্ফ মাঠ park: উদ্যান - common_only: সাধারণ + common: সাধারণ resident: আবাসিক এলাকা industrial: শিল্পাঞ্চল commercial: বাণিজ্যিক এলাকা - lake_only: হ্রদ + lake: হ্রদ reservoir: জলাধার glacier: হিমবাহ farm: খামার cemetery: কবরস্থান centre: ক্রীড়া কেন্দ্র military: সামরিক এলাকা - school_only: বিদ্যালয় + school: বিদ্যালয় university: বিশ্ববিদ্যালয় hospital: হাসপাতাল station: রেল স্টেশন @@ -2034,6 +2035,8 @@ bn: revoke: revoke: প্রত্যাহার! flash: এই অবরোধ প্রত্যাহার করা হয়েছে। + revoke_all: + revoke: প্রত্যাহার! helper: block_duration: hours: diff --git a/config/locales/br.yml b/config/locales/br.yml index b731ed532..6292a37ec 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -62,7 +62,7 @@ br: attributes: subject: format: '%{message}' - is_already_muted: a zo tavet dija + is_already_muted: a zo bet kuzhet dija models: acl: Listenn kontroll moned changeset: Hollad cheñchamantoù @@ -1485,9 +1485,9 @@ br: many: '%{count} danevell' other: '%{count} danevell' no_reports: Danevell ebet - report_created_at: Disklêriet evit ar wech kentañ %{datetime} - last_resolved_at: Diskêriadur diwezhañ d'an %{datetime} - last_updated_at: Diskêriadur diwezhañ d'an %{datetime} gant %{displayname} + report_created_at_html: Disklêriet evit ar wech kentañ %{datetime} + last_resolved_at_html: Diskêriadur diwezhañ d'an %{datetime} + last_updated_at_html: Diskêriadur diwezhañ d'an %{datetime} gant %{displayname} resolve: Diskoulmañ ignore: Lezel a-gostez reopen: Addigeriñ @@ -1803,7 +1803,7 @@ br: a darempred gant darn eus an %{people_mapping_nearby_link}? people_mapping_nearby: tud o kartennañ en ardremez muted: - title: Kemennadennoù tavet + title: Kemennadennoù kuzhet reply: wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h respont outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh @@ -1822,7 +1822,7 @@ br: heading: my_inbox: Ma boest resev my_outbox: Ma boest kas - muted_messages: Kemennadennoù tavet + muted_messages: Kemennadennoù kuzhet mark: as_read: Kemennadenn merket evel lennet as_unread: Merkañ evel anlennet @@ -2248,29 +2248,29 @@ br: subway: Linenn vetro ferry: Karrlistri light_rail: Metro skañv - tram_only: Tramgarr + tram: Tramgarr trolleybus: Trollebus bus: Karr-boutin cable_car: Teleferik chair_lift: Fungador - runway_only: Roudenn evit an taksioù + runway: Roudenn evit an taksioù taxiway: Hent evit an taksioù - apron_only: Roudenn aerborzh + apron: Roudenn aerborzh admin: Bevenn velestradurel capital: Kêr-benn city: Kêr - orchard_only: Gwerje + orchard: Gwerje vineyard: Gwinieg - forest_only: Koad + forest: Koad wood: Koad farmland: Tachenn labour-douar - grass_only: Geot + grass: Geot meadow: Prad bare_rock: Roc'h noazh sand: Traezh golf: Tachenn golf park: Park - common_only: prad + common: prad built_up: Takad savet resident: Takad annez retail: Takad kenwerzh @@ -2278,7 +2278,7 @@ br: commercial: Takad kenwerzhel heathland: Lanneier scrubland: Strouezheg - lake_only: Lenn + lake: Lenn reservoir: Mirlenn glacier: Skorneg reef: Karreg @@ -2291,12 +2291,12 @@ br: centre: Kreizenn sport reserve: Gwarezva natur military: Takad milourel - school_only: Skol + school: Skol university: Skol-veur hospital: Ospital building: Savadur pouezus station: Porzh-houarn - summit_only: Lein + summit: Lein peak: Pikern tunnel: Bord poentoùigoù = riboul bridge: Bord du = pont @@ -2489,7 +2489,7 @@ br: oauth1_settings: Arventennoù OAuth 1 oauth2_applications: Arloadoù OAuth 2 oauth2_authorizations: Aotreoù OAuth 2 - muted_users: Implijerien tavet + muted_users: Implijerien kuzhet oauth: authorize: title: Aotren mont d'ho kont @@ -2677,7 +2677,7 @@ br: my_dashboard: Ma zaolenn-vourzh blocks on me: Stankadurioù evidon blocks by me: stankadurioù graet ganin - create_mute: Tevel an implijer-mañ + create_mute: Kuzhat an implijer-mañ edit_profile: Aozañ ar profil send message: Kas ur gemennadenn diary: deizlevr @@ -2896,17 +2896,25 @@ br: previous: ↓« Kent user_mutes: index: - title: Implijerien tavet - my_muted_users: Ma implijerien tavet + title: Implijerien kuzhet + my_muted_users: Ma implijerien kuzhet + you_have_muted_n_users: + one: Kuzhet ho peus %{count} implijer·ez + two: Kuzhet ho peus %{count} implijer·ez + few: Kuzhet ho peus %{count} implijer·ez + many: Kuzhet ho peus %{count} implijer·ez + other: Kuzhet ho peus %{count} implijer·ez + user_mute_explainer: Kemennadennoù an implijerien kuzhet a zo kaset d'ur voest-resev + disheñvel ha n'ho po kemenn ebet a-zivout o fosteloù. table: thead: - muted_user: Implijer/ez tavet + muted_user: Implijer·ez kuzhet actions: Oberoù tbody: send_message: Kas ur gemennadenn create: - notice: Tavet ho peus %{name}. - error: Ne c'haller ket tevel %{name}. %{full_message}. + notice: Kuzhet ho peus %{name}. + error: Ne c'haller ket kuzhat %{name}. %{full_message}. notes: index: title: Notennoù kaset pe addispleget gant %{user} diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 067a8008f..bf3d2e0a4 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1198,21 +1198,21 @@ bs: subway: Podzemna željeznica cable_car: Kabinska žičara chair_lift: Uspinjača sa naslonjačem - runway_only: Aerodromska pista + runway: Aerodromska pista taxiway: Aerodromska rulna staza - apron_only: Parking za avione + apron: Parking za avione admin: Administrativna granica - forest_only: Å ume (održavane, od Å¡umarije) + forest: Å ume (održavane, od Å¡umarije) wood: Å ume (prirodne, neodržavane) golf: Golf teren park: Park - common_only: Travnjaci + common: Travnjaci resident: Stambeno područje retail: Maloprodajno područje industrial: Industrijsko područje commercial: Poslovno područje heathland: Stepa - lake_only: Jezero + lake: Jezero reservoir: Rezervoar farm: Polja, farme, njive brownfield: GradiliÅ¡te @@ -1222,11 +1222,11 @@ bs: centre: Sportski centar reserve: Rezervat prirode military: Vojno područje - school_only: Å kola + school: Å kola university: Univerzitet building: Značajna zgrada station: Željeznička stanica - summit_only: Vrh + summit: Vrh peak: Kota tunnel: Iscrtkani rubovi = tunel bridge: Crni rubovi = most diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5d20fa897..9588360d3 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1474,9 +1474,9 @@ ca: one: '%{count} informe' other: '%{count} informes' no_reports: Cap informe - report_created_at: Denunciat per primer cop a %{datetime} - last_resolved_at: Resolt per darrer cop a %{datetime} - last_updated_at: Actualitzat per darrer cop a %{datetime} per %{displayname} + report_created_at_html: Denunciat per primer cop a %{datetime} + last_resolved_at_html: Resolt per darrer cop a %{datetime} + last_updated_at_html: Actualitzat per darrer cop a %{datetime} per %{displayname} resolve: Resol ignore: Ignora reopen: Torna a obrir @@ -2304,27 +2304,27 @@ ca: subway: Metro ferry: Ferri light_rail: Ferrocarril lleuger - tram_only: Tramvia + tram: Tramvia trolleybus: Troleibús bus: Autobús cable_car: Telefèric chair_lift: Telecadira - runway_only: Pista d'aeroport + runway: Pista d'aeroport taxiway: Carrer de rodatge - apron_only: Estacionament d'avions + apron: Estacionament d'avions admin: Límit administratiu - orchard_only: Hort + orchard: Hort vineyard: Vinya - forest_only: Bosc + forest: Bosc wood: Arbreda farmland: Terra de conreu - grass_only: Gespa + grass: Gespa meadow: Prada bare_rock: Roca pelada sand: Sorra golf: Camp de golf park: Parc - common_only: Àrea comunal + common: Àrea comunal built_up: Zona edificada resident: Zona residencial retail: Àrea comercial @@ -2332,7 +2332,7 @@ ca: commercial: Zona comercial heathland: Bruguerar scrubland: Matolls - lake_only: Llac + lake: Llac reservoir: Embassament intermittent_water: Cos d'aigua intermitent glacier: Glacera @@ -2346,12 +2346,12 @@ ca: centre: Centre esportiu reserve: Reserva natural military: Àrea militar - school_only: Escola - Institut + school: Escola - Institut university: Universitat hospital: Hospital building: Edifici significatiu station: Estació de tren - summit_only: Cim + summit: Cim peak: Cim tunnel: Línia discontínua = túnel bridge: Línia negra = pont diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 044cac058..40f2bc433 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1542,9 +1542,9 @@ cs: many: '%{count} hlášení' other: '%{count} hlášení' no_reports: Žádná hlášení - report_created_at: První hlášení v %{datetime} - last_resolved_at: Naposledy vyřeÅ¡eno v %{datetime} - last_updated_at: Poslední aktualizace v %{datetime} od %{displayname} + report_created_at_html: První hlášení v %{datetime} + last_resolved_at_html: Naposledy vyřeÅ¡eno v %{datetime} + last_updated_at_html: Poslední aktualizace v %{datetime} od %{displayname} resolve: VyřeÅ¡it ignore: Ignorovat reopen: Znovu otevřít @@ -2395,21 +2395,21 @@ cs: subway: Metro cable_car: Lanovka chair_lift: sedačková lanovka - runway_only: Vzletová a přistávací dráha + runway: Vzletová a přistávací dráha taxiway: pojezdová dráha - apron_only: LetiÅ¡tní odbavovací plocha + apron: LetiÅ¡tní odbavovací plocha admin: Administrativní hranice - forest_only: Les + forest: Les wood: Les golf: Golfové hřiÅ¡tě park: Park - common_only: Pastvina + common: Pastvina resident: Obytná oblast retail: Nákupní oblast industrial: Průmyslová oblast commercial: Kancelářská oblast heathland: VřesoviÅ¡tě - lake_only: Jezero + lake: Jezero reservoir: nádrž farm: Farma brownfield: ZbořeniÅ¡tě @@ -2419,11 +2419,11 @@ cs: centre: Sportovní centrum reserve: Přírodní rezervace military: Vojenský prostor - school_only: Å kola + school: Å kola university: univerzita building: Významná budova station: Nádraží - summit_only: Vrchol + summit: Vrchol peak: hora tunnel: Čárkované obrysy = tunel bridge: Černé obrysy = most diff --git a/config/locales/cy.yml b/config/locales/cy.yml index a6f1440e5..f3b5fa772 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -44,6 +44,11 @@ cy: messages: invalid_email_address: nid yw'n ymddangos ei fod yn gyfeiriad e-bost dilys email_address_not_routable: nid yw'n gyrchadwy + models: + user_mute: + attributes: + subject: + format: '%{message}' models: acl: Rhestr Rheoli Mynediad changeset: Grŵp newid @@ -819,11 +824,15 @@ cy: college: Adeilad Coleg commercial: Adeilad Masnachol construction: Adeilad yn cael ei Adeiladu + detached: TÅ· Datgysylltiedig dormitory: Dorm + duplex: TÅ· Deublyg farm: Ffermdy + farm_auxiliary: TÅ· Fferm Ategol garage: Garej garages: Garejis greenhouse: TÅ· Gwydr + hangar: Hangar hospital: Adeilad Ysbyty hotel: Adeilad Gwesty house: TÅ· @@ -831,11 +840,13 @@ cy: hut: Cwt industrial: Adeilad Diwydiannol kindergarten: Adeilad Meithrinfa + manufacture: Adeilad Gweithgynhyrchu office: Adeilad Swyddfa public: Adeilad Cyhoeddus residential: Adeilad Preswyl retail: Adeilad Adwerthu roof: To + ruins: Adeilad Adfeiliedig school: Adeilad Ysgol shed: Sied stable: Stabl @@ -1387,14 +1398,16 @@ cy: many: '%{count} adroddiad' other: '%{count} adroddiad' no_reports: Dim adroddiadau - report_created_at: Adroddwyd gyntaf am %{datetime} - last_resolved_at: Datryswyd ddiwethaf am %{datetime} - last_updated_at: Diweddarwyd ddiwethaf am %{datetime} gan %{displayname} + report_created_at_html: Adroddwyd gyntaf am %{datetime} + last_resolved_at_html: Datryswyd ddiwethaf am %{datetime} + last_updated_at_html: Diweddarwyd ddiwethaf am %{datetime} gan %{displayname} resolve: Datrys ignore: Anwybyddu reopen: Ailagor read_reports: Darllen Adroddiadau new_reports: Adroddiadau Newydd + comments: + comment_from_html: Sylw gan %{user_link} ar %{comment_created_at} reports: reported_by_html: Adroddwyd fel %{category} gan %{user} ar %{updated_at} helper: @@ -1524,12 +1537,15 @@ cy: hi: Helo %{to_user}, greeting: Helo, commented: + subject_own: '[OpenStreetMap] Gwnaeth %{commenter} sylw ar un o''ch grwpiau + newid' partial_changeset_with_comment: gyda sylw '%{changeset_comment}' partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}' partial_changeset_without_comment: dim sylw confirmations: confirm: heading: Gwiriwch eich e-byst! + introduction_1: Rydym wedi anfon e-bost cadarnhau atoch. button: Cadarnhau click_here: cliciwch yma confirm_resend: @@ -1563,11 +1579,13 @@ cy: to: I subject: Pwnc date: Dyddiad + actions: Gweithredoedd message_summary: unread_button: Marcio fel heb ei ddarllen read_button: Marcio fel wedi'i ddarllen reply_button: Ateb destroy_button: Dileu + unmute_button: Symud i'r Mewnflwch new: title: Anfon neges send_message_to_html: Anfon neges newydd at %{name} @@ -1582,6 +1600,7 @@ cy: body: Sori, nid oes neges gyda'r id yno. outbox: title: Blwch Allan + actions: Gweithredoedd messages: one: Mae gennych %{count} neges wedi ei anfon other: Mae gennych %{count} neges wedi eu hanfon @@ -1710,6 +1729,7 @@ cy: image: Delwedd alt: Testun amgen url: URL + codeblock: Bloc cod richtext_field: edit: Golygu preview: Rhagolwg @@ -1924,25 +1944,45 @@ cy: cycleway_local: Llwybr beiciau lleol footway: Troedffordd rail: Rheilffordd + train: Trên subway: Trenau tanddaear + ferry: Fferi + light_rail: Rheilffordd ysgafn + tram: Tram + trolleybus: Bws Drydan + bus: Bws cable_car: Car cebl - chair_lift: lifft cadair - runway_only: Llwybr glanio - taxiway: thacsiffordd maes awyr - apron_only: Llain + chair_lift: Cadair godi + runway: Llwybr glanio + taxiway: Tacsiffordd + apron: Llain admin: Ffin gweinyddol - forest_only: Coedwig + capital: Prifddinas + city: Dinas + orchard: Perllan + vineyard: Gwinllan + forest: Coedwig wood: Coedlan + farmland: Tir Ffermio + grass: Gwair + meadow: Gwaun + bare_rock: Carreg Plaen + sand: Tywod golf: Maes golff park: Parc - common_only: Comin + common: Comin + built_up: Ardal Adeiledig resident: Ardal breswyl retail: Ardal adwerthu industrial: Ardal ddiwydiannol commercial: Ardal fasnachol heathland: Rhos - lake_only: Llyn - reservoir: chronfa ddŵr + scrubland: Prysgoed + lake: Llyn + reservoir: Cronfa Ddŵr + glacier: Rhewlif + reef: Riff + wetland: Gwlyptir farm: Fferm brownfield: Safle tir llwyd cemetery: Mynwent @@ -1951,17 +1991,20 @@ cy: centre: Canolfan chwaraeon reserve: Gwarchodfa natur military: Ardal filwrol - school_only: Ysgol - university: phrifysgol + school: Ysgol + university: Prifysgol + hospital: Ysbyty building: Adeilad arwyddocâol station: Gorsaf drên - summit_only: Copa - peak: chrib + summit: Copa + peak: Copa tunnel: Border toredig = twnnel bridge: Border du = pont private: Mynediad preifat destination: Mynediad cyrchfan construction: Ffyrdd yn cael eu hadeiladu + bus_stop: Safle Bws + stop: Safle bicycle_shop: Siop feiciau bicycle_parking: Man parcio beiciau toilets: Toiledau @@ -2133,6 +2176,7 @@ cy: read_gpx: Darllen arllwybrau GPS preifat write_gpx: Uwchlwytho arllwybrau GPS write_notes: Addasu nodiadau + write_redactions: Gorchuddio data map read_email: Darllen cyfeiriad e-bost defnyddwyr skip_authorization: Cymeradwyo cais yn awtomatig oauth_clients: @@ -2185,6 +2229,7 @@ cy: index: application: Ap permissions: Caniatadau + oauth_2: OAuth 2 users: new: title: Cofrestru @@ -2193,6 +2238,7 @@ cy: header: Rhydd ac agored display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn nes ymlaen yn eich dewisiadau. + external auth: 'Dilysu Trydydd Parti:' use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi continue: Cofrestru terms accepted: Diolch am dderbyn telerau newydd cyfranwyr! @@ -2231,6 +2277,8 @@ cy: my_dashboard: Dangosfwrdd blocks on me: Blociau arnaf i blocks by me: Blociau gennyf i + create_mute: Anwybyddu'r Defnyddiwr hwn + destroy_mute: Dad-anwybyddu'r Defnyddiwr hwn edit_profile: Golygu Proffil send message: Anfon Neges diary: Dyddiadur @@ -2251,6 +2299,15 @@ cy: role: administrator: Mae'r defnyddiwr hwn yn weinyddwr. moderator: Mae'r defnyddiwr hwn yn gymedrolwr. + importer: Mae'r defnyddiwr hwn yn fewnforiwr + grant: + administrator: Rhoi statws gweinyddwr + moderator: Rhoi statws cymedrolwr + importer: Rhoi statws mewnforiwr + revoke: + administrator: Tynnu statws gweinyddwr + moderator: Tynnu statws cymedrolwr + importer: Tynnu statws mewnforiwr block_history: Blociau Gweithredol moderator_history: Blociau a roddwyd comments: Sylwadau @@ -2372,6 +2429,15 @@ cy: showing_page: Tudalen %{page} next: Nesaf » previous: « Blaenorol + user_mutes: + index: + table: + thead: + actions: Gweithredoedd + tbody: + send_message: Anfon neges + create: + notice: Rydych chi wedi anwybyddu %{name}. notes: index: heading: Nodiadau %{user} @@ -2439,6 +2505,7 @@ cy: short_url: URL Byr include_marker: Cynnwys marciwr center_marker: Canoli'r map ar y marciwr + view_larger_map: Gweld Map Mawr embed: report_problem: Adrodd am broblem key: diff --git a/config/locales/da.yml b/config/locales/da.yml index 0aca9c148..929a7e0af 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -74,6 +74,9 @@ da: messages: invalid_email_address: ser ikke ud til at være en gyldig e-mailadresse email_address_not_routable: kan ikke rutes + models: + user_mute: + is_already_muted: er allerede gjort stille models: acl: Adgangskontrolliste changeset: Ændringssæt @@ -1490,9 +1493,9 @@ da: one: '%{count} rapport' other: '%{count} rapporter' no_reports: Ingen rapporter - report_created_at: Rapporteret første gang %{datetime} - last_resolved_at: Sidst løst %{datetime} - last_updated_at: Sidst opdateret %{datetime} af %{displayname} + report_created_at_html: Rapporteret første gang %{datetime} + last_resolved_at_html: Sidst løst %{datetime} + last_updated_at_html: Sidst opdateret %{datetime} af %{displayname} resolve: Løs ignore: Ignorér reopen: GenÃ¥bn @@ -1788,11 +1791,13 @@ da: to: Til subject: Emne date: Dato + actions: Handlinger message_summary: unread_button: Marker som ulæst read_button: Marker som læst reply_button: Svar destroy_button: Slet + unmute_button: Flyt til Indbakke new: title: Send besked send_message_to_html: Send en ny besked til %{name} @@ -1807,12 +1812,18 @@ da: body: Beklager, der er ingen besked med det id. outbox: title: Udbakke + actions: Handlinger messages: one: Du har %{count} sendt besked other: Du har %{count} sendte beskeder no_sent_messages_html: Du har ingen sendte beskeder endnu. Hvorfor ikke komme i kontakt med nogle af de %{people_mapping_nearby_link}? people_mapping_nearby: folk som kortlægger i nærheden + muted: + title: Stillegjorte beskeder + messages: + one: '%{count} stillegjort besked' + other: Du har %{count} stillegjorte beskeder reply: wrong_user: Du er logget pÃ¥ som '%{user}', men den besked du har bedt om at svare pÃ¥ blev ikke sendt til den bruger. Log venligst pÃ¥ som den korrekte @@ -1831,9 +1842,13 @@ da: heading: my_inbox: Min indbakke my_outbox: Min udbakke + muted_messages: Stillegjorte beskeder mark: as_read: Besked markeret som læst as_unread: Besked markeret som ulæst + unmute: + notice: Beskeden er flyttet til Indbakke + error: Beskeden kunne ikke flyttes til Indbakke. destroy: destroyed: Besked slettet passwords: @@ -1961,6 +1976,7 @@ da: image: Billede alt: Alt-tekst url: URL + codeblock: Kodeblok richtext_field: edit: Rediger preview: ForhÃ¥ndsvisning @@ -2098,6 +2114,10 @@ da: %{canada}: Indeholder data fra GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) og StatCan (Geography Division, Statistics Canada). contributors_ca_canada: Canada + contributors_cz_credit_html: |- + %{czechia}: Indeholder data fra State Administration of Land Surveying + and Cadastre licenseret under %{cc_licence_link} + contributors_cz_czechia: Tjekkiet contributors_fi_credit_html: '%{finland}: Indeholder data fra National Land Survey af Finlands topografiske database og andre datasæt under %{nlsfi_license_link}.' contributors_fi_finland: Finland @@ -2331,33 +2351,36 @@ da: cycleway_national: National cykelsti cycleway_regional: Regional cykelsti cycleway_local: Lokal cykelsti + cycleway_mtb: Mountainbikerute footway: Gangsti rail: Jernbane train: Tog subway: Undergrundsbane ferry: Færge light_rail: Letbane - tram_only: Sporvogn + tram: Sporvogn trolleybus: Trolleybus bus: Bus cable_car: Kabelvogn - chair_lift: stolelift - runway_only: Landingsbane - taxiway: taxibane - apron_only: Lufthavnsforplads + chair_lift: Stolelift + runway: Landingsbane + taxiway: Rullevej + apron: Lufthavnsforplads admin: Administrativ grænse - orchard_only: Plantage - vineyard: vingÃ¥rd - forest_only: Skov - wood: træ + capital: Hovedstad + city: By + orchard: Plantage + vineyard: VingÃ¥rd + forest: Skov + wood: Træ farmland: Landbrugsjord - grass_only: Græs - meadow: eng + grass: Græs + meadow: Eng bare_rock: Blottet klippe sand: Sand golf: Golfbane park: Park - common_only: Fælled + common: Fælled built_up: Bebygget omrÃ¥de resident: BoligomrÃ¥de retail: DetailhandelsomrÃ¥de @@ -2365,8 +2388,8 @@ da: commercial: ErhvervsomrÃ¥de heathland: Hede scrubland: Buskads - lake_only: Sø - reservoir: reservoir + lake: Sø + reservoir: Reservoir intermittent_water: Periodisk vandmasse glacier: Gletsjer reef: Rev @@ -2379,13 +2402,13 @@ da: centre: Sportscenter reserve: Naturreservat military: Militært omrÃ¥de - school_only: Skole - university: universitet - hospital: sygehus + school: Skole + university: Universitet + hospital: Sygehus building: Vigtig bygning station: Togstation - summit_only: Bjergtop - peak: højdepunkt + summit: Bjergtop + peak: Højdepunkt tunnel: Stiplet kant = tunnel bridge: Sort kant = bro private: Privat adgang @@ -2437,6 +2460,7 @@ da: imports: Importering automated_edits: Automatiske Redigeringer start_mapping: Begynd at kortlægge + continue_authorization: Fortsæt autorisation add_a_note: title: Ikke tid til redigering? Tilføj en bemærkning! para_1: Hvis du bare vil have en lille detalje rettet, men ikke har tid til @@ -2594,6 +2618,7 @@ da: oauth1_settings: OAuth 1-indstillinger oauth2_applications: OAuth 2-applikationer oauth2_authorizations: OAuth 2-autorisationer + muted_users: Stillegjorte Brugere oauth: authorize: title: Tillad adgang til din konto @@ -2630,6 +2655,7 @@ da: read_gpx: Læse private GPS-spor write_gpx: Overføre GPS-spor write_notes: Ændre bemærkninger + write_redactions: Rediger kortdata read_email: Læse brugerens e-mailadresse skip_authorization: Godkend applikation automatisk oauth_clients: @@ -2801,6 +2827,8 @@ da: my_dashboard: Mit kontrolpanel blocks on me: Mine blokeringer blocks by me: Blokeringer udført af mig + create_mute: Stillegør denne bruger + destroy_mute: Fjern stillegørelse fra denne bruger edit_profile: Rediger profil send message: Send besked diary: Blog @@ -2821,14 +2849,18 @@ da: role: administrator: Denne bruger er en administrator moderator: Denne bruger er en moderator + importer: Denne bruger er en importør grant: administrator: Giv administrator-adgang moderator: Giv moderator-adgang + importer: Tildel adgang til at importere revoke: administrator: Fjern administrator-adgang moderator: Fjern moderator-adgang + importer: Tilbagetræk adgang til at importere block_history: Aktive blokeringer moderator_history: Uddelte blokeringer + revoke_all_blocks: Træk blokering tilbage comments: Kommentarer create_block: Blokér denne bruger activate_user: Aktivér denne bruger @@ -2941,6 +2973,16 @@ da: confirm: Er du sikker pÃ¥ du vil tilbagekalde denne blokering? revoke: Tilbagekald! flash: Denne blokering er blevet tilbagekaldt. + revoke_all: + title: Træk alle blokeringer pÃ¥ %{block_on} tilbage + heading_html: Fjerner alle blokeringer pÃ¥ %{block_on} + empty: '%{name} har ingen aktive blokeringer.' + confirm: Er du sikker pÃ¥ at du vil trække %{active_blocks}? + active_blocks: + one: '%{count} aktiv blokering' + other: '%{count} aktive blokringer' + revoke: Træk tilbage! + flash: Alle aktive blokeringer er blevet tilbagetrukket. helper: time_future_html: Slutter om %{time}. until_login: Aktiv, indtil brugeren logger pÃ¥. @@ -2999,6 +3041,29 @@ da: showing_page: Side %{page} next: Næste » previous: « Forrige + user_mutes: + index: + title: Stillegjorte Brugere + my_muted_users: Mine stillegjorte brugere + you_have_muted_n_users: '{{PLURAL|one=Du har gjort %{count} bruger stille|Du + har gjort %{count} brugere stille.' + user_mute_explainer: Beskeder fra stillegjorte brugere flyttes ind i en separat + Indbox og du modtager ikke længere email notifikationer. + user_mute_admins_and_moderators: Du kan stillegøre Administratorer og Moderatorer, + men deres beskeder kan ikke stillegøres. + table: + thead: + muted_user: Stillegjort Bruger + actions: Handlinger + tbody: + unmute: Fjern stillegørelse + send_message: Din besked + create: + notice: Du stillegjorde %{name}. + error: '%{name} kunne ikke stillegøres. %{full_message}' + destroy: + notice: Du fjernede stillegørelsen fra %{name} + error: Brugeren kunne ikke stillegøres. Prøv venligst igen. notes: index: title: Bemærkninger indsendt eller kommenteret af %{user} @@ -3035,6 +3100,7 @@ da: reactivate: Genaktiver comment_and_resolve: Kommentere pÃ¥ og løse comment: Kommenter + log_in_to_comment: Log ind for at kommentere pÃ¥ denne note report_link_html: Hvis denne bemærkning indeholder følsomme oplysninger, der skal fjernes, kan du %{link}. other_problems_resolve: For alle andre problemer med bemærkningen, bedes du diff --git a/config/locales/de.yml b/config/locales/de.yml index a13e3a940..ab879429d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1562,9 +1562,9 @@ de: one: Eine Meldung other: '%{count} Meldungen' no_reports: Keine Berichte - report_created_at: Zuerst gemeldet am %{datetime} - last_resolved_at: Zuletzt erledigt am %{datetime} - last_updated_at: Zuletzt aktualisiert am %{datetime} von %{displayname} + report_created_at_html: Zuerst gemeldet am %{datetime} + last_resolved_at_html: Zuletzt erledigt am %{datetime} + last_updated_at_html: Zuletzt aktualisiert am %{datetime} von %{displayname} resolve: Erledigen ignore: Ignorieren reopen: Erneut öffnen @@ -2418,21 +2418,21 @@ de: subway: U-Bahn cable_car: Seilbahn chair_lift: Sessellift - runway_only: Start- und Landebahn + runway: Start- und Landebahn taxiway: Rollbahn - apron_only: Flughafenvorfeld + apron: Flughafenvorfeld admin: Landesgrenzen, sonstige Grenzen - forest_only: Wald + forest: Wald wood: Wald golf: Golfplatz park: Park - common_only: öffentliche Grünfläche (brit.) + common: öffentliche Grünfläche (brit.) resident: Wohngebiet retail: Einkaufszentrum industrial: Industriegebiet commercial: Gewerbegebiet heathland: Heide - lake_only: See + lake: See reservoir: Stausee intermittent_water: Intermittierender Gewässer farm: Landwirtschaft @@ -2443,11 +2443,11 @@ de: centre: Sportzentrum reserve: Naturschutzgebiet military: Militärgebiet - school_only: Schule + school: Schule, Universität university: Universität building: Bedeutendes Gebäude station: Bahnhof - summit_only: Gipfel + summit: Gipfel peak: Bergspitze tunnel: Gestrichelter Rand = Tunnel bridge: Schwarzer Rand = Brücke diff --git a/config/locales/diq.yml b/config/locales/diq.yml index a9dd800b2..7a1c18359 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -910,18 +910,18 @@ diq: track: Raya Herın bridleway: Raya Ancınıştan cycleway: Raya Bisiklet - forest_only: Mêşe + forest: Mêşe wood: Meşe golf: Saxay Golfi park: Perk - common_only: Çimen - lake_only: Gol + common: Çimen + lake: Gol farm: Cıtinin cemetery: Mezlaser allotments: Bostan - school_only: Wendxane + school: Wendxane university: Uniwersita - summit_only: Sersıq + summit: Sersıq peak: Ko welcome: title: Xeyr amey! diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index d13208383..ae5ed0f7b 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1269,21 +1269,21 @@ dsb: subway: Pódzemska cable_car: Kablowa elektriska chair_lift: sedłowy lift - runway_only: Pśizemjeńska cera + runway: Pśizemjeńska cera taxiway: lětadłowa cera - apron_only: Pśedpólo lětanišća + apron: Pśedpólo lětanišća admin: Zastojnstwowa granica - forest_only: Góla + forest: Góla wood: Lěs golf: Golfowišćo park: Park - common_only: PowÅ¡ykny + common: PowÅ¡ykny resident: Bydleński wobcerk retail: Nakupowanišćo industrial: Industrijowy wobcerk commercial: Źěłarstwowy wobcerk heathland: Wrjosate strony - lake_only: Jazor + lake: Jazor reservoir: gaśeński jazor farm: Farma brownfield: Industrijowe lědo @@ -1293,11 +1293,11 @@ dsb: centre: Sportowy centrum reserve: Strony šćitaneje pśirody military: Militarny wobcerk - school_only: Å ula + school: Å ula university: uniwersita building: Pśesegajuce twarjenje station: Dwórnišćo, zeleznicowa stacija - summit_only: Wjerch + summit: Wjerch peak: Å¡pica tunnel: Smužkowane wobcerjenje = tunel bridge: Carne wobcerjenje = móst diff --git a/config/locales/el.yml b/config/locales/el.yml index 46af8b3d5..5dff1525a 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1520,9 +1520,10 @@ el: one: '%{count} αναφορά' other: '%{count} αναφορές' no_reports: Καμία αναφορά - report_created_at: Αναφέρθηκε για πρώτη φορά στις %{datetime} - last_resolved_at: Επιλύθηκε για τελευταία φορά στις %{datetime} - last_updated_at: Ενημερώθηκε για τελευταία φορά στις %{datetime} από τον %{displayname} + report_created_at_html: Αναφέρθηκε για πρώτη φορά στις %{datetime} + last_resolved_at_html: Επιλύθηκε για τελευταία φορά στις %{datetime} + last_updated_at_html: Ενημερώθηκε για τελευταία φορά στις %{datetime} από τον + %{displayname} resolve: Επίλυση ignore: Αγνόηση reopen: Ξανάνοιγμα @@ -1858,6 +1859,9 @@ el: people_mapping_nearby: άτομα που χαρτογραφούν κοντά σας muted: title: Μηνύματα σε Σίγαση + messages: + one: '%{count} μήνυμα σε σίγαση' + other: Έχετε %{count} μηνύματα σε σίγαση reply: wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να απαντήσετε δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλούμε συνδεθείτε με το σωστό όνομα @@ -2012,6 +2016,7 @@ el: image: Εικόνα alt: Εναλ. κείμενο url: URL + codeblock: Μπλοκ κώδικα richtext_field: edit: Επεξεργασία preview: Προεπισκόπηση @@ -2056,6 +2061,8 @@ el: Παρακαλούμε %{contact_the_osmf_link} εάν έχετε ερωτήσεις για αδειοδότηση, πνευματικά δικαιώματα ή άλλα νομικά. legal_2_1_contact_the_osmf: επικοινωνήστε με το OSMF + legal_2_2_html: Το OpenStreetMap, το λογότυπο με τον μεγεθυντικό φακό και το + State of the Map είναι %{registered_trademarks_link}. legal_2_2_registered_trademarks: εγγεγραμμένα εμπορικά σήματα του OSMF partners_title: Συνεργάτες copyright: @@ -2080,6 +2087,8 @@ el: introduction_1_odc_odbl: Open Data Commons Άδεια Ανοικτής Βάσης Δεδομένων introduction_1_osm_foundation: Ίδρυμα OpenStreetMap introduction_2_legal_code: νομικός κώδικας + introduction_3_html: Η τεκμηρίωση μας αδειοδοτείται βάσει της άδειας %{creative_commons_link} + (CC BY-SA 2.0). introduction_3_creative_commons: Creative Commons Αναφορά Δημιουργού-Παρόμοια Διανομή 2.0 credit_title_html: Πως να κάνετε αναφορά δημιουργού προς το OpenStreetMap @@ -2163,6 +2172,9 @@ el: %{united_kingdom}: Περιέχει δεδομένα Χαρτογραφικής Υπηρεσίας © Crown πνευματικά δικαιώματα και δικαιώματα βάσης δεδομένων 2010-2023. contributors_gb_united_kingdom: Ηνωμένο Βασίλειο + contributors_2_html: Για περισσότερες λεπτομέρειες για αυτές, και άλλες πηγές + που έχουν χρησιμοποιηθεί για να βοηθήσουν στην βελτίωση του OpenStreetMap, + παρακαλούμε δείτε την %{contributors_page_link} στο OpenStreetMap Wiki. contributors_2_contributors_page: Σελίδα συνεισφερόντων contributors_footer_2_html: Η συμπερίληψη δεδομένων στο OpenStreetMap δεν συνεπάγεται ότι ο αρχικός πάροχος δεδομένων εγκρίνει το OpenStreetMap, παρέχει @@ -2179,6 +2191,10 @@ el: infringement_2_1_takedown_procedure: διαδικασία αφαίρεσης infringement_2_1_online_filing_page: ηλεκτρονική φόρμα trademarks_title: Εμπορικά σήματα + trademarks_1_1_html: Το OpenStreetMap, το λογότυπο με τον μεγεθυντικό φακό + και το State of the Map είναι σήματα κατατεθέντα του Ιδρύματος OpenStreetMap. + Αν έχετε ερωτήσεις σχετικά με την χρήση σας αυτών των σημάτων, παρακαλούμε + δείτε την %{trademark_policy_link}. trademarks_1_1_trademark_policy: Πολιτική Εμπορικών Σημάτων index: js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει JavaScript @@ -2357,29 +2373,39 @@ el: rail: Σιδηρόδρομος train: Τρένο subway: Υπόγειος Σιδηρόδρομος + ferry: Πορθμείο + light_rail: Ελαφρύς σιδηρόδρομος + tram: Τραμ + trolleybus: Τρόλεϊ bus: Λεωφορείο cable_car: Τελεφερίκ - chair_lift: τελεφερίκ με καθίσματα - runway_only: Διάδρομος Αεροδρομίου - taxiway: τροχόδρομος - apron_only: Πίστα προσγείωσης αεροδρομίου + chair_lift: Αναβατήρας + runway: Διάδρομος Αεροδρομίου + taxiway: Τροχόδρομος + apron: Πίστα προσγείωσης αεροδρομίου admin: Διοικητικό όριο - forest_only: Δάσος + capital: Πρωτεύουσα + city: Πόλη + vineyard: Αμπελώνας + forest: Δάσος wood: Φυσικό δάσος + grass: Γρασίδι meadow: Λιβάδι bare_rock: Γυμνός βράχος sand: Άμμος golf: Γήπεδο γκολφ park: Πάρκο - common_only: Κοινόχρηστο + common: Κοινόχρηστο + built_up: Δομημένη περιοχή resident: Κατοικημένη περιοχή retail: Περιοχή λιανικού εμπορίου industrial: Βιομηχανική περιοχή commercial: Εμπορική περιοχή heathland: Φρυγανότοπος - lake_only: Λίμνη - reservoir: ταμιευτήρας + lake: Λίμνη + reservoir: Ταμιευτήρας glacier: Παγετώνας + reef: Ύφαλος farm: Αγρόκτημα brownfield: Πρώην βιομηχανική περιοχή cemetery: Κοιμητήριο @@ -2388,17 +2414,20 @@ el: centre: Αθλητικό κέντρο reserve: Φυσικό καταφύγιο military: Στρατιωτική περιοχή - school_only: Σχολείο - university: πανεπιστήμιο + school: Σχολείο + university: Πανεπιστήμιο + hospital: Νοσοκομείο building: Σημαντικό κτήριο station: Σιδηροδρομικός σταθμός - summit_only: Κορυφή - peak: κορυφή + summit: Κορυφή + peak: Κορυφή tunnel: Διακεκομμένο περίβλημα = σήραγγα bridge: Μαύρο περίβλημα = γέφυρα private: Ιδιωτική πρόσβαση destination: Πρόσβαση προορισμού construction: Δρόμοι υπό κατασκευή + bus_stop: Στάση λεωφορείου + stop: Στάση bicycle_shop: Κατάστημα ποδηλάτων bicycle_parking: Χώρος στάθμευσης ποδηλάτων toilets: Τουαλέτες @@ -2645,6 +2674,7 @@ el: read_gpx: Ανάγνωση προσωπικών ιχνών GPS write_gpx: Μεταφόρτωση ιχνών GPS write_notes: Τροποποίηση σημειώσεων + write_redactions: Αφαίρεση και απόκρυψη δεδομένων χάρτη read_email: Διαβάζει τη διεύθυνση email χρήστη skip_authorization: Αυτόματη έγκριση εφαρμογής oauth_clients: @@ -2734,6 +2764,7 @@ el: application: Εφαρμογή permissions: Άδειες no_applications_html: Δεν έχετε εξουσιοδοτήσει ακόμη %{oauth2} εφαρμογές. + oauth_2: OAuth 2 application: revoke: Ανάκληση πρόσβασης confirm_revoke: Ανάκληση πρόσβασης για αυτήν την εφαρμογή; @@ -2853,6 +2884,7 @@ el: importer: Ανάκληση πρόσβασης εισαγωγέα block_history: Ενεργές Φραγές moderator_history: Φραγές που Επιβλήθηκαν + revoke_all_blocks: Ανάκληση όλων των φραγών comments: Σχόλια create_block: Φραγή αυτού του Χρήστη activate_user: Ενεργοποίηση αυτού του λογαριασμού Χρήστη @@ -2966,6 +2998,16 @@ el: confirm: Είστε σίγουρος πως επιθυμείτε να ανακαλέσετε αυτή τη φραγή; revoke: Ανακαλέστε! flash: Αυτή η φραγή έχει ανακληθεί. + revoke_all: + title: Ανάκληση όλων των φραγών σε %{block_on} + heading_html: Ανάκληση όλων των φραγών σε %{block_on} + empty: Ο χρήστης %{name} δεν έχει ενεργές φραγές. + confirm: Είστε σίγουροι ότι θέλετε να ανακαλέσετε %{active_blocks}; + active_blocks: + one: '%{count} ενεργή φραγή' + other: '%{count} ενεργές φραγές' + revoke: Ανάκληση! + flash: Όλες οι ενεργές φραγές έχουν ανακληθεί. helper: time_future_html: Τελειώνει σε %{time}. until_login: Ενεργό έως ότου ο χρήστης συνδεθεί. @@ -3028,6 +3070,13 @@ el: index: title: Χρήστες σε Σίγαση my_muted_users: Οι χρήστες μου σε σίγαση + you_have_muted_n_users: + one: Έχετε θέσει σε σίγαση %{count} χρήστη + other: Έχετε θέσει σε σίγαση %{count} χρήστες + user_mute_explainer: Τα μηνύματα των χρηστών σε σίγαση μετακινούνται σε ξεχωριστά + Εισερχόμενα και δεν θα λαμβάνετε ειδοποιήσεις μέσω email. + user_mute_admins_and_moderators: Μπορείτε να θέσετε σε σίγαση τους Διαχειριστές + και τους Συντονιστές αλλά δεν θα γίνει σίγαση των μηνυμάτων τους. table: thead: muted_user: Χρήστης σε Σίγαση @@ -3078,6 +3127,7 @@ el: reactivate: Επανενεργοποίηση comment_and_resolve: Σχολιάστε και Επιλύστε comment: Σχολιάζω + log_in_to_comment: Συνδεθείτε για να σχολιάσετε σε αυτή την σημείωση report_link_html: Εάν αυτή η σημείωση περιέχει ευαίσθητες πληροφορίες που πρέπει να αφαιρεθούν, μπορείτε %{link}. other_problems_resolve: Για όλα τα άλλα προβλήματα με τη σημείωση, επιλύστε diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e07c9aaab..5eefc686f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1597,21 +1597,21 @@ en-GB: subway: Subway cable_car: Cable car chair_lift: chairlift - runway_only: Airport Runway + runway: Airport Runway taxiway: taxiway - apron_only: Airport apron + apron: Airport apron admin: Administrative boundary - forest_only: Forest + forest: Forest wood: Wood golf: Golf course park: Park - common_only: Common + common: Common resident: Residential area retail: Retail area industrial: Industrial area commercial: Commercial area heathland: Heathland - lake_only: Lake + lake: Lake reservoir: reservoir farm: Farm brownfield: Brownfield site @@ -1621,11 +1621,11 @@ en-GB: centre: Sports centre reserve: Nature reserve military: Military area - school_only: School + school: School university: university building: Significant building station: Railway station - summit_only: Summit + summit: Summit peak: peak tunnel: Dashed casing = tunnel bridge: Black casing = bridge diff --git a/config/locales/en.yml b/config/locales/en.yml index 8114c8b10..653e363a6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1590,6 +1590,7 @@ en: loaded: one: "loaded successfully with %{trace_points} out of a possible %{count} point." other: "loaded successfully with %{trace_points} out of a possible %{count} points." + all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -2313,29 +2314,29 @@ en: subway: "Subway" ferry: "Ferry" light_rail: "Light rail" - tram_only: "Tram" + tram: "Tram" trolleybus: "Trolleybus" bus: "Bus" cable_car: "Cable car" chair_lift: "Chair lift" - runway_only: "Airport Runway" + runway: "Airport Runway" taxiway: "Taxiway" - apron_only: "Airport apron" + apron: "Airport apron" admin: "Administrative boundary" capital: "Capital" city: "City" - orchard_only: "Orchard" + orchard: "Orchard" vineyard: "Vineyard" - forest_only: "Forest" + forest: "Forest" wood: "Wood" farmland: "Farmland" - grass_only: "Grass" + grass: "Grass" meadow: "Meadow" bare_rock: "Bare rock" sand: "Sand" golf: "Golf course" park: "Park" - common_only: "Common" + common: "Common" built_up: "Built-up area" resident: "Residential area" retail: "Retail area" @@ -2343,7 +2344,7 @@ en: commercial: "Commercial area" heathland: "Heathland" scrubland: "Scrubland" - lake_only: "Lake" + lake: "Lake" reservoir: "Reservoir" intermittent_water: "Intermittent waterbody" glacier: "Glacier" @@ -2355,14 +2356,15 @@ en: allotments: "Allotments" pitch: "Sports pitch" centre: "Sports centre" + beach: "Beach" reserve: "Nature reserve" military: "Military area" - school_only: "School" + school: "School" university: "University" hospital: "Hospital" building: "Significant building" station: "Railway station" - summit_only: "Summit" + summit: "Summit" peak: "Peak" tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" @@ -2372,7 +2374,9 @@ en: bus_stop: "Bus stop" stop: "Stop" bicycle_shop: "Bicycle shop" + bicycle_rental: "Bicycle rental" bicycle_parking: "Bicycle parking" + bicycle_parking_small: "Small bicycle parking" toilets: "Toilets" welcome: title: Welcome! diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 2e7f013c8..7f0c698a3 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1483,9 +1483,9 @@ eo: one: '%{count} raporto' other: '%{count} raportoj' no_reports: Neniu raporto - report_created_at: Unue raportita je %{datetime} - last_resolved_at: Laste solvita je %{datetime} - last_updated_at: Laste aktualigita je %{datetime} de %{displayname} + report_created_at_html: Unue raportita je %{datetime} + last_resolved_at_html: Laste solvita je %{datetime} + last_updated_at_html: Laste aktualigita je %{datetime} de %{displayname} resolve: Solvi ignore: Ignori reopen: Remalfermi @@ -1642,6 +1642,7 @@ eo: loaded: one: estas sukcese enlegita kun %{trace_points} el ebla %{count} punkto. other: estas sukcese enlegita kun %{trace_points} el eblaj %{count} punktoj. + all_your_traces_html: Ĉiuj viaj sukcese alŝutitaj GPX-spuroj troveblas ĉe %{url}. subject: '[OpenStreetMap] GPX-dosiero enportita sukcese' signup_confirm: subject: '[OpenStreetMap] Bonvenon al OpenStreetMap' @@ -2329,29 +2330,29 @@ eo: subway: Metroo ferry: Pramo light_rail: Malpeza vagonaro - tram_only: Tramo + tram: Tramo trolleybus: Trolebuso bus: AÅ­tobuso cable_car: Kablovojo chair_lift: Telfero seĝa - runway_only: Avia dromo + runway: Avia dromo taxiway: AÅ­tokur-strato - apron_only: Aviadil-parkumejo + apron: Aviadil-parkumejo admin: Administra limo capital: Ĉefurbo city: Urbo - orchard_only: Fruktoĝardeno + orchard: Fruktoĝardeno vineyard: Vinberĝardeno - forest_only: Kultiv-arbaro + forest: Kultiv-arbaro wood: Arbaro farmland: Agrokultura tereno - grass_only: Herbotapiŝo + grass: Herbotapiŝo meadow: Herbejo bare_rock: Roka areo sand: Sabla tereno golf: Golfejo park: Parko - common_only: Publika ripoza tereno + common: Publika ripoza tereno built_up: Konstruaĵ-kovrita tereno resident: Privatdoma tereno retail: Komercejo @@ -2359,7 +2360,7 @@ eo: commercial: Oficeja tereno heathland: Erikejo scrubland: Arbustaro - lake_only: Lago + lake: Lago reservoir: Lago artefarita intermittent_water: Sezona akvujo glacier: Glacirivero @@ -2373,12 +2374,12 @@ eo: centre: Sporta centro reserve: Naturrezervejo military: Armea tereno - school_only: Lernejo + school: Lernejo university: Universitato hospital: Malsanulejo building: Grava konstruaĵo station: Stacidomo - summit_only: Montosupro + summit: Montosupro peak: Montpinto tunnel: Strekumita konturo - tunelo bridge: Nigra konturo - ponto @@ -2831,6 +2832,7 @@ eo: importer: Nuligi aliron de enportisto block_history: Blokadoj aktivaj moderator_history: Blokadoj eldonitaj + revoke_all_blocks: Nuligi ĉiujn blokadojn comments: Komentoj create_block: Bloki ĉi tiun uzanton activate_user: Aktivigi tiun ĉi uzanton @@ -2936,6 +2938,14 @@ eo: confirm: Ĉu vi certe volas nuligi ĉi tiun blokadon? revoke: Malbloki! flash: Ĉi tiu blokado estas nuligita. + revoke_all: + title: Nuligado de ĉiujn blokojn por %{block_on} + heading_html: Nuligado de ĉiujn blokojn por %{block_on} + empty: '%{name} ne havas aktivajn blokadojn.' + confirm: Ĉu vi volas nuligi %{active_blocks}? + active_blocks: '{{PLURAL|one=%{count} aktivan blokadon|%{count} aktivajn blokadojn}' + revoke: Malbloki! + flash: Ĉiuj aktivaj blokoj estas nuligitaj. helper: time_future_html: Finiĝos post %{time}. until_login: Aktiva ĝis la uzanto ensalutos. diff --git a/config/locales/es.yml b/config/locales/es.yml index a3efebd69..95bafbdcb 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -134,6 +134,12 @@ es: messages: invalid_email_address: no parece ser una dirección de correo electrónico válida email_address_not_routable: no es enrutable + models: + user_mute: + attributes: + subject: + format: '%{message}' + is_already_muted: ya esta silenciado models: acl: Lista de control de acceso changeset: Conjunto de cambios @@ -1565,9 +1571,9 @@ es: one: '%{count} reporte' other: '%{count} reportes' no_reports: Sin reportes - report_created_at: Denunciado por primera vez el %{datetime} - last_resolved_at: Resuelto por última vez el %{datetime} - last_updated_at: Actualizado por última vez el %{datetime} por %{displayname} + report_created_at_html: Denunciado por primera vez el %{datetime} + last_resolved_at_html: Resuelto por última vez el %{datetime} + last_updated_at_html: Actualizado por última vez el %{datetime} por %{displayname} resolve: Resolver ignore: Ignorar reopen: Reabrir @@ -1893,6 +1899,11 @@ es: no_sent_messages_html: Aún no tienes mensajes enviados. ¿Por qué no ponerte en contacto con algunas de las %{people_mapping_nearby_link}? people_mapping_nearby: personas mapeando cerca + muted: + title: Mensajes silenciados + messages: + one: '%{count} mensaje silenciado' + other: Tienes %{count} mensajes silenciados reply: wrong_user: Estás conectado como `%{user}' pero el mensaje que quieres responder no se ha enviado a dicho usuario. Por favor, inicia sesión con el usuario @@ -1911,6 +1922,7 @@ es: heading: my_inbox: Mi buzón my_outbox: Mi buzón de salida + muted_messages: Mensajes silenciados mark: as_read: Mensaje marcado como leído as_unread: Mensaje marcado como no leído @@ -1942,6 +1954,8 @@ es: URL? update: flash changed: Tu contraseña ha sido cambiada. + flash token bad: No se ha encontrado este token, ¿Quizá deberías comprobar la + URL? preferences: show: title: Mis preferencias @@ -2432,37 +2446,56 @@ es: primary: Vía primaria secondary: Vía secundaria unclassified: Vía de menos nivel + pedestrian: Vía peatonal track: Pista bridleway: Vía ecuestre cycleway: Ciclovía cycleway_national: Ciclovía nacional cycleway_regional: Ciclovía regional cycleway_local: Ciclovía local + cycleway_mtb: Ruta de bicicleta de montaña footway: Vía peatonal rail: Ferrocarril + train: Tren subway: Metro - tram_only: Tranvía + ferry: Ferry + light_rail: Tren Ligero + tram: Tranvía + trolleybus: Trolebús bus: Autobús cable_car: Telecabina chair_lift: Telesilla - runway_only: Pista de aeropuerto + runway: Pista de aeropuerto taxiway: Calle de rodaje - apron_only: Rampa aeroportuaria + apron: Rampa aeroportuaria admin: Límite administrativo - orchard_only: Huerta - forest_only: Bosque - wood: Bosque + capital: Capital + city: Ciudad + orchard: Huerta + vineyard: Viñedo + forest: Bosque + wood: Bosque maderable + farmland: Tierras de cultivo + grass: Césped + meadow: Pradera + bare_rock: Roca desnuda sand: Arena golf: Campo de golf park: Parque - common_only: Común + common: Común + built_up: Área construida resident: Zona residencial retail: Zona de comercios industrial: Zona industrial commercial: Zona comercial heathland: Brezal - lake_only: Lago - reservoir: embalse + scrubland: Matorral + lake: Lago + reservoir: Embalse + intermittent_water: Cuerpo de agua intermitente + glacier: Glaciar + reef: Arrecife + wetland: Pantano farm: Granja brownfield: Sitio baldío cemetery: Cementerio @@ -2471,12 +2504,13 @@ es: centre: Centro deportivo reserve: Reserva natural military: Área militar - school_only: Escuela - university: universidad + school: 'Escuela: universidad' + university: Universidad + hospital: Hospital building: Edificio significativo station: Estación de tren - summit_only: Cumbre - peak: pico + summit: Cumbre + peak: Pico tunnel: Borde a rayas = túnel bridge: Borde negro = puente private: Acceso privado @@ -2695,6 +2729,7 @@ es: oauth1_settings: Otras configuraciones oauth2_applications: Aplicaciones de OAuth 2 oauth2_authorizations: Autorizaciones de OAuth 2 + muted_users: Usuarios silenciados oauth: authorize: title: Autorizar el acceso a tu cuenta @@ -2821,6 +2856,7 @@ es: application: Solicitudes permissions: Permisos no_applications_html: Aún no has autorizado aplicaciones a %{oauth2}. + oauth_2: OAuth 2 application: revoke: Revocar el acceso confirm_revoke: ¿Revocar el acceso a esta aplicación? @@ -2906,6 +2942,8 @@ es: my_dashboard: Mi tablero blocks on me: Bloqueos sobre mí blocks by me: Bloqueados por mí + create_mute: Silenciar a este usuario + destroy_mute: Dejar de silenciar a este usuario edit_profile: Editar perfil send message: Enviar mensaje diary: Diario @@ -2937,6 +2975,7 @@ es: importer: Revocar el acceso importador block_history: Bloqueos activos moderator_history: Bloqueos impuestos + revoke_all_blocks: Revocar todos los bloqueos comments: Comentarios create_block: Bloquear a este usuario activate_user: Activar este usuario @@ -3051,6 +3090,16 @@ es: confirm: ¿Estás seguro de que deseas revocar este bloqueo? revoke: ¡Revocar! flash: Este bloqueo ha sido revocado. + revoke_all: + title: Revocando todos los bloqueos en %{block_on} + heading_html: Revocando todos los bloqueos en %{block_on} + empty: '%{name} no tiene bloqueos activos.' + confirm: ¿Estás seguro de que deseas revocar %{active_blocks}? + active_blocks: + one: '%{count} bloqueo activo' + other: '%{count} bloqueos activos' + revoke: ¡Revocar! + flash: Todos los bloqueos activos han sido revocados. helper: time_future_html: Termina en %{time}. until_login: Activo hasta que el usuario acceda. @@ -3112,11 +3161,27 @@ es: previous: « Anterior user_mutes: index: + title: Usuarios silenciados + my_muted_users: Mis usuarios silenciados + you_have_muted_n_users: + one: Has silenciado %{count} usuario + other: Has silenciado %{count} usuarios + user_mute_explainer: Los mensajes de los usuarios silenciados se trasladan a + una bandeja de entrada separada y no recibirás notificaciones por correo electrónico. + user_mute_admins_and_moderators: Puedes silenciar a los administradores y moderadores + pero sus mensajes no serán silenciados. table: thead: + muted_user: Usuario silenciado actions: Acciones tbody: + unmute: Dejar de silenciar send_message: Enviar mensaje + create: + notice: Has silenciado a %{name}. + error: '%{name} no pudo ser silenciado. %{full_message}.' + destroy: + notice: Has dejado de silenciar a %{name}. notes: index: title: Notas creadas o comentadas por %{user} @@ -3153,6 +3218,7 @@ es: reactivate: Reactivar comment_and_resolve: Comentar y resolver comment: Comentar + log_in_to_comment: Inicia sesión para comentar esta nota report_link_html: Si esta nota contiene información sensible que debe eliminarse, puedes %{link}. other_problems_resolve: Para todos los demás problemas con la nota, resuélvelo diff --git a/config/locales/et.yml b/config/locales/et.yml index 9e5d19d7c..73ead41cc 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1820,21 +1820,21 @@ et: subway: Metroo cable_car: Köisraudtee chair_lift: Toolilift - runway_only: Lennurada + runway: Lennurada taxiway: Ruleerimistee - apron_only: Lennujaama perroon + apron: Lennujaama perroon admin: Halduspiir - forest_only: Tulundusmets + forest: Tulundusmets wood: Mets golf: Golfiväljak park: Park - common_only: Heinamaa + common: Heinamaa resident: Elamurajoon retail: Kaubanduspiirkond industrial: Tööstuspiirkond commercial: Äripiirkond heathland: Nõmm - lake_only: Järv + lake: Järv reservoir: Veehoidla farm: Põllumajanduslik maa brownfield: Ehitusmaa @@ -1844,11 +1844,11 @@ et: centre: Spordikeskus reserve: Looduskaitseala military: Sõjaväe kasutuses - school_only: Kool + school: Kool university: Ülikool building: Märkimisväärne hoone station: Raudteejaam - summit_only: Mägi + summit: Mägi peak: Tipp tunnel: Katkendlik ümbris = tunnel bridge: Must ümbris = sild diff --git a/config/locales/eu.yml b/config/locales/eu.yml index eefb6b24d..d1eb73e47 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1446,9 +1446,9 @@ eu: one: '%{count} report' other: '%{count} jakinarazpen' no_reports: Ez dago txostenik - report_created_at: Lehenengoz %{datetime} egunean berri emanda - last_resolved_at: Azkenekoz %{datetime} egunean konponduta - last_updated_at: Azkenekoz %{displayname}-(e)k %{datetime} egunean eguneratua + report_created_at_html: Lehenengoz %{datetime} egunean berri emanda + last_resolved_at_html: Azkenekoz %{datetime} egunean konponduta + last_updated_at_html: Azkenekoz %{displayname}-(e)k %{datetime} egunean eguneratua resolve: Konpondu ignore: Ezikusi reopen: Berrireki @@ -2208,21 +2208,21 @@ eu: subway: Metroa cable_car: Funikularra chair_lift: teleaulkia - runway_only: Aireportuko Pista + runway: Aireportuko Pista taxiway: taxi bidea - apron_only: Aireportu plataforma + apron: Aireportu plataforma admin: Muga administratiboa - forest_only: Baso + forest: Baso wood: Basoa golf: Golf-zelai park: Parke - common_only: Arrunta + common: Arrunta resident: Etxebizitza ingurua retail: Txikizkako azalera industrial: Industrialdea commercial: Merkataritza eremua heathland: Txilardia - lake_only: Aintzira + lake: Aintzira reservoir: urtegia farm: Baserria brownfield: Landarik gabeko gunea @@ -2232,11 +2232,11 @@ eu: centre: Kiroldegi reserve: Natura-erreserba military: Eremu militarra - school_only: Eskola + school: Eskola university: unibertsitate building: Eraikin garrantzitsua station: Tren geltokia - summit_only: Tontorra + summit: Tontorra peak: gailurra tunnel: Marratxodun estalkia = tunela bridge: Estalki beltza = zubia diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 0db0ee2ce..94925f9af 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1398,9 +1398,9 @@ fa: one: '%{count} گزارش' other: '%{count} گزارش' no_reports: گزارشی پیدا نشد - report_created_at: اولین بار %{datetime} گزارش شد - last_resolved_at: آخرین بار %{datetime} حل شد - last_updated_at: آخرین روزآمدسازی در %{datetime} به دست %{displayname} + report_created_at_html: اولین بار %{datetime} گزارش شد + last_resolved_at_html: آخرین بار %{datetime} حل شد + last_updated_at_html: آخرین روزآمدسازی در %{datetime} به دست %{displayname} resolve: حل شد ignore: نادیده‌گیری reopen: بازگشایی @@ -2099,21 +2099,21 @@ fa: subway: مترو cable_car: تله‌فریک chair_lift: صندلی بالابر - runway_only: باند فرودگاه + runway: باند فرودگاه taxiway: خزش‌راه - apron_only: پیشگاه فرودگاه + apron: پیشگاه فرودگاه admin: مرز اداری - forest_only: جنگل + forest: جنگل wood: چوب golf: زمین گلف park: پارک - common_only: مشاع + common: مشاع resident: منطقهٔ مسکونی retail: منطقه خرده فروشی industrial: منطقه صنعتی commercial: منطقه تجاری heathland: Heathland - lake_only: دریاچه + lake: دریاچه reservoir: مخزن farm: مزرعه brownfield: سایت قهوه‌ای @@ -2123,11 +2123,11 @@ fa: centre: مرکز ورزشی reserve: طبیعت حفاظت شده military: منطقه نظامی - school_only: مدرسه + school: مدرسه university: دانشگاه building: ساختمان مهم station: ایستگاه راه آهن - summit_only: چکاد + summit: چکاد peak: قله tunnel: لبهٔ خط‌چین‌دار = تونل bridge: لبهٔ سیاه = پل diff --git a/config/locales/fi.yml b/config/locales/fi.yml index e08fc5c79..06a0b697c 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1450,9 +1450,9 @@ fi: one: '%{count} ilmianto' other: '%{count} ilmiantoa' no_reports: Ei ilmiantoja - report_created_at: Ilmoitettu ensimmäisen kerran %{datetime} - last_resolved_at: Ratkaistu %{datetime} - last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime} + report_created_at_html: Ilmoitettu ensimmäisen kerran %{datetime} + last_resolved_at_html: Ratkaistu %{datetime} + last_updated_at_html: Viimeisin käsittelijä %{displayname} %{datetime} resolve: Ratkaise ignore: Merkitse aiheettomaksi reopen: Avaa uudelleen @@ -2207,21 +2207,21 @@ fi: subway: Metro cable_car: Köysirata chair_lift: tuolihissi - runway_only: Lentokentän kiitotie + runway: Lentokentän kiitotie taxiway: rullaustie - apron_only: Lentokentän asemataso + apron: Lentokentän asemataso admin: Hallinnollinen raja - forest_only: Talousmetsä + forest: Talousmetsä wood: Metsä golf: Golfkenttä park: Puisto - common_only: Niitty + common: Niitty resident: Asuinalue retail: Kaupallinen alue industrial: Teollisuusalue commercial: Toimistoalue heathland: Kanervikko - lake_only: Järvi + lake: Järvi reservoir: tekojärvi farm: Maatila brownfield: Purettujen rakennusten alue @@ -2231,11 +2231,11 @@ fi: centre: Urheilukeskus reserve: Luonnonsuojelualue military: Sotilasalue - school_only: Koulu + school: Koulu university: yliopisto building: Merkittävä rakennus station: Rautatieasema - summit_only: Vuorenhuippu + summit: Vuorenhuippu peak: huippu tunnel: Katkoviivallinen kehys = tunneli bridge: Musta kehys = silta diff --git a/config/locales/fit.yml b/config/locales/fit.yml index e1579013e..ac3f17668 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -521,9 +521,9 @@ fit: zero: Ei ilmiantoa one: Yksi ilmianto other: '%{count} ilmiantoa' - report_created_at: Ilmotettu ensimmäisen kerran %{datetime} - last_resolved_at: Ratkastu %{datetime} - last_updated_at: Viimeisin käsittelijä %{displayname} %{datetime} + report_created_at_html: Ilmotettu ensimmäisen kerran %{datetime} + last_resolved_at_html: Ratkastu %{datetime} + last_updated_at_html: Viimeisin käsittelijä %{displayname} %{datetime} resolve: Ratkase ignore: Merkitte aiheettomaksi reopen: Aukase uuesti diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 16240d4a8..44ceda85a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -44,6 +44,7 @@ # Author: JB # Author: Jean-Frédéric # Author: JenyxGym +# Author: Jg45 # Author: Jiremek # Author: Jlrb+ # Author: Koreller @@ -791,7 +792,7 @@ fr: drag_lift: Téléski gondola: Télécabine magic_carpet: Tapis roulant élévateur - platter: Monte-plat + platter: Téléski à plateau pylon: Pylône station: Gare de télécabine t-bar: Monte-barre en T @@ -1591,9 +1592,9 @@ fr: one: '%{count} rapport' other: '%{count} rapports' no_reports: Aucun rapport - report_created_at: Signalé la première fois à %{datetime} - last_resolved_at: Dernière résolution à %{datetime} - last_updated_at: Dernière mise à jour à %{datetime} par %{displayname} + report_created_at_html: Signalé la première fois à %{datetime} + last_resolved_at_html: Dernière résolution à %{datetime} + last_updated_at_html: Dernière mise à jour à %{datetime} par %{displayname} resolve: Résoudre ignore: Ignorer reopen: Rouvrir @@ -2501,29 +2502,29 @@ fr: subway: Ligne de métro ferry: Ferry light_rail: Voie ferrée légère - tram_only: Tramway + tram: Tramway trolleybus: Trolleybus bus: Bus cable_car: Téléphérique chair_lift: Télésiège - runway_only: Piste d’aéroport + runway: Piste d’aéroport taxiway: Piste de circulation d'un aéroport - apron_only: Stationnement d’avions + apron: Stationnement d’avions admin: Limite administrative capital: Capitale city: Ville - orchard_only: Verger + orchard: Verger vineyard: Vignoble - forest_only: Forêt + forest: Forêt wood: Bois farmland: Terres agricoles - grass_only: Pelouse + grass: Pelouse meadow: Prairie bare_rock: Roche nue sand: Sable golf: Parcours de golf park: Parc - common_only: Espace commun + common: Espace commun built_up: Zone bâtie resident: Zone résidentielle retail: Zone de commerce @@ -2531,7 +2532,7 @@ fr: commercial: Zone tertiaire heathland: Lande scrubland: Fruticée - lake_only: Lac + lake: Lac reservoir: Réservoir intermittent_water: plan d’eau intermittent glacier: Glacier @@ -2545,12 +2546,12 @@ fr: centre: Centre sportif reserve: Réserve naturelle military: Zone militaire - school_only: École + school: École university: Université hospital: Hôpital building: Bâtiment important station: Gare ferroviaire - summit_only: Sommet + summit: Sommet peak: Pic tunnel: Bordure pointillée = tunnel bridge: Bord noir = pont diff --git a/config/locales/fur.yml b/config/locales/fur.yml index a1dc1c858..aee698bdb 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -881,6 +881,7 @@ fur: shoes: Buteghe di scarpis sports: Buteghe di articui sportîfs supermarket: Supermarcjât + tailor: Sartôr toys: Negozi di zugatui travel_agency: Agjenzie di viaçs "yes": Buteghe @@ -1211,7 +1212,9 @@ fur: about: next: Prossim local_knowledge_title: Cognossince locâl + community_driven_osm_blog: Blog di OpenStreetMap community_driven_user_diaries: diaris dai utents + community_driven_community_blogs: Blogs de comunitât community_driven_osm_foundation: Fondazion OSM open_data_title: Dâts vierts open_data_open_data: dâts vierts @@ -1309,6 +1312,8 @@ fur: title: Pe organizazions wiki: title: OpenStreetMap Wiki + potlatch: + change_preferences: Cambie lis tôs preferences culì any_questions: title: Domandis? sidebar: @@ -1338,32 +1343,37 @@ fur: rail: Ferade subway: Metropolitane ferry: Traghet - tram_only: Tram - runway_only: Piste dal aeropuart + tram: Tram + runway: Piste dal aeropuart admin: Confin aministratîf - forest_only: Bosc + forest: Bosc + grass: Prât + meadow: Prâts sand: Savalon golf: Troi di golf park: Parc - common_only: Comugnâi + common: Comugnâi resident: Zone residenziâl retail: Zone di buteghis industrial: Zone industriâl commercial: Aree comerciâl - lake_only: Lâc + lake: Lâc cemetery: Simiteri pitch: Cjamp sportîf centre: Centri sportîf reserve: Riserve naturâl military: Zone militâr - school_only: Scuele - university: universitât - hospital: ospedâl + school: Scuele + university: Universitât + hospital: Ospedâl station: stazion de ferade tunnel: Rie a trats = galarie bridge: Rie nere = puint private: Acès privât construction: Stradis in costruzion + bus_stop: Fermade autobus + stop: Fermade + bicycle_shop: Buteghe di bicicletis welcome: title: Benvignût! whats_on_the_map: @@ -1531,6 +1541,9 @@ fur: show: edit: Cambie delete: Elimine + confirm_delete: Vuelistu eliminâ cheste aplicazion? + client_id: ID dal client + client_secret: Segret dal client permissions: Permès oauth2_authorizations: new: @@ -1712,6 +1725,8 @@ fur: user_mutes: index: table: + thead: + actions: Azions tbody: send_message: Mande messaç notes: diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 77e9c1f79..e0339c5ca 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -1378,9 +1378,9 @@ fy: reports: one: 1 melding other: '%{count} meldings' - report_created_at: Earst meld op %{datetime} - last_resolved_at: Lêst oplost op %{datetime} - last_updated_at: Lêst bywurke op %{datetime} troch %{displayname} + report_created_at_html: Earst meld op %{datetime} + last_resolved_at_html: Lêst oplost op %{datetime} + last_updated_at_html: Lêst bywurke op %{datetime} troch %{displayname} resolve: Oplosse ignore: Negearje reopen: Weriepenje @@ -2036,21 +2036,21 @@ fy: subway: Metrospoar cable_car: Kabelbaan chair_lift: stuoltsjelift - runway_only: Start-/lânings- + runway: Start-/lânings- taxiway: taksybaan lofthaven - apron_only: Platfoarm + apron: Platfoarm admin: Bestjoerlike grins - forest_only: Bosk + forest: Bosk wood: Wâld golf: Golfbaan park: Park - common_only: Miente + common: Miente resident: Wengebiet retail: Winkelgebiet industrial: Yndustrygebiet commercial: Kommersjeel gebiet heathland: Heidelân - lake_only: Mar + lake: Mar reservoir: opslachmar farm: Boerepleats brownfield: Braaklân @@ -2060,11 +2060,11 @@ fy: centre: Sportsintrum reserve: Natuerreservaat military: Militêr terrein - school_only: Skoalle + school: Skoalle university: universiteit building: Wichtich gebou station: Spoarweistasjon - summit_only: Top + summit: Top peak: pyk tunnel: Streekte râne = tunnel bridge: Swarte râne = brêge diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 9eef93667..0b7c35521 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1005,9 +1005,9 @@ ga: zero: Tuairisc ar bith one: Tuairisc amháin other: '%{count} tuairisc' - report_created_at: Tuairiscíodh den chéad uair ag %{datetime} - last_resolved_at: Réitithe den uair dheirineach ag %{datetime} - last_updated_at: Rinne %{displayname} an nuashonrú is déanaí ag %{datetime} + report_created_at_html: Tuairiscíodh den chéad uair ag %{datetime} + last_resolved_at_html: Réitithe den uair dheirineach ag %{datetime} + last_updated_at_html: Rinne %{displayname} an nuashonrú is déanaí ag %{datetime} resolve: Réitigh ignore: Tabhair neamhaird air reopen: Athoscail @@ -1545,21 +1545,21 @@ ga: subway: Meitreo cable_car: Carr cábla chair_lift: cathaoir chábla - runway_only: Rúidbhealach Aerfoirt + runway: Rúidbhealach Aerfoirt taxiway: bealach innealta - apron_only: Naprún Aerfoirt + apron: Naprún Aerfoirt admin: Teorainn riaracháin - forest_only: Foraois + forest: Foraois wood: Coill golf: Galfchúrsa park: Páirc - common_only: Coimín + common: Coimín resident: Ceantar cónaithe retail: Limistéar miondíola industrial: Limistéar tionsclaíoch commercial: Limistéar tráchtála heathland: Móinteach/fraochmhá - lake_only: Loch + lake: Loch reservoir: taiscumar farm: Feirm brownfield: Láithreán athfhorbraíochta @@ -1569,11 +1569,11 @@ ga: centre: Ionad spóirt reserve: Tearmann dúlra military: Limistéar míleata - school_only: Scoil + school: Scoil university: ollscoil building: Foirgneamh suntasach station: Stáisiún Iarnróid - summit_only: Mullach + summit: Mullach peak: binn tunnel: Líne bhriste = tollán bridge: Líne dhubh = droichead diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index f78512306..7f9eb131c 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -211,6 +211,8 @@ gcf: chair_lift: Sizé a kab aeroway: aerodrome: Layodwòm + runway: Pis a dékolaj + taxiway: Koulwa a avyon terminal: Tèminal a layopò amenity: bench: ban-fennyan @@ -487,10 +489,10 @@ gcf: table: entry: train: Tren - forest_only: Granbwa - grass_only: Zèb + forest: Granbwa + grass: Zèb cemetery: Simityè - school_only: Lékòl + school: Lékòl hospital: Lopital welcome: rules: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 92ea3630d..99a76fa5c 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1400,21 +1400,21 @@ gd: subway: Meatro cable_car: Carbad-càbaill chair_lift: Lioft-sèitheir - runway_only: Raon-laighe puirt-adhair + runway: Raon-laighe puirt-adhair taxiway: Raon-cuairteachaidh - apron_only: Aparan puirt-adhair + apron: Aparan puirt-adhair admin: Crìoch rianachd - forest_only: Coille + forest: Coille wood: Coille golf: Raon goilf park: Pàirc - common_only: Coitcheann + common: Coitcheann resident: Raon-còmhnaidh retail: Raon bhuitean industrial: Raon gnìomhachais commercial: Raon malairt heathland: Aonach - lake_only: Loch + lake: Loch reservoir: Loch-tasgaidh farm: Tuathanas brownfield: Fearann fàs @@ -1424,11 +1424,11 @@ gd: centre: Ionad-spòrs reserve: Tèarmann nàdair military: Raon an airm - school_only: Sgoil + school: Sgoil university: Oilthigh building: Togalach cudromach station: Stèisean-rèile - summit_only: Mullach + summit: Mullach peak: Sgurr tunnel: Oir-strìochagan = tunail bridge: Oir-loidhnichean = drochaid diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 61d378d9c..06341c1b5 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1490,9 +1490,9 @@ gl: one: '%{count} denuncia' other: '%{count} denuncias' no_reports: Sen denuncias - report_created_at: Primeira incidencia o %{datetime} - last_resolved_at: Resolto por derradeira vez o %{datetime} - last_updated_at: Última actualización o %{datetime} por %{displayname} + report_created_at_html: Primeira incidencia o %{datetime} + last_resolved_at_html: Resolto por derradeira vez o %{datetime} + last_updated_at_html: Última actualización o %{datetime} por %{displayname} resolve: Resolver ignore: Ignorar reopen: Reabrir @@ -2385,29 +2385,29 @@ gl: subway: Metro ferry: Transbordador light_rail: Metro lixeiro - tram_only: Tranvía + tram: Tranvía trolleybus: Trolebús bus: Autobús cable_car: Teleférico chair_lift: Telecadeira - runway_only: Pista do aeroporto + runway: Pista do aeroporto taxiway: Vía de circulación do aeroporto - apron_only: Plataforma do aeroporto + apron: Plataforma do aeroporto admin: Límite administrativo capital: Capital city: Cidade - orchard_only: Horta + orchard: Horta vineyard: Viñedo - forest_only: Bosque + forest: Bosque wood: Bosque farmland: Terra de labranza - grass_only: Herba + grass: Herba meadow: Pradaría bare_rock: Rocha núa sand: Area golf: Campo de golf park: Parque - common_only: Espazo común + common: Espazo común built_up: Zona edificada resident: Zona residencial retail: Zona comercial @@ -2415,7 +2415,7 @@ gl: commercial: Zona de oficinas heathland: Breixeira scrubland: Matogueira - lake_only: Lagoa + lake: Lagoa reservoir: Encoro intermittent_water: Masa de auga intermitente glacier: Glaciar @@ -2429,12 +2429,12 @@ gl: centre: Centro deportivo reserve: Reserva natural military: Zona militar - school_only: Escola + school: Escola university: Universidade hospital: Hospital building: Edificio significativo station: Estación de ferrocarrís - summit_only: Cumio + summit: Cumio peak: Cume tunnel: Bordo a raias = túnel bridge: Bordo negro = ponte diff --git a/config/locales/he.yml b/config/locales/he.yml index dbd578320..0806b4254 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1521,9 +1521,9 @@ he: many: '%{count} דו״חות' other: '%{count} דו״חות' no_reports: אין דיווחים - report_created_at: דיווח ראשון ב־%{datetime} - last_resolved_at: נפתר לאחרונה ב־%{datetime} - last_updated_at: עדכון אחרון ב־%{datetime} על־ידי %{displayname} + report_created_at_html: דיווח ראשון ב־%{datetime} + last_resolved_at_html: נפתר לאחרונה ב־%{datetime} + last_updated_at_html: עדכון אחרון ב־%{datetime} על־ידי %{displayname} resolve: לפתור ignore: התעלמות reopen: פתיחה מחדש @@ -2375,29 +2375,29 @@ he: subway: רכבת תחתית ferry: מעבורת light_rail: רכבת קלה - tram_only: חשמלית + tram: חשמלית trolleybus: טרוליבוס bus: אוטובוס cable_car: רכבל chair_lift: רכבל מושבים - runway_only: מסלול נחיתה + runway: מסלול נחיתה taxiway: מסלול הסעה - apron_only: רחבת חניה למטוסים + apron: רחבת חניה למטוסים admin: גבול שטח שיפוט capital: בירה city: עיר - orchard_only: מטע + orchard: מטע vineyard: כרם - forest_only: יער + forest: יער wood: חורשה farmland: שטח חקלאי - grass_only: דשא + grass: דשא meadow: אחו bare_rock: סלע חשוף sand: חול golf: מסלול גולף park: פארק - common_only: מרעה + common: מרעה built_up: שטח בנוי resident: אזור מגורים retail: אזור קמעונאי @@ -2405,7 +2405,7 @@ he: commercial: אזור מסחרי heathland: שדה פרא scrubland: בתה - lake_only: אגם + lake: אגם reservoir: מאגר intermittent_water: גוף מים תקופתי glacier: קרחון יבשתי @@ -2419,12 +2419,12 @@ he: centre: מרכז ספורט reserve: שמורת טבע military: שטח צבאי - school_only: בית ספר + school: בית ספר university: אוניברסיטה hospital: בית חולים building: בניין בעל חשיבות station: תחנת רכבת - summit_only: פסגה + summit: פסגה peak: פסגה tunnel: קו מקווקו = מנהרה bridge: קו שחור = גשר diff --git a/config/locales/hi.yml b/config/locales/hi.yml index f4b73c42c..923e60ef0 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -985,20 +985,20 @@ hi: subway: उपमार्ग bus: बस cable_car: केबल कार - runway_only: एयरपोर्ट रनवे - forest_only: वन + runway: एयरपोर्ट रनवे + forest: वन wood: लकड़ी - grass_only: घास + grass: घास sand: रेत golf: गोल्फ मैदान park: पार्क resident: रिहायशी क्षेत्र industrial: औद्योगिक क्षेत्र - lake_only: झील + lake: झील farm: खेत cemetery: कब्रिस्तान allotments: आवंटन - school_only: पाठशाला + school: पाठशाला university: विश्वविद्यालय hospital: अस्पताल building: महत्वपूर्ण भवन diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a79599127..1547a548f 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1427,21 +1427,21 @@ hr: subway: Podzemna željeznica cable_car: Kabinska žičara chair_lift: sedežnica - runway_only: Aerodromska pista + runway: Aerodromska pista taxiway: aerodromske ceste (za avione) - apron_only: Parking za avione (apron) + apron: Parking za avione (apron) admin: Administrativna granica - forest_only: Å uma (održavane, od Å¡umarije) + forest: Å uma (održavane, od Å¡umarije) wood: Å ume (prirodne, neodržavane) golf: Golf teren park: Park - common_only: Travnjaci + common: Travnjaci resident: Stambeno područje retail: Maloprodajno područje industrial: Industrijsko područje commercial: Poslovno područje heathland: GustiÅ¡, makija, grmlje - lake_only: Jezero + lake: Jezero reservoir: rezervoar farm: Polja, farme, njive brownfield: GradiliÅ¡te @@ -1451,11 +1451,11 @@ hr: centre: Sportski centar reserve: Rezervat prirode military: Vojno područje - school_only: Å kola + school: Å kola university: SveučiliÅ¡te building: Zgrada station: Željeznički kolodvor - summit_only: Vrh + summit: Vrh peak: vrhunac tunnel: Iscrtkani rubovi = tunel bridge: Crni rubovi = most diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index acf341434..62ebac442 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1363,9 +1363,9 @@ hsb: zero: Žane rozprawy one: Jedna rozprawa other: '%{count} rozprawje' - report_created_at: Prěni raz rozprawjene dnja %{datetime} - last_resolved_at: Posledni raz rozrisany dnja %{datetime} - last_updated_at: Posledni raz aktualizowany dnja %{datetime} wot %{displayname} + report_created_at_html: Prěni raz rozprawjene dnja %{datetime} + last_resolved_at_html: Posledni raz rozrisany dnja %{datetime} + last_updated_at_html: Posledni raz aktualizowany dnja %{datetime} wot %{displayname} resolve: Rozrisać ignore: Ignorować reopen: Zaso wočinić @@ -2009,21 +2009,21 @@ hsb: subway: Podzemska železnica cable_car: Kablowa nadróžna chair_lift: sydłowy lift - runway_only: Přizemišćo + runway: Přizemišćo taxiway: lětadłowa jězdnja - apron_only: Lětanišćowe předpolo + apron: Lětanišćowe předpolo admin: Zarjadniska hranica - forest_only: Hajina + forest: Hajina wood: Lěs golf: Golfownišćo park: Park - common_only: PowÅ¡itkowny + common: PowÅ¡itkowny resident: Bydlenski wobwod retail: Nakupowanišćo industrial: Industrijowa kónčina commercial: Přemysłowa kónčina heathland: Hola - lake_only: Jězor + lake: Jězor reservoir: spjaty jězor farm: Farma brownfield: Industrijowe lado @@ -2033,11 +2033,11 @@ hsb: centre: Sportowy centrum reserve: PřirodoÅ¡kitne pasmo military: Wojerske pasmo - school_only: Å ula + school: Å ula university: uniwersita building: Wuznamne twarjenje station: Dwórnišćo - summit_only: WjerÅ¡k + summit: WjerÅ¡k peak: kónčk hory tunnel: Smužkowana kroma = tunl bridge: Čorna kroma = móst diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 534ace200..a22dfbd51 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1474,9 +1474,9 @@ hu: one: '%{count} bejelentés' other: '%{count} bejelentés' no_reports: Nincs bejelentés - report_created_at: Először bejelentve %{datetime} időpontban - last_resolved_at: Utoljára megoldva %{datetime} időpontban - last_updated_at: Utoljára frissítve %{displayname} által %{datetime} időpontban + report_created_at_html: Először bejelentve %{datetime} időpontban + last_resolved_at_html: Utoljára megoldva %{datetime} időpontban + last_updated_at_html: Utoljára frissítve %{displayname} által %{datetime} időpontban resolve: Megoldás ignore: Figyelmen kívül hagyás reopen: Újramegnyitás @@ -2259,34 +2259,34 @@ hu: subway: Metró ferry: Komp light_rail: HÉV - tram_only: Villamos + tram: Villamos trolleybus: Trolibusz bus: Busz cable_car: Nagykabinos felvonó chair_lift: Ülőlift - runway_only: Kifutópálya + runway: Kifutópálya taxiway: Gurulóút - apron_only: Forgalmi előtér + apron: Forgalmi előtér admin: Közigazgatási határ - orchard_only: Gyümölcsös + orchard: Gyümölcsös vineyard: Szőlő - forest_only: Erdő + forest: Erdő wood: Természetes erdő farmland: Mezőgazdasági terület - grass_only: Fű + grass: Fű meadow: Rét bare_rock: Csupasz szikla sand: Homok golf: Golfpálya park: Park - common_only: Füves terület + common: Füves terület built_up: Beépített terület resident: Gyalogos övezet retail: Kereskedelmi terület industrial: Ipari terület commercial: Kereskedelmi terület heathland: Fenyér - lake_only: Tó + lake: Tó reservoir: Víztározó intermittent_water: Időszakos víztest glacier: Gleccser @@ -2300,12 +2300,12 @@ hu: centre: Sportközpont reserve: Természetvédelmi terület military: Katonai terület - school_only: Iskola + school: Iskola; egyetem university: Egyetem hospital: Kórház building: Fontosabb épület station: Vasútállomás - summit_only: Hegycsúcs + summit: Hegycsúcs peak: Hegycsúcs tunnel: Szaggatott szegély = alagút bridge: Fekete szegély = híd diff --git a/config/locales/ia.yml b/config/locales/ia.yml index ac7a08dbc..6aace21cd 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1468,9 +1468,9 @@ ia: one: '%{count} reporto' other: '%{count} reportos' no_reports: Nulle reporto - report_created_at: 'Prime reporto: %{datetime}' - last_resolved_at: 'Ultime resolution: %{datetime}' - last_updated_at: 'Ultime actualisation: %{datetime} per %{displayname}' + report_created_at_html: 'Prime reporto: %{datetime}' + last_resolved_at_html: 'Ultime resolution: %{datetime}' + last_updated_at_html: 'Ultime actualisation: %{datetime} per %{displayname}' resolve: Resolver ignore: Ignorar reopen: Reaperir @@ -2335,27 +2335,27 @@ ia: subway: Metro ferry: Ferry-boat light_rail: Ferrovia legier - tram_only: Tram + tram: Tram trolleybus: Trolleybus bus: Autobus cable_car: Telepherico chair_lift: Telesedia - runway_only: Pista de aeroporto + runway: Pista de aeroporto taxiway: Via de circulation pro aviones - apron_only: Platteforma pro aviones + apron: Platteforma pro aviones admin: Limite administrative - orchard_only: Verdiero + orchard: Verdiero vineyard: Vinia - forest_only: Foreste + forest: Foreste wood: Bosco farmland: Terra agricole - grass_only: Herba + grass: Herba meadow: Prato bare_rock: Rocca nude sand: Sablo golf: Percurso de golf park: Parco - common_only: Commun + common: Commun built_up: Area edificate resident: Area residential retail: Zona de commercio al detalio @@ -2363,7 +2363,7 @@ ia: commercial: Area commercial heathland: Landa scrubland: Terreno de brossas - lake_only: Laco + lake: Laco reservoir: Reservoir intermittent_water: Massa de aqua intermittente glacier: Glaciero @@ -2377,12 +2377,12 @@ ia: centre: Centro de sport reserve: Reserva natural military: Area militar - school_only: Schola + school: Schola university: Universitate hospital: Hospital building: Edificio significante station: Station ferroviari - summit_only: Summitate + summit: Summitate peak: Picco tunnel: Bordo a lineettas = tunnel bridge: Bordo nigre = ponte diff --git a/config/locales/id.yml b/config/locales/id.yml index 7a6007a80..0ee57a368 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1461,9 +1461,9 @@ id: zero: Tak ada one: satu other: '%{count} laporan' - report_created_at: Pertama dilaporkan pada %{datetime} - last_resolved_at: Terakhir diselesaikan pada %{datetime} - last_updated_at: Terakhir diubah pada %{datetime} oleh %{displayname} + report_created_at_html: Pertama dilaporkan pada %{datetime} + last_resolved_at_html: Terakhir diselesaikan pada %{datetime} + last_updated_at_html: Terakhir diubah pada %{datetime} oleh %{displayname} resolve: Selesaikan ignore: Abaikan reopen: Buka lagi @@ -2293,21 +2293,21 @@ id: subway: Kereta bawah tanah cable_car: Kereta Kabel chair_lift: Kereta Gantung - runway_only: Landasan bandara + runway: Landasan bandara taxiway: landas hubung - apron_only: Tempat Parkir Pesawat + apron: Tempat Parkir Pesawat admin: Batas administrasi - forest_only: Hutan + forest: Hutan wood: Kayu golf: Lapangan Golf park: Taman - common_only: Umum + common: Umum resident: Area Permukiman retail: Area pertokoan industrial: Kawasan industri commercial: Area komersial heathland: Semak - lake_only: Danau + lake: Danau reservoir: Wilayah Serapan (Reservoir) farm: Pertanian brownfield: Lahan kosong @@ -2317,11 +2317,11 @@ id: centre: Pusat Olahraga reserve: Cagar Alam military: Kawasan militer - school_only: Sekolah + school: Sekolah university: universitas building: Bangunan Penting station: Stasiun Kereta Api - summit_only: Puncak + summit: Puncak peak: puncak tunnel: Dashed Casing = terowongan bridge: Black casing = jembatan diff --git a/config/locales/is.yml b/config/locales/is.yml index e7a0944b1..512db18bd 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1459,9 +1459,9 @@ is: one: '%{count} skýrsla' other: '%{count} skýrslur' no_reports: Engar skýrslur - report_created_at: Fyrst tilkynnt %{datetime} - last_resolved_at: Síðast leyst %{datetime} - last_updated_at: Síðast uppfært %{datetime} af %{displayname} + report_created_at_html: Fyrst tilkynnt %{datetime} + last_resolved_at_html: Síðast leyst %{datetime} + last_updated_at_html: Síðast uppfært %{datetime} af %{displayname} resolve: Leysa ignore: Hunsa reopen: Enduropna @@ -2369,21 +2369,21 @@ is: subway: Neðanjarðarlest cable_car: Kláflyfta chair_lift: stólalyfta - runway_only: Flugbraut + runway: Flugbraut taxiway: akstursbraut - apron_only: Flughlað + apron: Flughlað admin: Stjórnsýslumörk - forest_only: Ræktaður skógur + forest: Ræktaður skógur wood: Náttúrulegur skógur golf: Golfvöllur park: Almenningsgarður - common_only: Almenningur + common: Almenningur resident: Íbúðasvæði retail: Smásölusvæði industrial: Iðnaðarsvæði commercial: Verslunarsvæði heathland: Heiðalönd - lake_only: Vatn + lake: Vatn reservoir: uppistöðulón farm: Bóndabær brownfield: Nýbyggingarsvæði @@ -2393,11 +2393,11 @@ is: centre: Íþróttamiðstöð reserve: Náttúruverndarsvæði military: Hersvæði - school_only: Skóli + school: Skóli university: Háskóli building: Merkisbygging station: Lestarstöð - summit_only: Fjallstindur + summit: Fjallstindur peak: tindur tunnel: Umkringt punktalínum = göng bridge: Umkringt svartri línu = brú diff --git a/config/locales/it.yml b/config/locales/it.yml index fd091eff8..e8d910c81 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1528,9 +1528,9 @@ it: one: '%{count} segnalazione' other: '%{count} segnalazioni' no_reports: Nessuna segnalazione - report_created_at: Segnalato per la prima volta il %{datetime} - last_resolved_at: Risolto per l’ultima volta il %{datetime} - last_updated_at: Aggiornato per l’ultima volta il %{datetime} da %{displayname} + report_created_at_html: Segnalato per la prima volta il %{datetime} + last_resolved_at_html: Risolto per l’ultima volta il %{datetime} + last_updated_at_html: Aggiornato per l’ultima volta il %{datetime} da %{displayname} resolve: Risolvi ignore: Ignora reopen: Riapri @@ -2017,6 +2017,7 @@ it: image: Immagine alt: Testo alternativo url: URL + codeblock: Blocco di codice richtext_field: edit: Modifica preview: Anteprima @@ -2397,42 +2398,43 @@ it: cycleway_national: Pista ciclabile nazionale cycleway_regional: Pista ciclabile regionale cycleway_local: Pista ciclabile locale + cycleway_mtb: Percorso in mountain bike footway: Percorso pedonale rail: Ferrovia train: Treno subway: Metropolitana ferry: Traghetto light_rail: Metropolitana leggera - tram_only: Tram + tram: Tram trolleybus: Filobus bus: Autobus cable_car: Funivia chair_lift: Seggiovia - runway_only: Pista di decollo/atterraggio + runway: Pista di decollo/atterraggio taxiway: Pista di rullaggio - apron_only: Area di parcheggio aeroportuale + apron: Area di parcheggio aeroportuale admin: Confine amministrativo capital: Capitale city: Città - orchard_only: Frutteto + orchard: Frutteto vineyard: Vigneto - forest_only: Foresta + forest: Foresta wood: Bosco farmland: Terreno agricolo - grass_only: Prato + grass: Prato meadow: Prato bare_rock: Roccia nuda sand: Sabbia golf: Campo da golf park: Parco - common_only: Area comune + common: Area comune resident: Zona residenziale retail: Zona con negozi industrial: Zona industriale commercial: Zona di uffici heathland: Brughiera scrubland: Macchia - lake_only: Lago + lake: Lago reservoir: Riserva idrica intermittent_water: Corpo idrico intermittente glacier: Ghiacciaio @@ -2446,12 +2448,12 @@ it: centre: Centro sportivo reserve: Riserva naturale military: Area militare - school_only: Scuola + school: Scuola university: Università hospital: Ospedale building: Edificio significativo station: Stazione ferroviaria - summit_only: Vetta + summit: Vetta peak: Picco montuoso tunnel: Linea tratteggiata = tunnel bridge: Quadrettatura nera = ponte diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 9e8876e6e..127ec058d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1427,9 +1427,9 @@ ja: reports: other: '%{count}件のレポート' no_reports: 報告はありません - report_created_at: 最初の通報は%{datetime}です - last_resolved_at: 最近の更新は%{datetime}です - last_updated_at: 最近の更新は%{displayname}による%{datetime}の版です + report_created_at_html: 最初の通報は%{datetime}です + last_resolved_at_html: 最近の更新は%{datetime}です + last_updated_at_html: 最近の更新は%{displayname}による%{datetime}の版です resolve: 解決 ignore: 無視 reopen: 再開 @@ -2027,21 +2027,21 @@ ja: subway: 地下鉄 cable_car: 交走式ロープウェイ chair_lift: チェアリフト - runway_only: 空港滑走路 + runway: 空港滑走路 taxiway: 空港誘導路 - apron_only: 空港ビル + apron: 空港ビル admin: 行政境界 - forest_only: 森 + forest: 森 wood: 森林 golf: ゴルフ場 park: 公園 - common_only: 共有地 + common: 共有地 resident: 住宅地 retail: 小売業地域 industrial: 工業地域 commercial: オフィス地域 heathland: 荒地 - lake_only: 湖 + lake: 湖 reservoir: 溜池 farm: 農牧場 brownfield: 褐色地 @@ -2051,11 +2051,11 @@ ja: centre: スポーツセンター reserve: 自然保護区 military: 軍用地域 - school_only: 学校 + school: 学校 university: 大学 building: 重要建造物 station: 鉄道駅 - summit_only: 山脈 + summit: 山脈 peak: 山頂 tunnel: 点線の枠 = トンネル bridge: 黒枠 = 橋梁 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 1ba4bd622..19c5b53a1 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -943,15 +943,15 @@ ka: rail: რკინიგზა subway: მეტრო cable_car: საბაგირო გზა - runway_only: აეროპორტის ასაფრენ-დასაფრენი ბილიკი + runway: აეროპორტის ასაფრენ-დასაფრენი ბილიკი admin: ადმინისტრაციული საზღვარი - forest_only: ტყე + forest: ტყე wood: ტყე golf: გოლფის მოედანი park: პარკი resident: საცხოვრებელი ტერიტორია commercial: კომერციული ტერიტორია - lake_only: ტბა + lake: ტბა reservoir: წყალსაცავი farm: ფერმა cemetery: სასაფლაო @@ -959,10 +959,10 @@ ka: centre: სპორტული ცენტრი reserve: ნაკრძალი military: სამხედრო ტერიტორია - school_only: სკოლა + school: სკოლა university: უნივერსიტეტი station: რკინიგზის სადგური - summit_only: მწვერვალი + summit: მწვერვალი peak: პიკი traces: new: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index b82af9366..422a99210 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -1120,9 +1120,9 @@ kab: key: table: entry: - forest_only: Tiẓgi - lake_only: Amdun - school_only: AÉ£erbaz + forest: Tiẓgi + lake: Amdun + school: AÉ£erbaz university: Tasdawit welcome: title: Aná¹£uf! diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml index 19365c90b..918147ef5 100644 --- a/config/locales/kk-cyrl.yml +++ b/config/locales/kk-cyrl.yml @@ -972,22 +972,22 @@ kk-cyrl: unclassified: Жергілікті жол rail: Темір жол subway: Метро - apron_only: Әуежай перроны + apron: Әуежай перроны admin: Әкімшілік шекара - forest_only: Орман + forest: Орман golf: Гольф алаңы park: Саябақ resident: Тұрғын аудан retail: Сауда аймағы industrial: Өнеркәсіп аймағы - lake_only: Көл + lake: Көл farm: Ферма cemetery: Зират allotments: Саяжайлар pitch: Спорт алаңы centre: Спорт орталығы military: Әскери аймақ - school_only: Мектеп + school: Мектеп university: университет building: Елеулі ғимарат station: Темір жол бекеті diff --git a/config/locales/km.yml b/config/locales/km.yml index 70a1a6812..6d6d5d65d 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -724,12 +724,12 @@ km: rail: ផ្លូវដែក subway: ផ្លូវដែកក្រោមដី admin: ព្រំដែនរដ្ឋបាល - forest_only: ព្រៃឈើ​ + forest: ព្រៃឈើ​ park: ឧទ្យាន​ industrial: តំបន់ឧស្សាហកម្ម​ farm: កសិដ្ឋាន​ centre: មជ្ឈមណ្ឌល​កីឡា​ - school_only: សាលារៀន​ + school: សាលារៀន​ university: សាកលវិទ្យាល័យ​ station: ស្ថានីយ៍ផ្លូវដែក traces: diff --git a/config/locales/kn.yml b/config/locales/kn.yml index 5e68c9f67..507204557 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -868,14 +868,14 @@ kn: table: entry: main_road: ಮುಖ್ಯ ರಸ್ತೆ - forest_only: ಅರಣ್ಯ + forest: ಅರಣ್ಯ park: ಉದ್ಯಾನ resident: ವಾಸ ಮಾಡುವ ಸ್ಥಳ - lake_only: ಕೆರೆ + lake: ಕೆರೆ reservoir: ಅಣೆಕಟ್ಟು farm: ಒಕ್ಕಲು ಜಮೀನು cemetery: ಸ್ಮಾಶಾಣ - school_only: ಪಾಠಶಾಲೆ + school: ಪಾಠಶಾಲೆ university: ವಿಶ್ವವಿದ್ಯಾಲಯ station: ರೈಲು ನಿಲ್ದಾಣ welcome: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 1b6fcaa49..28a6ae630 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1406,9 +1406,9 @@ ko: reports: other: 신고 %{count}ê±´ no_reports: 보고서 없음 - report_created_at: '%{datetime}에 처음 보고됨' - last_resolved_at: '%{datetime}에 마지막으로 해결됨' - last_updated_at: '%{displayname}에 의해 %{datetime}에 마지막으로 갱신됨' + report_created_at_html: '%{datetime}에 처음 보고됨' + last_resolved_at_html: '%{datetime}에 마지막으로 해결됨' + last_updated_at_html: '%{displayname}에 의해 %{datetime}에 마지막으로 갱신됨' resolve: 해결 ignore: 무시 reopen: 다시 열림 @@ -2158,21 +2158,21 @@ ko: subway: 지하철 cable_car: 케이블 ì¹´ chair_lift: 체어 리프트 - runway_only: 공항 활주로 + runway: 공항 활주로 taxiway: 공항 유도로 - apron_only: 공항 계류장 + apron: 공항 계류장 admin: 행정 구역 경계 - forest_only: 숲 + forest: 숲 wood: 산림 golf: 골프장 park: 공원 - common_only: 공유지 + common: 공유지 resident: 주거 지역 retail: 소매 지역 industrial: 산업 지역 commercial: 상업/관공서 지역 heathland: 황무지 - lake_only: 호수 + lake: 호수 reservoir: 저수지 farm: 농장 brownfield: 재개발지역 @@ -2182,11 +2182,11 @@ ko: centre: 스포츠 센터 reserve: 자연 보호구역 military: 군사 지역 - school_only: 학교 + school: 학교 university: 대학 building: 주요 건물 station: 철도역 - summit_only: 산꼭대기 + summit: 산꼭대기 peak: 봉우리 tunnel: 점선 테두리 = 터널 bridge: 검은 테두리 = 다리 diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml index eebd7da5c..f9a7e9e89 100644 --- a/config/locales/ksh.yml +++ b/config/locales/ksh.yml @@ -281,21 +281,21 @@ ksh: subway: U-Bahn cable_car: Seilbahn chair_lift: Sässelbahn - runway_only: Startbahn, Landebahn + runway: Startbahn, Landebahn taxiway: Rollwääsch om Fluchhaaven - apron_only: Halldepläz om Fluchveäld + apron: Halldepläz om Fluchveäld admin: Verwalldongsjränz - forest_only: Wald, Bösch + forest: Wald, Bösch wood: Urwald golf: Jolfplaz park: Park - common_only: öffentlesch Land + common: öffentlesch Land resident: Wohnjebeet retail: Einkaufszentrum industrial: Industriejebeet commercial: Jewerbejebeet heathland: Heed - lake_only: See, Wejer + lake: See, Wejer reservoir: Stausee farm: Buurehoff brownfield: Industriebrachland @@ -305,11 +305,11 @@ ksh: centre: Schpochtzäntom reserve: Naturschozjebeet military: Jebeet vum Kammiß - school_only: Scholl + school: Scholl university: Univäsität building: Weeschtesch Bouwärk station: Bahnhoff - summit_only: Bärschspez + summit: Bärschspez peak: Bärschspez tunnel: Rand jeschtreschelt = Tunnell bridge: Fätte Rand = Bröck diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 00863d231..9f5facc58 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -1435,10 +1435,10 @@ ku-Latn: one: '%{count} rapor' other: '%{count} raporan' no_reports: Ti raporekî tine - report_created_at: Pêşî di %{datetime} de hatiye raporkirin - last_resolved_at: Herî dawî di %{datetime} de hat çareserkirin - last_updated_at: Ji aliyê %{displayname} ve herî dawî di %{datetime} de hat - rojanekirin + report_created_at_html: Pêşî di %{datetime} de hatiye raporkirin + last_resolved_at_html: Herî dawî di %{datetime} de hat çareserkirin + last_updated_at_html: Ji aliyê %{displayname} ve herî dawî di %{datetime} de + hat rojanekirin resolve: Çareser bike ignore: Guh nedê reopen: Dîsa veke @@ -2124,21 +2124,21 @@ ku-Latn: subway: Metro cable_car: Teleferîk chair_lift: Teleferîk - runway_only: Pîsta balafirgehê + runway: Pîsta balafirgehê taxiway: Rêya balafirgehê yê çûnûhatinê - apron_only: Aprona balafirgehê + apron: Aprona balafirgehê admin: Sînorê îdarî - forest_only: Daristan + forest: Daristan wood: Daristan (bêçavdêrî, wek-xwe-hêlayî) golf: Cihê golfê park: Park - common_only: Erda mişterek + common: Erda mişterek resident: Cihê îkametê retail: Saheya Perakendeyê (Maxazayan) industrial: Cihê endustriyê commercial: Herêma bazirganiyê heathland: Erdê qeraç - lake_only: Gol + lake: Gol reservoir: Gola sûnî farm: Cotgeh brownfield: Erdê vala @@ -2148,11 +2148,11 @@ ku-Latn: centre: Navenda sporê reserve: Herêma muhefezekirî ya tebîetê military: Qada eskerî - school_only: Dibistan + school: Dibistan university: Unîversîte building: Avahiya girîng station: Stasyona trênê - summit_only: Lûtke + summit: Lûtke peak: Lûtke tunnel: Xeta qutqutî = tûnel bridge: Xeta reş = pir diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 857c19138..e2daa23bb 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1406,9 +1406,9 @@ lb: reports: one: '%{count} Meldung' other: '%{count} Meldungen' - report_created_at: Fir d'éischt gemellt den %{datetime} - last_resolved_at: Fir d'lescht erleedegt den %{datetime} - last_updated_at: Fir d'lescht aktualiséiert den %{datetime} vun %{displayname} + report_created_at_html: Fir d'éischt gemellt den %{datetime} + last_resolved_at_html: Fir d'lescht erleedegt den %{datetime} + last_updated_at_html: Fir d'lescht aktualiséiert den %{datetime} vun %{displayname} resolve: Léisen ignore: Ignoréieren reopen: Nees opmaachen @@ -2043,29 +2043,29 @@ lb: train: Zuch subway: Metro ferry: Fär - tram_only: Tram + tram: Tram bus: Bus cable_car: Seelbunn chair_lift: Sessellift - runway_only: Start- a Landebunn + runway: Start- a Landebunn taxiway: Rullbunn admin: Verwaltungsgrenz capital: Haaptstad city: Stad - orchard_only: Bongert + orchard: Bongert vineyard: Wéngert - forest_only: Bësch + forest: Bësch wood: Bësch - grass_only: Wiss + grass: Wiss sand: Sand golf: Golfterrain park: Park - common_only: ëffentlech Gréngfläch (brit.) + common: ëffentlech Gréngfläch (brit.) retail: Akaafszentrum industrial: Industriezone commercial: Commercëgebitt heathland: Heed - lake_only: Séi + lake: Séi glacier: Gletscher farm: Bauerenhaff brownfield: Broochland @@ -2075,12 +2075,12 @@ lb: centre: Sportszenter reserve: Naturschutzgebitt military: Militärgebitt - school_only: Schoul + school: Schoul university: Universitéit hospital: Spidol building: Bedeitend Gebai station: Gare (Eisebunn) - summit_only: Spëtzt + summit: Spëtzt private: Privaten Terrain destination: Nëmme fir Leit mat Uleies construction: Stroossen am Bau diff --git a/config/locales/lt.yml b/config/locales/lt.yml index fba850f5e..6c5507279 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1382,9 +1382,9 @@ lt: many: '{%count} praneÅ¡imas' other: '%{count} praneÅ¡imų' no_reports: Jokių ataskaitų - report_created_at: Pirmą kartą praneÅ¡ta %{datetime} - last_resolved_at: Paskutinį kartą iÅ¡spręsta %{datetime} - last_updated_at: Paskutinį kartą atnaujinta %{datetime} naudotojo %{displayname} + report_created_at_html: Pirmą kartą praneÅ¡ta %{datetime} + last_resolved_at_html: Paskutinį kartą iÅ¡spręsta %{datetime} + last_updated_at_html: Paskutinį kartą atnaujinta %{datetime} naudotojo %{displayname} resolve: IÅ¡spręsti ignore: Ignoruoti reopen: IÅ¡ naujo atidaryti @@ -2080,21 +2080,21 @@ lt: subway: Metropoliteno linija cable_car: Lyno keltuvas chair_lift: keltuvas - runway_only: Kilimo takas + runway: Kilimo takas taxiway: Riedėjimo takas - apron_only: Oro uosto lėktuvų aikÅ¡telė + apron: Oro uosto lėktuvų aikÅ¡telė admin: Administracinės ribos - forest_only: MiÅ¡kas + forest: MiÅ¡kas wood: Medžių teritorija golf: Golfo laukas park: Parkas - common_only: Bendras + common: Bendras resident: Gyvenamoji zona retail: Mažmeninis rajonas industrial: Pramoninė zona commercial: Komericinis plotas heathland: Å ilynas - lake_only: Ežeras + lake: Ežeras reservoir: rezervuaras farm: Ūkis brownfield: Apleista teritorija @@ -2104,11 +2104,11 @@ lt: centre: Sporto centras reserve: Gamtos rezervatas military: Karinis rajonas - school_only: Mokykla + school: Mokykla university: universitetas building: Didelis pastatas station: Geležinkelio stotis - summit_only: VirÅ¡Å«nė + summit: VirÅ¡Å«nė peak: VirÅ¡ukalnė tunnel: Punktyriniai kraÅ¡tai = tiltas bridge: TamsÅ«s kraÅ¡tai = tiltas diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 21962b1cc..f45ca65a0 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1721,21 +1721,21 @@ lv: subway: Metro cable_car: TroÅ¡u ceļš chair_lift: krēslu pacēlājs - runway_only: Lidostas skrejceļš + runway: Lidostas skrejceļš taxiway: manevrēšanas ceļš - apron_only: Lidostas rampa + apron: Lidostas rampa admin: AdministratÄ«vā robeža - forest_only: Mežs + forest: Mežs wood: Pirmatnējs mežs golf: Golfa laukums park: Parks - common_only: KoplietoÅ¡anas zeme + common: KoplietoÅ¡anas zeme resident: DzÄ«vojamā zona retail: MazumtirdzniecÄ«bas zona industrial: RÅ«pniecÄ«bas zona commercial: TirdzniecÄ«bas zona heathland: TÄ«relis - lake_only: Ezeri + lake: Ezeri reservoir: Å«denskrātuves farm: SaimniecÄ«ba brownfield: Nekopta vieta @@ -1745,11 +1745,11 @@ lv: centre: Sporta centrs reserve: Dabas rezervāts military: Militārā zona - school_only: Skola + school: Skola university: universitāte building: Ēka station: Dzelzceļa stacija - summit_only: Virsotne + summit: Virsotne peak: smaile tunnel: Tunelis bridge: Tilts diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 7d2538a61..971277228 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -280,7 +280,7 @@ mk: accounts: edit: title: Уреди сметка - my settings: Мои прилагодувања + my settings: Мои нагодувања current email address: Тековна е-пошта external auth: Надворешна заверка openid: @@ -1468,9 +1468,9 @@ mk: one: '%{count} пријава' other: '%{count} пријави' no_reports: Нема пријави - report_created_at: Првпат пријавено на %{datetime} - last_resolved_at: Последно пријавено на %{datetime} - last_updated_at: Последно пријавено на %{datetime} од %{displayname} + report_created_at_html: Првпат пријавено на %{datetime} + last_resolved_at_html: Последно пријавено на %{datetime} + last_updated_at_html: Последно пријавено на %{datetime} од %{displayname} resolve: Реши ignore: Занемари reopen: Повторно отвори @@ -1630,6 +1630,8 @@ mk: loaded: one: успешно вчитано со %{trace_points} од %{count} можни точки. other: успешно вчитано со %{trace_points} од %{count} можни точки. + all_your_traces_html: Сите ваши успешно подигнати GPX-траги ќе ги најдете на + %{url}. subject: '[OpenStreetMap] Успешен увоз на GPX-податотека' signup_confirm: subject: '[OpenStreetMap] Добре дојдовте на OpenStreetMap' @@ -2342,29 +2344,29 @@ mk: subway: Метро ferry: Траект light_rail: Лека железница - tram_only: Трамвај + tram: Трамвај trolleybus: Тролејбус bus: Автобус cable_car: Клупна жичница chair_lift: Клупна жичница - runway_only: Аеродромска писта + runway: Аеродромска писта taxiway: Рулажна патека - apron_only: Аеродромска платформа + apron: Аеродромска платформа admin: Административна граница capital: Главен град city: Град - orchard_only: Овоштарник + orchard: Овоштарник vineyard: Лозје - forest_only: Шума + forest: Шума wood: Шума farmland: Земјоделско земјиште - grass_only: Трева + grass: Трева meadow: Ливада bare_rock: Гола карпа sand: Песок golf: Голф-терен park: Парк - common_only: Општествена земја + common: Општествена земја built_up: Изградено подрачје resident: Станбено подрачје retail: Трговско подрачје @@ -2372,7 +2374,7 @@ mk: commercial: Комерцијално подрачје heathland: Вресиште scrubland: Шикара - lake_only: Езеро + lake: Езеро reservoir: Резервоар intermittent_water: Повремена водна површина glacier: Ледник @@ -2386,12 +2388,12 @@ mk: centre: Спортски центар reserve: Природен резерват military: Воено подрачје - school_only: Училиште + school: Училиште university: Универзитет hospital: Болница building: Значајно здание station: Железничка станица - summit_only: Врв + summit: Врв peak: Врв tunnel: Испрекината линија = тунел bridge: Црна линија = мост @@ -2807,7 +2809,7 @@ mk: my notes: Мои белешки my messages: Мои пораки my profile: Мојот профил - my settings: Мои нагодувања + my settings: Мои поставки my comments: Мои коментари my_preferences: Мои нагодувања my_dashboard: Моја управувачница diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 86f0d903e..9a7a689a5 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1174,20 +1174,20 @@ mr: subway: मेट्रो cable_car: रज्जुमार्ग chair_lift: खुर्ची उद्वाहन - runway_only: विमानतळ धावपट्टी + runway: विमानतळ धावपट्टी taxiway: खेचमार्ग - apron_only: विमानतळावरील भरणतळ + apron: विमानतळावरील भरणतळ admin: प्रशासकीय सीमा - forest_only: वन + forest: वन wood: जंगल golf: गोल्फ कोर्स park: उद्यान - common_only: सार्वजनिक जमीन + common: सार्वजनिक जमीन resident: निवासी क्षेत्र retail: विक्री क्षेत्र industrial: औद्योगिक क्षेत्र commercial: वाणिज्यिक क्षेत्र - lake_only: तलाव + lake: तलाव reservoir: जलाशय farm: मळा cemetery: दफनभूमी @@ -1196,11 +1196,11 @@ mr: centre: क्रीडाकेंद्र reserve: अभयारण्य military: लष्करी क्षेत्र - school_only: शाळा + school: शाळा university: विद्यापीठ building: महत्वपूर्ण इमारत station: रेल्वे स्थानक - summit_only: शिखर + summit: शिखर peak: शिखर tunnel: तुटक कड = बोगदा bridge: काळी कड = पूल diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 925636d5e..bc61362c1 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1726,21 +1726,21 @@ ms: subway: Landasan bawah tanah cable_car: Kereta kabel chair_lift: lif kerusi - runway_only: Landasan kapal terbang + runway: Landasan kapal terbang taxiway: jalan rayap - apron_only: Kawasan gerak lapangan terbang + apron: Kawasan gerak lapangan terbang admin: Sempadan pentadbiran - forest_only: Hutan + forest: Hutan wood: Hutan kecil golf: Padang golf park: Taman - common_only: Tanah awam + common: Tanah awam resident: Kawasan perumahan retail: Kawasan peruncitan industrial: Kawasan perindustrian commercial: Kawasan perdagangan heathland: Kawasan rawa - lake_only: Tasik + lake: Tasik reservoir: takungan farm: Ladang brownfield: Tanah terbiar @@ -1750,11 +1750,11 @@ ms: centre: Pusat sukan reserve: Cagar alam military: Kawasan tentera - school_only: Sekolah + school: Sekolah university: universiti building: Bangunan penting station: Stesen keretapi - summit_only: Kemuncak + summit: Kemuncak peak: puncak tunnel: Kasing bertitik-titik = terowong bridge: Kasing hitam = jambatan diff --git a/config/locales/my.yml b/config/locales/my.yml index f02493973..2833f6f6f 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -689,12 +689,12 @@ my: bridleway: မြင်းစီးလမ်း cycleway: စက်ဘီးသွားလမ်း rail: ရထားလမ်း - runway_only: လေယာဉ်ကွင်းပြေးလမ်း - forest_only: သစ်တော + runway: လေယာဉ်ကွင်းပြေးလမ်း + forest: သစ်တော park: ပန်းခြံ - lake_only: ရေကန် + lake: ရေကန် cemetery: သုဿန် - school_only: ကျောင်း + school: ကျောင်း university: တက္ကသိုလ် station: ရထားဘူတာ construction: ဖောက်နေဆဲ လမ်းများ diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 82e7bc734..a58345208 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1276,9 +1276,9 @@ nb: one: '%{count} rapport' other: '%{count} rapporter' no_reports: Ingen rapporter - report_created_at: Første gang rapportert %{datetime} - last_resolved_at: Siste gang løst %{datetime} - last_updated_at: Siste gang oppdatert %{datetime} av %{displayname} + report_created_at_html: Første gang rapportert %{datetime} + last_resolved_at_html: Siste gang løst %{datetime} + last_updated_at_html: Siste gang oppdatert %{datetime} av %{displayname} resolve: Løs ignore: Se bort fra reopen: GjenÃ¥pne @@ -1843,21 +1843,21 @@ nb: subway: Undergrunnsbane cable_car: Kabelvogn chair_lift: stolheis - runway_only: Flystripe + runway: Flystripe taxiway: taksebane - apron_only: terminal + apron: terminal admin: Administrativ grense - forest_only: Skog + forest: Skog wood: Ved golf: Golfbane park: Park - common_only: Vanlig + common: Vanlig resident: BoligomrÃ¥de retail: DetaljsalgomrÃ¥de industrial: IndustriomrÃ¥de commercial: Kommersielt omrÃ¥de heathland: Heilandskap - lake_only: Innsjø + lake: Innsjø reservoir: reservoar farm: GÃ¥rd brownfield: Tidligere industriomrÃ¥de @@ -1867,11 +1867,11 @@ nb: centre: Sportssenter reserve: Naturreservat military: Militært omrÃ¥de - school_only: Skole + school: Skole university: universitet building: Viktig bygning station: Jernbanestasjon - summit_only: Topp + summit: Topp peak: fjelltopp tunnel: Streket kant = tunnel bridge: Sort kant = bru diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 0c30d907d..cb1eceeae 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -522,21 +522,21 @@ nds: subway: U-Bahn cable_car: Kavelbahn chair_lift: Skilift - runway_only: Fleger-Lannbahn + runway: Fleger-Lannbahn taxiway: Fleger-Rullweg - apron_only: Terminal + apron: Terminal admin: Grenz - forest_only: Forst + forest: Forst wood: Woold golf: Golfplatz park: Park - common_only: Wisch + common: Wisch resident: Wahnrebeed retail: Ladenrebeed industrial: Industrierebeed commercial: Hannelsrebeed heathland: Heid - lake_only: See + lake: See reservoir: Stausee farm: Buurnhoff brownfield: Industrie-Braakland @@ -546,11 +546,11 @@ nds: centre: Sportzentrum reserve: Naturpark military: Militärrebeed - school_only: School + school: School university: Universität building: Wichtig Bowark station: Bahnhoff - summit_only: Bargtopp + summit: Bargtopp peak: Bargtopp tunnel: Strekel-Rand = Tunnel bridge: Fett Rand = Brügg diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 64035c830..5f1e4dc05 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -993,18 +993,18 @@ ne: subway: सबवे cable_car: केबल कार chair_lift: कुर्सी लिफ्ट - forest_only: वन + forest: वन wood: कुञ्ज golf: गल्फ कोर्स park: उद्यान resident: आवासीय क्षेत्र - lake_only: ताल + lake: ताल reservoir: मुहान farm: खेती cemetery: अन्त्यष्टी स्थल - school_only: विद्यालय + school: विद्यालय university: विश्वविद्यालय - summit_only: शिखर + summit: शिखर peak: शिखर bicycle_shop: साइकल पसल bicycle_parking: साकल पार्किङ diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 96bc183a6..a7c153a89 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1525,9 +1525,9 @@ nl: one: '%{count} rapport' other: '%{count} rapporten' no_reports: Geen rapporten - report_created_at: Voor het eerst vermeld op %{datetime} - last_resolved_at: Laatst opgelost op %{datetime} - last_updated_at: Laatst bijgewerkt op %{datetime} door %{displayname} + report_created_at_html: Voor het eerst vermeld op %{datetime} + last_resolved_at_html: Laatst opgelost op %{datetime} + last_updated_at_html: Laatst bijgewerkt op %{datetime} door %{displayname} resolve: Oplossen ignore: Negeren reopen: Heropenen @@ -2408,27 +2408,27 @@ nl: subway: Metro ferry: Veerboot light_rail: Lightrail - tram_only: Tram + tram: Tram trolleybus: Trolleybus bus: Bus cable_car: Kabelbaan chair_lift: Stoeltjeslift - runway_only: Start- en landingsbaan + runway: Start- en landingsbaan taxiway: Taxibaan - apron_only: Luchthavenplatform + apron: Luchthavenplatform admin: Bestuurlijke grens - orchard_only: Boomgaard + orchard: Boomgaard vineyard: Wijngaard - forest_only: Bos + forest: Bos wood: Bos farmland: Landbouwgrond - grass_only: Gras + grass: Gras meadow: Weide bare_rock: Kale rots sand: Zand golf: Golfbaan park: Park - common_only: Gemene grond + common: Gemene grond built_up: Bebouwde kom resident: Woongebied retail: Winkelgebied @@ -2436,7 +2436,7 @@ nl: commercial: Commercieel gebied heathland: Heide scrubland: Struikgewas - lake_only: Meer + lake: Meer reservoir: Reservoir glacier: Gletsjer farm: Boerderij @@ -2447,11 +2447,11 @@ nl: centre: Sportcentrum reserve: Natuurreservaat military: Militair gebied - school_only: School + school: School; universiteit university: Universiteit building: Belangrijk gebouw station: Spoorwegstation - summit_only: Top + summit: Top peak: Piek tunnel: Tunnel bridge: Brug diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 9454149ca..3bafdc26c 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1383,9 +1383,9 @@ nn: one: '%{count} melding' other: '%{count} meldingar' no_reports: Ingen meldingar - report_created_at: Fyrst meld %{datetime} - last_resolved_at: Sist løyst %{datetime} - last_updated_at: Sis oppdatert %{datetime} av %{displayname} + report_created_at_html: Fyrst meld %{datetime} + last_resolved_at_html: Sist løyst %{datetime} + last_updated_at_html: Sis oppdatert %{datetime} av %{displayname} resolve: Løys ignore: SjÃ¥ bort frÃ¥ reopen: Opna att @@ -2181,21 +2181,21 @@ nn: subway: Undergrunnsbane cable_car: Kabelvogn chair_lift: stolheis - runway_only: Flystripe + runway: Flystripe taxiway: taksebane - apron_only: terminal + apron: terminal admin: Administrativ grense - forest_only: Skog + forest: Skog wood: Ved golf: Golfbane park: Park - common_only: Vanleg + common: Vanleg resident: BoligomrÃ¥de retail: DetaljsalgomrÃ¥de industrial: IndustriomrÃ¥de commercial: Kommersielt omrÃ¥de heathland: Heilandskap - lake_only: Innsjø + lake: Innsjø reservoir: reservoar farm: Gard brownfield: Tidlegare industriomrÃ¥de @@ -2205,11 +2205,11 @@ nn: centre: Sportssenter reserve: Naturreservat military: Militært omrÃ¥de - school_only: Skule + school: Skule university: universitet building: Viktig bygning station: Jernbanestasjon - summit_only: Topp + summit: Topp peak: fjelltopp tunnel: Streka kant = tunnel bridge: Sort kant = bru diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index 71db56f7c..0f8fcc61c 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -1021,9 +1021,9 @@ nqo: resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫ show: title: '%{status} ߝߌ߬ߛߌ #%{issue_id}' - report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime} - last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime} - last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname} + report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime} + last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime} + last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname} ߓߟߏ߫ resolve: ߊ߬ ߢߊߓߐ߫ ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫ @@ -1521,23 +1521,23 @@ nqo: rail: ߣߍ߰ߛߌߟߊ subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ cable_car: ߘߎ߲ߞߎߟߎ߲ - runway_only: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ + runway: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ taxiway: ߥߊߟߌߥߊߟߌ ß« ߛߌߟߊ admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ - forest_only: ߕߎ + forest: ߕߎ wood: ߦߙߌ - common_only: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ + common: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲ commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ - lake_only: ߞߐ߰ߖߌ߬ߘߟߊ + lake: ߞߐ߰ߖߌ߬ߘߟߊ farm: ߝߏ߬ߘߏ cemetery: ߞߊߓߙߎߟߏ centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲ reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲ military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲ - school_only: ߞߊ߬ߙߊ߲߬ߕߊ + school: ߞߊ߬ߙߊ߲߬ߕߊ university: ߖߊ߯ߓߘߊ station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮ construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 9b595294f..309e2fcf9 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -1401,9 +1401,9 @@ oc: zero: Ges de rapòrt one: 1 rapport other: '%{count} rapòrts' - report_created_at: Raportat per premier còp lo %{datetime} - last_resolved_at: Reglat per darrier còp lo %{datetime} - last_updated_at: Actualizat per darrier còp lo %{datetime} per %{displayname} + report_created_at_html: Raportat per premier còp lo %{datetime} + last_resolved_at_html: Reglat per darrier còp lo %{datetime} + last_updated_at_html: Actualizat per darrier còp lo %{datetime} per %{displayname} resolve: Reglar ignore: Ignorar reopen: Tornar dobrir @@ -2028,21 +2028,21 @@ oc: subway: Linha de mètro cable_car: Teleferic chair_lift: telesèti - runway_only: Pista d'aeropòrt + runway: Pista d'aeropòrt taxiway: via de circulacion d'aeropòrt - apron_only: Estacionament d'avions + apron: Estacionament d'avions admin: Limit administratiu - forest_only: Sèuva + forest: Sèuva wood: Bòsc golf: Percors de gòlf park: Pargue - common_only: Espaci comun + common: Espaci comun resident: Zòna residenciala retail: Zòna de comèrci industrial: Zòna industriala commercial: Zòna terciària heathland: Landa - lake_only: Lac + lake: Lac reservoir: Sèrva farm: Zòna agricòla brownfield: Zòna rasada @@ -2052,11 +2052,11 @@ oc: centre: Centre esportiu reserve: Resèrva naturala military: Zòna militara - school_only: Escòla + school: Escòla university: universitat building: Bastissa significativa station: Gara ferroviària - summit_only: Som + summit: Som peak: pic tunnel: Bòrd en puntilhats = tunèl bridge: Bòrd negre = pont diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 8b1d9913a..45320480b 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -936,20 +936,20 @@ pa: subway: ਸਬ-ਵੇਅ cable_car: ਕੇਬਲ ਕਾਰ chair_lift: ਕੁਰਸੀ ਲਿਫ਼ਟ - runway_only: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ + runway: ਹਵਾਈ ਅੱਡੇ ਦੀ ਉਡਾਣ ਪੱਟੀ taxiway: ਟੈਕਸੀਵੇਅ - apron_only: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ + apron: ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ - forest_only: ਜੰਗਲ + forest: ਜੰਗਲ wood: ਜੰਗਲ golf: ਗੋਲਫ਼ ਮੈਦਾਨ park: ਪਾਰਕ - common_only: ਸ਼ਾਮਲਾਟ + common: ਸ਼ਾਮਲਾਟ resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ retail: ਪਰਚੂਨ ਖੇਤਰ industrial: ਉਦਯੋਗਿਕ ਖੇਤਰ commercial: ਵਪਾਰਕ ਖੇਤਰ - lake_only: ਝੀਲ + lake: ਝੀਲ reservoir: ਕੁੰਡ farm: ਖੇਤ cemetery: ਸ਼ਮਸ਼ਾਨ @@ -957,11 +957,11 @@ pa: centre: ਖੇਡ ਕੇਂਦਰ reserve: ਕੁਦਰਤੀ ਰੱਖ military: ਫ਼ੌਜੀ ਇਲਾਕਾ - school_only: ਸਕੂਲ + school: ਸਕੂਲ university: ਯੂਨੀਵਰਸਿਟੀ building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ - summit_only: ਸਿਖਰ + summit: ਸਿਖਰ peak: ਚੋਟੀ construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ welcome: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e263aa550..7c641a29f 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1546,9 +1546,10 @@ pl: many: '%{count} zgłoszeń' other: '%{count} zgłoszeń' no_reports: Brak zgłoszeń - report_created_at: Pierwsze zgłoszenie z %{datetime} - last_resolved_at: Ostatnia reakcja z %{datetime} - last_updated_at: Ostatnio zaktualizowane %{datetime} przez użytkownika %{displayname} + report_created_at_html: Pierwsze zgłoszenie z %{datetime} + last_resolved_at_html: Ostatnia reakcja z %{datetime} + last_updated_at_html: Ostatnio zaktualizowane %{datetime} przez użytkownika + %{displayname} resolve: Rozwiąż ignore: Zignoruj reopen: Otwórz ponownie @@ -2343,26 +2344,26 @@ pl: subway: Metro ferry: Prom light_rail: Kolej miejska - tram_only: Tramwaj + tram: Tramwaj trolleybus: Trolejbus bus: Autobus cable_car: Kolej linowa chair_lift: wyciąg krzesełkowy - runway_only: Pas startowy + runway: Pas startowy taxiway: kołowania - apron_only: Płyta lotniska + apron: Płyta lotniska admin: Granica - forest_only: Las + forest: Las wood: Drzewa golf: Pole golfowe park: Park - common_only: Pole + common: Pole resident: Teren mieszkalny retail: Zabudowa handlowo-usługowa industrial: Teren przemysłowy commercial: Teren komercyjny heathland: Wrzosowisko - lake_only: Jezioro + lake: Jezioro reservoir: zbiornik glacier: Lodowiec farm: Gospodarstwo rolne @@ -2373,11 +2374,11 @@ pl: centre: Centrum sportowe reserve: Rezerwat przyrody military: Teren wojskowy - school_only: Szkoła + school: Szkoła university: uniwersytet building: Ważny budynek station: Stacja kolejowa - summit_only: Góra + summit: Góra peak: szczyt tunnel: Kreskowany obrys – tunel bridge: Czarny obrys – most diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml index 6563e0965..50b66ba8c 100644 --- a/config/locales/pnb.yml +++ b/config/locales/pnb.yml @@ -1139,10 +1139,10 @@ pnb: reports: other: zeroرپورٹ نہیں one: اِکّ رپورٹ - report_created_at: '%{datetime} رپورٹ بھیجی سی۔' - last_resolved_at: '%{datetime} مسئلہ بند کیتا سی۔' - last_updated_at: '%{datetime} مسئلے تے «%{displayname}» نویں کاݨکاری پائی گئی - سی۔' + report_created_at_html: '%{datetime} رپورٹ بھیجی سی۔' + last_resolved_at_html: '%{datetime} مسئلہ بند کیتا سی۔' + last_updated_at_html: '%{datetime} مسئلے تے «%{displayname}» نویں کاݨکاری پائی + گئی سی۔' resolve: حل کڈھو ignore: نظر انداز کرو reopen: ولدا کھُلھو @@ -1659,21 +1659,21 @@ pnb: subway: سبوے cable_car: کیبل کار chair_lift: کُرسی لِفٹ - runway_only: ہوائی اڈے اُڈاݨ پٹی + runway: ہوائی اڈے اُڈاݨ پٹی taxiway: ٹیکسی‌وے - apron_only: ہوائی اڈے دا ایپرن + apron: ہوائی اڈے دا ایپرن admin: پرشاسکی سرحد - forest_only: رکھّ + forest: رکھّ wood: جنگل golf: گولف مَیدان park: پارک - common_only: شاملاٹ + common: شاملاٹ resident: رہائشی کھیتر retail: پرچون کھیتر industrial: سناتی کھیتر commercial: وپارک کھیتر heathland: ہیتھ - lake_only: جھیل + lake: جھیل reservoir: کُنڈ farm: کھیت brownfield: براؤنفیلڈ @@ -1683,11 +1683,11 @@ pnb: centre: کھیڈ کیندر reserve: کُدرتی رکھّ military: فَوجی کھیتر - school_only: سکول + school: سکول university: یونیورستی building: مہتوپورن عمارت station: ریلوے سٹیشن - summit_only: سکھر + summit: سکھر peak: چوٹی tunnel: سُرنگ (ڈیش لائیناں) bridge: پُل (کالیاں لائیناں) diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 457742e91..413a13d75 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -368,14 +368,14 @@ ps: key: table: entry: - forest_only: ځنگل + forest: ځنگل park: پارک - lake_only: ډنډ + lake: ډنډ reservoir: زېرمتون farm: کرونده cemetery: هديره military: پوځي سيمه - school_only: ښوونځی + school: ښوونځی university: پوهنتون traces: new: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 883445326..086282926 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1516,9 +1516,9 @@ pt-PT: one: '%{count} denúncia' other: '%{count} denúncias' no_reports: Sem denúncias - report_created_at: Denunciado pela primeira vez em %{datetime} - last_resolved_at: Resolvido pela última vez em %{datetime} - last_updated_at: Atualizado pela última vez em %{datetime} por %{displayname} + report_created_at_html: Denunciado pela primeira vez em %{datetime} + last_resolved_at_html: Resolvido pela última vez em %{datetime} + last_updated_at_html: Atualizado pela última vez em %{datetime} por %{displayname} resolve: Resolver ignore: Ignorar reopen: Reabrir @@ -2378,27 +2378,27 @@ pt-PT: subway: Metropolitano ferry: Ferry light_rail: Comboio ligeiro - tram_only: Elétrico + tram: Elétrico trolleybus: Troleicarro bus: Autocarro cable_car: Teleférico chair_lift: Teleférico - runway_only: Pista de aviação + runway: Pista de aviação taxiway: Via de circulação - apron_only: Estacionamento de aviões + apron: Estacionamento de aviões admin: Fronteira administrativa - orchard_only: Pomar + orchard: Pomar vineyard: Vinha - forest_only: Floresta gerida + forest: Floresta gerida wood: Bosque farmland: Terreno agrícola - grass_only: Relva + grass: Relva meadow: Prado bare_rock: Rocha exposta sand: Areia golf: Campo de golfe park: Parque público - common_only: Terrenos comunitários + common: Terrenos comunitários built_up: Zona edificada resident: Área residencial retail: Área de retalho @@ -2406,7 +2406,7 @@ pt-PT: commercial: Área comercial heathland: Charneca scrubland: Matagal - lake_only: Lago + lake: Lago reservoir: Reservatório intermittent_water: Corpo de água intermitente glacier: Glaciar @@ -2420,12 +2420,12 @@ pt-PT: centre: Centro desportivo reserve: Reserva natural military: Área militar - school_only: Escola + school: Escola university: Universidade hospital: Hospital building: Edifício importante station: Estação ferroviária - summit_only: Cume + summit: Cume peak: Pico tunnel: Linha tracejada = túnel bridge: Linha cheia = ponte diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 36ac29c48..18c834175 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1519,9 +1519,9 @@ pt: one: '%{count} relatório' other: '%{count} relatórios' no_reports: Sem relatórios - report_created_at: Primeiro relatado em %{datetime} - last_resolved_at: Resolvido pela última vez em %{datetime} - last_updated_at: Última atualização em %{datetime} por %{displayname} + report_created_at_html: Primeiro relatado em %{datetime} + last_resolved_at_html: Resolvido pela última vez em %{datetime} + last_updated_at_html: Última atualização em %{datetime} por %{displayname} resolve: Resolvido ignore: Ignorar reopen: Reabrir @@ -2378,23 +2378,23 @@ pt: subway: Metrô cable_car: Bonde aéreo chair_lift: Teleférico - runway_only: Pista de Pouso + runway: Pista de Pouso taxiway: pista de taxiamento - apron_only: Pátio de aeródromo + apron: Pátio de aeródromo admin: Limite administrativo vineyard: Vinha - forest_only: Floresta manejada + forest: Floresta manejada wood: Bosque nativo meadow: Prado golf: Campo de golfe park: Parque - common_only: Baldio comunitário + common: Baldio comunitário resident: Área residencial retail: Área de varejo industrial: Área industrial commercial: Área de negócios heathland: Urzal - lake_only: Lago + lake: Lago reservoir: Reservatório farm: Lavoura brownfield: Terreno abandonado @@ -2404,12 +2404,12 @@ pt: centre: Centro/clube esportivo reserve: Reserva ambiental military: Área militar - school_only: Escola + school: Escola/Universidade university: universidade hospital: Hospital building: Edifício importante station: Estação ferroviária - summit_only: Cume + summit: Cume peak: cume tunnel: Túnel (contorno tracejado) bridge: Ponte/viaduto (contorno contínuo) diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 5174f3e2b..42170491d 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1502,9 +1502,9 @@ ro: few: '%{count} raporturi' other: "" no_reports: Fara rapoarte - report_created_at: Prima dată raportată la %{datetime} - last_resolved_at: Ultima rezolvată la %{datetime} - last_updated_at: Ultima actualizare la %{datetime} de către %{displayname} + report_created_at_html: Prima dată raportată la %{datetime} + last_resolved_at_html: Ultima rezolvată la %{datetime} + last_updated_at_html: Ultima actualizare la %{datetime} de către %{displayname} resolve: Rezolvat ignore: Ignoră reopen: Redeschide @@ -2377,34 +2377,34 @@ ro: train: Tren subway: Stație de metrou ferry: Feribot - tram_only: Tramvai + tram: Tramvai trolleybus: Troleibuz bus: Autobuz cable_car: Telecabină chair_lift: Telescaun - runway_only: Pistă de Aeroport + runway: Pistă de Aeroport taxiway: taxiway - apron_only: Aeronavă + apron: Aeronavă admin: Graniță administrativă - orchard_only: Livadă + orchard: Livadă vineyard: Podgorie - forest_only: Pădure + forest: Pădure wood: Lemn farmland: Teren agricol - grass_only: Iarbă + grass: Iarbă meadow: Luncă bare_rock: Stâncă goală sand: Nisip golf: Teren de golf park: Parc - common_only: Comun + common: Comun built_up: Zonă construită resident: Zonă rezidențială retail: Spațiul de retail industrial: Zonă industrială commercial: Zonă comercială heathland: Landă - lake_only: Lac + lake: Lac reservoir: Rezervor intermittent_water: Corp de apă intermitent glacier: Ghețar @@ -2417,12 +2417,12 @@ ro: centre: Centru de sport reserve: Rezervație naturală military: Zonă militară - school_only: Școală + school: School; university university: Universitate hospital: Spital building: Clădire importantă station: Gară - summit_only: Vârf de munte + summit: Vârf de munte peak: Vârf tunnel: Dashed casing = tunel bridge: Black casing = pod diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 0ba248a41..a93e329ea 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -533,7 +533,7 @@ ru: feature_warning: Необходимо загрузить %{num_features} объектов, что может замедлить ваш браузер. Вы уверены что хотите просмотреть эти данные? load_data: Загрузить данные - loading: Загрузка... + loading: Загружается… tag_details: tags: Теги wiki_link: @@ -1532,9 +1532,9 @@ ru: zero: Нет сообщений one: 1 сообщение other: '%{count} сообщений' - report_created_at: Впервые сообщено %{datetime} - last_resolved_at: Последний раз обработано %{datetime} - last_updated_at: Последнее обновление %{datetime} пользователем %{displayname} + report_created_at_html: Впервые сообщено %{datetime} + last_resolved_at_html: Последний раз обработано %{datetime} + last_updated_at_html: Последнее обновление %{datetime} пользователем %{displayname} resolve: Обработать ignore: Игнорировать reopen: Переоткрыть @@ -2315,32 +2315,32 @@ ru: train: Поезд subway: Линия метро ferry: Паром - tram_only: Трамвай + tram: Трамвай trolleybus: Троллейбус bus: Автобус cable_car: Канатная дорога chair_lift: кресельный подъёмник - runway_only: Взлётно-посадочная полоса аэропорта + runway: Взлётно-посадочная полоса аэропорта taxiway: рулёжная дорожка - apron_only: Перрон аэродрома + apron: Перрон аэродрома admin: Административная граница - orchard_only: Фруктовый сад + orchard: Фруктовый сад vineyard: Виноградник - forest_only: Лес + forest: Лес wood: Роща farmland: Сельхозугодья - grass_only: Трава + grass: Трава meadow: Луг golf: Площадка для гольфа park: Парк - common_only: Общественная земля + common: Общественная земля built_up: Площадь застройки resident: Жилой район retail: Торговый район industrial: Промышленный район commercial: Коммерческий район heathland: Вересковая пустошь - lake_only: Озеро + lake: Озеро reservoir: Водохранилище glacier: Ледник farm: Ферма @@ -2351,12 +2351,12 @@ ru: centre: Спортивный центр reserve: Заповедник military: Военная территория - school_only: Школа + school: Школа, университет university: Университет hospital: Больница building: Значительное здание station: Железнодорожная станция - summit_only: Вершина + summit: Вершина peak: Вершина горы tunnel: Туннель (пунктир) bridge: Мост (жирная линия) diff --git a/config/locales/sat.yml b/config/locales/sat.yml index a37e7b87b..33883d2ba 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -583,10 +583,10 @@ sat: table: entry: footway: ᱛᱟᱲᱟᱢᱦᱚᱨ - forest_only: ᱵᱤᱨ + forest: ᱵᱤᱨ wood: ᱠᱟᱴᱷ park: ᱵᱟᱜᱟᱱ - school_only: ᱤᱛᱩᱱ ᱟᱥᱲᱟ + school: ᱤᱛᱩᱱ ᱟᱥᱲᱟ bicycle_shop: ᱥᱟᱭᱠᱤᱞ ᱫᱩᱠᱟᱹᱱ bicycle_parking: ᱥᱟᱭᱠᱤᱞ ᱯᱟᱨᱠᱤᱝ toilets: ᱴᱚᱭᱞᱮᱴᱠᱚ diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 17c5f2b40..b0b9ddcde 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -1479,9 +1479,9 @@ sc: one: '%{count} sinnalatzione' other: '%{count} sinnalatziones' no_reports: Perunu informe - report_created_at: Sinnaladu pro sa prima borta su %{datetime} - last_resolved_at: Risoltu pro s'ùrtima borta su %{datetime} - last_updated_at: Ùrtima atualizatzione de %{displayname} su %{datetime} + report_created_at_html: Sinnaladu pro sa prima borta su %{datetime} + last_resolved_at_html: Risoltu pro s'ùrtima borta su %{datetime} + last_updated_at_html: Ùrtima atualizatzione de %{displayname} su %{datetime} resolve: Risolve ignore: Ignora reopen: Torra a abèrrere @@ -2363,21 +2363,21 @@ sc: subway: Metropolitana cable_car: Funivia chair_lift: ascensore carrotzina - runway_only: Pista de aeroportu + runway: Pista de aeroportu taxiway: carrera de furriada - apron_only: Àrea de parchègiu de sos aèreos + apron: Àrea de parchègiu de sos aèreos admin: Làcana amministrativa - forest_only: Litu + forest: Litu wood: Buscu golf: Campu de golf park: Parcu - common_only: Comunu + common: Comunu resident: Àrea de residèntzia retail: Àrea cummertziale industrial: Àrea industriale commercial: Àrea cummertziale heathland: Istruvina - lake_only: Lagu + lake: Lagu reservoir: riserva de abba farm: Fatoria brownfield: Terrinu industriale abbandonadu @@ -2387,11 +2387,11 @@ sc: centre: Tzentru isportivu reserve: Reserva naturale military: Zona militare - school_only: Iscola + school: Iscola university: universidade building: Edifìtziu significativu station: Istatzione ferroviària - summit_only: Cùcuru de monte + summit: Cùcuru de monte peak: cùcuru tunnel: Lìnia trategiada = galleria bridge: Oros nieddos = ponte diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 735573c2f..a4268ee15 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -43,6 +43,11 @@ scn: errors: messages: invalid_email_address: nun pari èssiri nu nnirizzu email vàlidu + models: + user_mute: + attributes: + subject: + format: '%{message}' models: acl: Lista di cuntrollu d'accessu changeset: Gruppu di canciamenti @@ -163,6 +168,7 @@ scn: openid: OpenID google: Google facebook: Facebook + microsoft: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -191,6 +197,7 @@ scn: account: deletions: show: + title: Cancella lu mè cuntu delete_account: Cancella cuntu confirm_delete: Sî sicuru? cancel: Annulla @@ -325,8 +332,10 @@ scn: tag: La pàggina dâ wiki chi discrivi l'etichetta %{key}=%{value} wikidata_link: Lu suggettu %{page} supra a Wikidata wikipedia_link: L'artìculu %{page} supra a Wikipedia + wikimedia_commons_link: L'elementu %{page} supra Wikimedia Commons telephone_link: Chiama lu %{phone_number} colour_preview: Antiprima culuri %{colour_value} + email_link: Email %{email} query: title: Arricerca di l'elimenti introduction: Clicca supra â cartina pi circari l'elimenti vicini. @@ -1518,21 +1527,21 @@ scn: subway: Mitrupulitana cable_car: Funivìa chair_lift: seggiuvìa - runway_only: Pista d’attirraggiu + runway: Pista d’attirraggiu taxiway: pista di rullaggiu - apron_only: Ària di parcheggiu ariupurtuali + apron: Ària di parcheggiu ariupurtuali admin: Cunfini amministrativu - forest_only: Furesta + forest: Furesta wood: Voscu golf: Campu di golf park: Villa - common_only: Cumuni + common: Cumuni resident: Zona risidinziali retail: Zona di nigozzî industrial: Zona nnustriali commercial: Zona cummirciali heathland: Brughiera - lake_only: Lacu + lake: Lacu reservoir: lacu artificiali farm: Massarìa brownfield: Zona di bunìfica @@ -1542,11 +1551,11 @@ scn: centre: Centru spurtivu reserve: Riserva naturali military: Zona militari - school_only: Scola + school: Scola university: univirsità building: Edificiu mpurtanti station: Stazzioni dâ ferruvìa - summit_only: Muntagna + summit: Muntagna peak: Muntagna tunnel: Cuntornu trattiatu = jallarìa bridge: Cuntornu niurittu = ponti diff --git a/config/locales/sco.yml b/config/locales/sco.yml index fc7e1ed53..70c9a09cb 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -923,10 +923,10 @@ sco: retail: Retail aurie industrial: Industrial aurie commercial: Commercial aurie - lake_only: Loch + lake: Loch farm: Ferm military: Militar aurie - school_only: Schuil + school: Schuil university: varsity building: Signeeficant biggin welcome: diff --git a/config/locales/sh.yml b/config/locales/sh.yml index 1e6d91e3d..557ac5bc7 100644 --- a/config/locales/sh.yml +++ b/config/locales/sh.yml @@ -731,21 +731,21 @@ sh: subway: Podzemna željeznica cable_car: Kabinska žičara chair_lift: sedežnica - runway_only: Aerodromska pista + runway: Aerodromska pista taxiway: rulna staza - apron_only: Parking za avione + apron: Parking za avione admin: Administrativna granica - forest_only: Å uma + forest: Å uma wood: Å ume (prirodne, neodržavane) golf: Golf teren park: Park - common_only: Travnjaci + common: Travnjaci resident: Stambeno područje retail: Maloprodajno područje industrial: Industrijsko područje commercial: Poslovno područje heathland: VriÅ¡tina - lake_only: Jezero + lake: Jezero reservoir: rezervoar farm: Farma brownfield: GradiliÅ¡te @@ -755,11 +755,11 @@ sh: centre: Sportski centar reserve: Rezervat prirode military: Vojno područje - school_only: Å kola + school: Å kola university: univerzitet building: Značajna zgrada station: Željeznička stanica - summit_only: Vrh + summit: Vrh peak: vrh welcome: title: DobrodoÅ¡li! diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 3467431d0..66108416d 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1395,9 +1395,9 @@ sk: few: '%{count} hlásenia' many: '%{count} hlásení' other: '%{count} hlásení' - report_created_at: Prvýkrát nahlásené %{datetime} - last_resolved_at: Naposledy vyrieÅ¡ené %{datetime} - last_updated_at: Naposledy aktualizované %{datetime} používateľom %{displayname} + report_created_at_html: Prvýkrát nahlásené %{datetime} + last_resolved_at_html: Naposledy vyrieÅ¡ené %{datetime} + last_updated_at_html: Naposledy aktualizované %{datetime} používateľom %{displayname} resolve: VyrieÅ¡iÅ¥ ignore: IgnorovaÅ¥ reopen: Znovu otvoriÅ¥ @@ -2121,21 +2121,21 @@ sk: subway: Metro cable_car: Lanovka chair_lift: sedačková lanovka - runway_only: Letisková dráha + runway: Letisková dráha taxiway: pojazdová dráha - apron_only: Letisková odbavovacia plocha + apron: Letisková odbavovacia plocha admin: Administratívne hranice - forest_only: Les (udržiavaný) + forest: Les (udržiavaný) wood: Les (neudržiavaný) golf: Golfové ihrisko park: Park - common_only: Pastvina + common: Pastvina resident: Obytná oblasÅ¥ retail: Nákupná oblasÅ¥ industrial: Priemyselná oblasÅ¥ commercial: Komerčná oblasÅ¥ heathland: Vresovisko - lake_only: Jazero + lake: Jazero reservoir: nádrž farm: Farma brownfield: Zborenisko @@ -2145,11 +2145,11 @@ sk: centre: Å portové centrum reserve: Prírodná rezervácia military: Vojenský priestor - school_only: Å kola + school: Å kola university: univerzita building: Významná budova station: Železničná stanica - summit_only: Vrchol + summit: Vrchol peak: vrchol tunnel: Čiarkovaný obrys = tunel bridge: Čireny obrys = most diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index 1c3b3a447..bf450d963 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -1221,7 +1221,7 @@ skr-arab: track: ٹرَیک train: ڳَݙی light_rail: لائٹ ریل - tram_only: ٹرام + tram: ٹرام trolleybus: ٹرالی بس bus: بس cable_car: کیبل کار @@ -1229,23 +1229,23 @@ skr-arab: taxiway: ٹیکسی دا راہ capital: دار الحکومت city: شَہر - orchard_only: بغیچا - forest_only: جنگل + orchard: بغیچا + forest: جنگل wood: لکڑ - grass_only: گھا + grass: گھا meadow: چراگاہ sand: ریت golf: گولف مَیدان park: پارک - common_only: وقف + common: وقف retail: پرچون علاقہ industrial: صنعتی علاقہ commercial: کمرشل ایریا - lake_only: جھیل + lake: جھیل reservoir: ذخائر glacier: گلیشیئر farm: کھیت - school_only: سکول + school: سکول university: یونی ورسٹی hospital: ہسپتال station: ریلوے ٹیشݨ diff --git a/config/locales/sl.yml b/config/locales/sl.yml index e75cce94e..6a365a8a7 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1518,9 +1518,9 @@ sl: few: '%{count} prijave' other: '%{count} prijav' no_reports: Ni prijav - report_created_at: Prvič prijavljeno %{datetime} - last_resolved_at: Zadnjič razreÅ¡eno %{datetime} - last_updated_at: Zadnjič %{datetime} posodobil_a %{displayname} + report_created_at_html: Prvič prijavljeno %{datetime} + last_resolved_at_html: Zadnjič razreÅ¡eno %{datetime} + last_updated_at_html: Zadnjič %{datetime} posodobil_a %{displayname} resolve: RazreÅ¡i ignore: Prezri reopen: Znova odpri @@ -2420,29 +2420,29 @@ sl: subway: Podzemna železnica ferry: Trajekt light_rail: Lahka železnica - tram_only: Tramvaj + tram: Tramvaj trolleybus: Trolejbus bus: Avtobus cable_car: Nihalka chair_lift: Sedežnica - runway_only: Vzletno-pristajalna steza + runway: Vzletno-pristajalna steza taxiway: Vozna steza - apron_only: LetaliÅ¡ka ploščad + apron: LetaliÅ¡ka ploščad admin: Upravna razmejitev capital: Glavno mesto city: Mesto - orchard_only: Sadovnjak + orchard: Sadovnjak vineyard: Vinograd - forest_only: Gozd + forest: Gozd wood: Gozd farmland: Kmetijsko zemljišče - grass_only: Trava + grass: Trava meadow: Travnik bare_rock: Gola skala sand: Pesek golf: Igrišče za golf park: Park - common_only: Travniki + common: Travniki built_up: Pozidano območje resident: Naselje retail: Trgovinsko območje @@ -2450,7 +2450,7 @@ sl: commercial: Poslovno območje heathland: Grmičevje scrubland: Grmičevje - lake_only: Jezero + lake: Jezero reservoir: Vodni zbiralnik intermittent_water: Presihajoče vodno telo glacier: Ledenik @@ -2464,12 +2464,12 @@ sl: centre: Å portni center reserve: Naravni rezervat military: VojaÅ¡ko območje - school_only: Å ola + school: Å ola; univerza university: Univerza hospital: BolniÅ¡nica building: Pomembna stavba station: ŽelezniÅ¡ka postaja - summit_only: Vrh + summit: Vrh peak: Vrh tunnel: Črtkana obroba = predor bridge: Krepka obroba = most diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 47a6da81d..410ba522a 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -856,8 +856,8 @@ sq: ignored: Injoruar open: E hapur show: - report_created_at: E raportuar së pari tek %{datetime} - last_updated_at: Herën e fundit i ri- freskuar%{datetime}nga%{displayname} + report_created_at_html: E raportuar së pari tek %{datetime} + last_updated_at_html: Herën e fundit i ri- freskuar%{datetime}nga%{displayname} resolve: Zgjidh ignore: injoro reports_of_this_issue: Raportimet e këtij problemi @@ -1183,11 +1183,11 @@ sq: entry: centre: Qendër sportive military: Zonë ushtarake - school_only: Shkollë + school: Shkollë university: Universitet building: Ndërtesë station: Stacioni hekurudhor - summit_only: Samit + summit: Samit peak: majë welcome: title: Mirësevjen diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 3125108f2..5e8182c0d 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1034,21 +1034,21 @@ sr-Latn: subway: Podzemna železnica cable_car: Žičara chair_lift: sediÅ¡nica - runway_only: Aerodromska pista + runway: Aerodromska pista taxiway: rulne staze - apron_only: Aerodromski peron + apron: Aerodromski peron admin: Administrativna granica - forest_only: Å uma + forest: Å uma wood: Å uma golf: Golf teren park: Park - common_only: Poljana + common: Poljana resident: Stambeno područje retail: Maloprodajno područje industrial: Industrijsko područje commercial: Poslovno područje heathland: PustoÅ¡ - lake_only: Jezero + lake: Jezero reservoir: rezervoar farm: Farma brownfield: Građevinsko zemljiÅ¡te @@ -1058,11 +1058,11 @@ sr-Latn: centre: Sportski centar reserve: Rezervat prirode military: Vojno područje - school_only: Å kola + school: Å kola university: univerzitet building: Značajna zgrada station: Železnička stanica - summit_only: UzviÅ¡enje + summit: UzviÅ¡enje peak: vrh tunnel: Isprekidan okvir – tunel bridge: Crni okvir – most diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 7cb4165f6..66928055d 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1674,24 +1674,24 @@ sr: bus: Аутобус cable_car: Жичара chair_lift: седишница - runway_only: Аеродромска писта + runway: Аеродромска писта taxiway: Рулна стаза - apron_only: Аеродромски перон + apron: Аеродромски перон admin: Административна граница capital: Престоница city: Град - forest_only: Шума + forest: Шума wood: Шума meadow: Ливада golf: Голф терен park: Парк - common_only: Пољана + common: Пољана resident: Стамбено подручје retail: Малопродајно подручје industrial: Индустријско подручје commercial: Пословно подручје heathland: Пустош - lake_only: Језеро + lake: Језеро reservoir: Резервоар farm: Фарма brownfield: Грађевинско земљиште @@ -1701,12 +1701,12 @@ sr: centre: Спортски центар reserve: Резерват природе military: Војно подручје - school_only: Школа + school: Школа university: Универзитет hospital: Болница building: Значајна зграда station: Железничка станица - summit_only: Узвишење + summit: Узвишење peak: Врх tunnel: Испрекидан оквир – тунел bridge: Црни оквир – мост diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 792778330..0616ccd09 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -18,6 +18,7 @@ # Author: Jas # Author: Jenniesarina # Author: Jopparn +# Author: Kakan spelar # Author: Larske # Author: Liftarn # Author: Lokal Profil @@ -1500,9 +1501,9 @@ sv: one: '%{count} rapport' other: '%{count} rapporter' no_reports: Inga rapporter - report_created_at: Rapporterades först %{datetime} - last_resolved_at: Löstes senast %{datetime} - last_updated_at: Uppdaterades senast %{datetime} av %{displayname} + report_created_at_html: Rapporterades först %{datetime} + last_resolved_at_html: Löstes senast %{datetime} + last_updated_at_html: Uppdaterades senast %{datetime} av %{displayname} resolve: Lös ignore: Ignorera reopen: Öppna igen @@ -1796,6 +1797,7 @@ sv: to: Till subject: Ärende date: Datum + actions: Åtgärder message_summary: unread_button: Markera som oläst read_button: Markera som läst @@ -1815,6 +1817,7 @@ sv: body: Det finns inget meddelande med det ID:et. outbox: title: Utkorg + actions: Åtgärder messages: one: Du har %{count} skickat ett meddelande other: Du har %{count} skickat meddelanden @@ -2325,21 +2328,21 @@ sv: subway: Tunnelbana cable_car: Linbana chair_lift: stollift - runway_only: Landningsbana + runway: Landningsbana taxiway: taxibana - apron_only: Flygplatsplatta + apron: Flygplatsplatta admin: Administrativ gräns - forest_only: Kulturskog + forest: Kulturskog wood: Naturskog golf: Golfbana park: Park - common_only: Allmänning + common: Allmänning resident: BostadsomrÃ¥de retail: OmrÃ¥de för Detaljhandel industrial: Industriellt omrÃ¥de commercial: Kommersiellt omrÃ¥de heathland: Hed - lake_only: Sjö + lake: Sjö reservoir: vattenmagasin farm: BondgÃ¥rd brownfield: Förfallen industritomt @@ -2349,11 +2352,11 @@ sv: centre: Idrottsanläggning reserve: Naturreservat military: MilitäromrÃ¥de - school_only: Skola + school: Skola university: universitet building: Viktig byggnad station: Järnvägsstation - summit_only: Höjd + summit: Höjd peak: topp tunnel: Streckade kanter = tunnel bridge: Svarta kanter = bro diff --git a/config/locales/ta.yml b/config/locales/ta.yml index dafa1b03e..9b49e09f5 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -100,7 +100,7 @@ ta: url: முதன்மை பயன்பாட்டு URL (தேவை) callback_url: திரும்ப அழைக்கும் URL support_url: URL ஐ ஆதரிக்கவும் - allow_read_prefs: அவர்களின் பயனர் விருப்பங்களைப் படிக்கவும் + allow_read_prefs: அவர்களின் பயனர் விருப்பங்களை வாசி allow_write_prefs: அவர்களின் பயனர் விருப்பங்களை மாற்றவும் allow_write_diary: நாட்குறிப்பு உள்ளீடுகள், கருத்துகள் மற்றும் நண்பர்களை உருவாக்குங்கள் allow_write_api: வரைபடத்தை மாற்றவும் @@ -714,31 +714,31 @@ ta: capital: தலைநகரம் city: நகரம் vineyard: திராட்சைத் தோட்டம் - forest_only: காடு + forest: காடு wood: விறகு farmland: பண்ணை நிலம் meadow: புல்வெளி bare_rock: வெற்றுப் பாறை sand: மணல் park: பூங்கா - common_only: பொதுவான + common: பொதுவான built_up: கட்டடப் பகுதி industrial: தொழிற்சாலை பகுதி commercial: வணிக பகுதி scrubland: புதர் நிலம் - lake_only: ஏரி + lake: ஏரி reservoir: நீர்நிலை glacier: பனிப்பாறை wetland: ஈரநிலம் farm: பண்ணை centre: விளையாட்டு மையம் military: ராணுவ பகுதி - school_only: பள்ளி + school: பள்ளி university: பல்கலைக்கழகம் hospital: மருத்துவமனை building: குறிப்பிடத்தக்க கட்டிடம் station: தொடர்வண்டி நிலையம் - summit_only: உச்சி மாநாடு + summit: உச்சி மாநாடு peak: உச்சி private: தனியார் அனுமதி construction: சாலைகளில் கட்டுமானப் பணிகள் நடந்து வருகின்றன. diff --git a/config/locales/te.yml b/config/locales/te.yml index 9fb026258..d5823c431 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -1374,9 +1374,9 @@ te: resolved: పరిష్కరించినవి show: title: '%{status} అంశం #%{issue_id}' - report_created_at: '%{datetime} à°¨ మొదటిసారి ఫిర్యాదు చేసారు' - last_resolved_at: '%{datetime} à°¨ చివరిగా పరిష్కరించారు' - last_updated_at: చివరిగా %{displayname} గారు %{datetime} కు తాజాకరించారు + report_created_at_html: '%{datetime} à°¨ మొదటిసారి ఫిర్యాదు చేసారు' + last_resolved_at_html: '%{datetime} à°¨ చివరిగా పరిష్కరించారు' + last_updated_at_html: చివరిగా %{displayname} గారు %{datetime} కు తాజాకరించారు resolve: పరిష్కరించు ignore: పట్టించుకోవద్దు reopen: మళ్ళీ తెరువు @@ -2005,20 +2005,20 @@ te: subway: కిందారి cable_car: కేబుల్ కారు chair_lift: చెయిర్ లిఫ్ట్ - runway_only: విమానాశ్రయం రన్‌వే + runway: విమానాశ్రయం రన్‌వే taxiway: టాక్సీ వే - apron_only: విమానాశ్రయం ఏప్రాన్ + apron: విమానాశ్రయం ఏప్రాన్ admin: పరిపాలనా సరిహద్దు - forest_only: అడవి + forest: అడవి wood: కలప golf: గోల్ఫ్ కోర్సు park: పార్కు - common_only: పచ్చికబయలు + common: పచ్చికబయలు resident: నివాస ప్రాంతం retail: రిటెయిల్ ప్రదేశం industrial: పారిశ్రామిక ప్రదేశం commercial: వాణిజ్య ప్రదేశం - lake_only: సరస్సు + lake: సరస్సు reservoir: జలాశయం farm: పొలాలు brownfield: బ్రౌన్‌ఫీల్డ్ స్థలం @@ -2027,7 +2027,7 @@ te: centre: క్రీడా కేంద్రం reserve: ప్రకృతి సంరక్షణ కేంద్రం military: మిలిటరీ ప్రదేశం - school_only: పాఠశాల + school: పాఠశాల university: విశ్వవిద్యాలయం building: ప్రముఖ కట్టడము station: రైల్వే స్టేషన్ diff --git a/config/locales/th.yml b/config/locales/th.yml index aec580450..cbaf187d0 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1141,9 +1141,9 @@ th: zero: ไม่มีรายงาน one: 1 รายงาน other: '%{count} รายงาน' - report_created_at: รายงานครั้งแรกเมื่อ %{datetime} - last_resolved_at: ปิดเรื่องล่าสุดเมื่อ %{datetime} - last_updated_at: ปรับปรุงล่าสุดเมื่อ %{datetime} โดย %{displayname} + report_created_at_html: รายงานครั้งแรกเมื่อ %{datetime} + last_resolved_at_html: ปิดเรื่องล่าสุดเมื่อ %{datetime} + last_updated_at_html: ปรับปรุงล่าสุดเมื่อ %{datetime} โดย %{displayname} resolve: ปิดเรื่อง ignore: ละเว้น reopen: เปิดใหม่ @@ -1650,21 +1650,21 @@ th: subway: รถไฟใต้ดิน cable_car: รถกระเช้า chair_lift: รถกระเช้าเปลือย - runway_only: ทางวิ่งสนามบิน + runway: ทางวิ่งสนามบิน taxiway: ทางขับเครื่องบิน - apron_only: โรงซ่อมบำรุงเครื่องบิน + apron: โรงซ่อมบำรุงเครื่องบิน admin: ขอบเขตการปกครอง - forest_only: ป่า + forest: ป่า wood: ไม้ golf: สนามกอล์ฟ park: สวน - common_only: ที่ส่วนกลาง + common: ที่ส่วนกลาง resident: เขตที่พักอาศัย retail: พื้นที่พาณิชยกรรม industrial: พื้นที่อุตสาหกรรม commercial: พื้นที่พาณิชยกรรม heathland: ทุ่งไม้พุ่ม - lake_only: ทะเลสาบ + lake: ทะเลสาบ reservoir: อ่างเก็บน้ำ farm: ไร่นา brownfield: พื้นที่อุตสาหกรรมเดิม @@ -1674,11 +1674,11 @@ th: centre: ศูนย์กีฬา reserve: พื้นที่สงวนธรรมชาติ military: เขตทหาร - school_only: โรงเรียน + school: โรงเรียน university: มหาวิทยาลัย building: อาคารสำคัญ station: สถานีรถไฟ - summit_only: ยอดเขา + summit: ยอดเขา peak: ยอดเขา tunnel: เส้นประ = อุโมงค์ bridge: เส้นทึบ = สะพาน diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 379c97d2b..ef71c3333 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1134,8 +1134,8 @@ tl: reports: one: 1 ulat other: '%{count} mga ulat' - report_created_at: Unang naiulat noong %{datetime} - last_resolved_at: Huling nalutas noong %{datetime} + report_created_at_html: Unang naiulat noong %{datetime} + last_resolved_at_html: Huling nalutas noong %{datetime} resolve: Lutasin ignore: Huwag pansinin reopen: Muling Buksan @@ -1690,21 +1690,21 @@ tl: subway: Daanang pang-ilalim cable_car: Kotse ng kable chair_lift: upuang inaangat - runway_only: Rampa ng Paliparan + runway: Rampa ng Paliparan taxiway: daanan ng taksi - apron_only: Tapis ng paliparan + apron: Tapis ng paliparan admin: Hangganang pampangangasiwa - forest_only: Gubat + forest: Gubat wood: Kahoy golf: Kurso ng golp park: Liwasan - common_only: Karaniwan + common: Karaniwan resident: Pook na panuluyan retail: Lugar na tingian industrial: Pook na pang-industriya commercial: Pook na pangkalakalan heathland: Lupain ng halamang erika - lake_only: Lawa + lake: Lawa reservoir: tinggalan ng tubig farm: Bukid brownfield: Pook ng kayumangging bukirin @@ -1714,11 +1714,11 @@ tl: centre: Lunduyang pampalakasan reserve: Lupaing laan sa kalikasan military: Pook ng militar - school_only: Paaralan + school: Paaralan university: pamantasan building: Makabuluhang gusali station: Himpilan ng daambakal - summit_only: Taluktok + summit: Taluktok peak: tugatog tunnel: Ginitlingang pambalot = lagusan bridge: Itim na pambalot = tulay diff --git a/config/locales/tr.yml b/config/locales/tr.yml index b2b2ffd6a..117fe3084 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -631,7 +631,7 @@ tr: heading: '%{user} Kullanıcısının Günlük Yorumları' subheading_html: '%{user} tarafından yapılan günlük yorumları' no_comments: Günlük yorumu yok - post: Gönder + post: Gönderi when: Tarih comment: Yorum newer_comments: Daha Yeni Yorumlar @@ -698,7 +698,7 @@ tr: daha fazla arkadaş olmaya çalışmadan önce bir süre bekleyin. remove_friend: heading: '%{user}, arkadaşlıktan çıkarılsın mı?' - button: Arkadaşlıktan çıkar + button: Arkadaşlıktan Çıkar success: '%{name}, arkadaş listesinden çıkarıldı.' not_a_friend: '%{name}, arkadaşın değil.' geocoder: @@ -1516,9 +1516,9 @@ tr: one: '%{count} rapor' other: '%{count} rapor' no_reports: Rapor yok - report_created_at: Ä°lk defa %{datetime} tarihinde bildirildi - last_resolved_at: En son %{datetime} tarihinde çözümlendi - last_updated_at: Son güncelleme %{displayname} tarafından %{datetime} tarihinde + report_created_at_html: Ä°lk defa %{datetime} tarihinde bildirildi + last_resolved_at_html: En son %{datetime} tarihinde çözümlendi + last_updated_at_html: Son güncelleme %{displayname} tarafından %{datetime} tarihinde yapıldı resolve: Çözümle ignore: Yoksay @@ -1594,7 +1594,7 @@ tr: start_mapping: Haritacılığa Başla edit: Düzenle history: Geçmiş - export: Dışa aktar + export: Dışa Aktar issues: Sorunlar data: Veri export_data: Verinin Dışalımı @@ -1679,6 +1679,8 @@ tr: loaded: one: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi. other: olası %{count} puan üzerinden %{trace_points} ile başarıyla yüklendi. + all_your_traces_html: Başarıyla yüklediğiniz tüm GPX izlerinizi %{url} adresinde + bulabilirsiniz. subject: '[OpenStreetMap] GPX dosyası başarıyla alındı' signup_confirm: subject: '[OpenStreetMap]''e hoş geldin' @@ -2241,7 +2243,7 @@ tr: no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız desteklemiyor. export: - title: Dışa aktar + title: Dışa Aktar area_to_export: Çıkartılacak alan manually_select: Fare kullanarak farklı bir alan seç format_to_export: Çıkartma biçimi @@ -2282,7 +2284,7 @@ tr: longitude: 'Boylam:' output: Çıktı paste_html: Yukarıdaki HTML kodu kopyalayıp websitesinde yapıştırabilir - export_button: Dışa aktar + export_button: Dışa Aktar fixthemap: title: Sorun bildir / Haritayı onar how_to_help: @@ -2396,29 +2398,29 @@ tr: subway: Metro ferry: Feribot light_rail: Hafif raylı - tram_only: Tramvay + tram: Tramvay trolleybus: Troleybüs bus: Otobüs cable_car: Teleferik chair_lift: Telesiyej - runway_only: Uçuş pisti + runway: Uçuş pisti taxiway: Taksi yolu - apron_only: Havaalanı apronu + apron: Havaalanı apronu admin: Ä°dari sınırı capital: Başkent city: Şehir - orchard_only: Meyve bahçesi + orchard: Meyve bahçesi vineyard: Üzüm bağı - forest_only: Orman + forest: Orman wood: Koru farmland: Tarım arazisi - grass_only: Çimen + grass: Çimen meadow: Çayır bare_rock: Çıplak kaya sand: Kum golf: Golf sahası park: Park - common_only: Çimen + common: Çimen built_up: Ä°nşa alanı resident: Yerleşim bölgesi retail: Alışveriş merkezi @@ -2426,7 +2428,7 @@ tr: commercial: Ticari ve hizmet alanı heathland: Fundalık scrubland: Çalılık - lake_only: Göl + lake: Göl reservoir: Rezervuar intermittent_water: Aralıklı su birikintisi glacier: Buzul @@ -2440,12 +2442,12 @@ tr: centre: Spor merkezi reserve: Doğa koruma alanı military: Askeri bölge - school_only: Okul + school: Okul university: Üniversite hospital: Hastane building: Önemli yapı station: Gar - summit_only: Zirve + summit: Zirve peak: Zirve tunnel: çizgili kenar = tünel bridge: Siyah kenar = köprü @@ -2882,7 +2884,7 @@ tr: edits: Düzenlemeler traces: Ä°zler notes: Harita Notları - remove as friend: Arkadaşlıktan çıkar + remove as friend: Arkadaşlıktan Çıkar add as friend: Arkadaş Olarak Ekle mapper since: 'Haritacılığa başlama tarihi:' uid: 'Kullanıcı kimliği:' @@ -2907,6 +2909,7 @@ tr: importer: İçe aktarıcı erişimini iptal et block_history: Etkin Engellemeler moderator_history: Verilen Engellemeler + revoke_all_blocks: Tüm engellemeleri iptal et comments: Yorumlar create_block: Bu kullanıcıyı engelle activate_user: Bu Kullanıcıyı Etkinleştir @@ -3017,6 +3020,16 @@ tr: confirm: Bu engeli kaldırmak istediğine emin misin? revoke: Ä°ptal! flash: Bu engelleme iptal edildi. + revoke_all: + title: '%{block_on} tarihindeki tüm engellemeler iptal ediliyor' + heading_html: '%{block_on} tarihindeki tüm engellemeler iptal ediliyor' + empty: '%{name} kullanıcısının herhangi aktif bir engeli yok.' + confirm: '%{active_blocks} iptal etmek istediğinizden emin misiniz?' + active_blocks: + one: '%{count} aktif engel' + other: '%{count} aktif engel' + revoke: Ä°ptal! + flash: Tüm aktif engellemeler iptal edildi. helper: time_future_html: '%{time} içinde bitecek.' until_login: Kullanıcı giriş yapana kadar aktif. diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 72c8788f0..1f10f4333 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -895,13 +895,13 @@ tt: subway: Метро cable_car: Канат юлы admin: Административ чик - forest_only: Урман + forest: Урман wood: Агачлык park: Парк resident: Торак районы industrial: Сәнәгый район heathland: Буш җир - lake_only: Күл + lake: Күл reservoir: сусаклагыч farm: Ферма cemetery: Зират @@ -909,7 +909,7 @@ tt: centre: Спорт үзәге reserve: Тыюлык military: Хәрби зона - school_only: Мәктәп + school: Мәктәп university: университет station: Тимер юл станциясе toilets: Бәдрәф diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f56a1bce1..6a48a0931 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1556,9 +1556,9 @@ uk: many: '%{count} скарг' other: "" no_reports: Скарг немає - report_created_at: Вперше повідомлено %{datetime} - last_resolved_at: В останнє розв'язано %{datetime} - last_updated_at: В останнє оновлено %{datetime}, %{displayname} + report_created_at_html: Вперше повідомлено %{datetime} + last_resolved_at_html: В останнє розвʼязано %{datetime} + last_updated_at_html: В останнє оновлено %{datetime}, %{displayname} resolve: Розв'язати ignore: Ігнорувати reopen: Повторно відкрити @@ -2430,29 +2430,29 @@ uk: subway: Лінія метро ferry: Паром light_rail: Швидкісний трамвай - tram_only: Трамвай + tram: Трамвай trolleybus: Тролейбус bus: Автобус cable_car: Канатна дорога chair_lift: Крісельний підйомник - runway_only: Злітно-посадкова смуга аеропорту + runway: Злітно-посадкова смуга аеропорту taxiway: Руліжна доріжка - apron_only: Перон аеропорту + apron: Перон аеропорту admin: Адміністративна межа capital: Столиця city: Місто - orchard_only: Сад + orchard: Сад vineyard: Виноградник - forest_only: Ліс + forest: Ліс wood: Дерева farmland: Поле - grass_only: Трава + grass: Трава meadow: Левада bare_rock: Голі скелі sand: Пісок golf: Поле для гольфу park: Парк - common_only: Суспільні землі + common: Суспільні землі built_up: Забудована територія resident: Жила зона retail: Торговельний район @@ -2460,7 +2460,7 @@ uk: commercial: Бізнесова зона heathland: Пустище scrubland: Чагарник - lake_only: Озеро + lake: Озеро reservoir: Водосховище intermittent_water: Водойма, що пересихає glacier: Льодовик @@ -2474,12 +2474,12 @@ uk: centre: Спортивний центр reserve: Заповідник military: Військова зона - school_only: Школа + school: Школа university: Університет hospital: Лікарня building: Значна споруда station: Залізнична станція - summit_only: Вершина + summit: Вершина peak: Пік tunnel: Тунель (пунктиром) bridge: Міст (жирна лінія) diff --git a/config/locales/vi.yml b/config/locales/vi.yml index c9b53e831..c4b68cb07 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1322,9 +1322,9 @@ vi: zero: Không có báo cáo one: 1 báo cáo other: '%{count} báo cáo' - report_created_at: Báo cáo lần đầu tiên vào %{datetime} - last_resolved_at: Giải quyết lần cuối cùng vào %{datetime} - last_updated_at: Cập nhật lần cuối cùng vào %{datetime} bởi %{displayname} + report_created_at_html: Báo cáo lần đầu tiên vào %{datetime} + last_resolved_at_html: Giải quyết lần cuối cùng vào %{datetime} + last_updated_at_html: Cập nhật lần cuối cùng vào %{datetime} bởi %{displayname} resolve: Giải quyết ignore: Bỏ qua reopen: Mở lại @@ -2025,21 +2025,21 @@ vi: subway: Đường ngầm cable_car: Đường xe cáp chair_lift: ghế cáp treo - runway_only: Đường băng + runway: Đường băng taxiway: đường băng - apron_only: Sân đậu máy bay + apron: Sân đậu máy bay admin: Biên giới hành chính - forest_only: Rừng trồng cây + forest: Rừng trồng cây wood: Rừng golf: Sân golf park: Công viên - common_only: Đất công + common: Đất công resident: Khu vá»±c nhà ở retail: Khu vá»±c buôn bán industrial: Khu vá»±c công nghiệp commercial: Khu vá»±c thÆ°Æ¡ng mại heathland: Vùng cây bụi - lake_only: Hồ + lake: Hồ reservoir: hồ chứa nước farm: Ruộng brownfield: Cánh đồng nâu @@ -2049,11 +2049,11 @@ vi: centre: Trung tâm thể thao reserve: Khu bảo tồn thiên niên military: Khu vá»±c quân sá»± - school_only: Trường học + school: Trường học university: đại học building: Kiến trúc quan trọng station: Nhà ga - summit_only: Đỉnh núi + summit: Đỉnh núi peak: đồi tunnel: Đường đứt nét = đường hầm bridge: Đường rắn = cầu diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index ec77e424a..fe7c35408 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -8,6 +8,7 @@ # Author: Amire80 # Author: Anakmalaysia # Author: Angrydog001 +# Author: Anterdc99 # Author: Assoc # Author: Boyuan Yang # Author: C933103 @@ -1506,9 +1507,9 @@ zh-CN: one: '%{count}个举报' other: '%{count}个举报' no_reports: 没有报告 - report_created_at: 首次报告于%{datetime} - last_resolved_at: 上次解决于%{datetime} - last_updated_at: 上次由%{displayname}于%{datetime}更新 + report_created_at_html: 首次报告于%{datetime} + last_resolved_at_html: 上次解决于%{datetime} + last_updated_at_html: 上次由%{displayname}于%{datetime}更新 resolve: 解决 ignore: 忽略 reopen: 重新开放 @@ -1921,6 +1922,7 @@ zh-CN: image: 图像 alt: 替代文本 url: URL + codeblock: 代码块 richtext_field: edit: 编辑 preview: 预览 @@ -2230,27 +2232,29 @@ zh-CN: subway: 地铁 ferry: 渡船 light_rail: 轻轨 - tram_only: 有轨电车 + tram: 有轨电车 trolleybus: 无轨电车 bus: 公共汽车 cable_car: 缆车 chair_lift: 吊椅缆车 - runway_only: 机场跑道 + runway: 机场跑道 taxiway: 滑行道 - apron_only: 机场停机坪 + apron: 机场停机坪 admin: 行政区边界 - orchard_only: 果园 + capital: 首都 + city: 城市 + orchard: 果园 vineyard: 葡萄园 - forest_only: 森林 + forest: 森林 wood: 树林 farmland: 农田 - grass_only: 草坪 + grass: 草坪 meadow: 草甸 bare_rock: 裸岩 sand: 沙地 golf: 高尔夫球场 park: 公园 - common_only: 公地 + common: 公地 built_up: 建成区 resident: 居住区 retail: 零售区 @@ -2258,7 +2262,7 @@ zh-CN: commercial: 商业区 heathland: 荒原 scrubland: 灌木丛林地 - lake_only: 湖 + lake: 湖 reservoir: 水库 intermittent_water: 间歇性水体 glacier: 冰川 @@ -2272,12 +2276,12 @@ zh-CN: centre: 体育馆 reserve: 自然保护区 military: 军事区 - school_only: 学校 + school: 学校 university: 大学 hospital: 医院 building: 特殊建筑物 station: 火车站 - summit_only: 山峰 + summit: 山峰 peak: 山峰 tunnel: 双虚线=隧道 bridge: 双实线=æ¡¥ @@ -2570,6 +2574,7 @@ zh-CN: application: 应用程序 permissions: 权限 no_applications_html: 您还没有授权任何%{oauth2}应用程序。 + oauth_2: OAuth 2 application: revoke: 撤销访问权限 confirm_revoke: 撤消此应用程序的访问权限？ @@ -2668,6 +2673,7 @@ zh-CN: importer: 撤销导入者权限 block_history: 激活的封禁 moderator_history: 执行封禁者 + revoke_all_blocks: 撤销所有封禁 comments: 评论 create_block: 封禁此用户 activate_user: 启用此用户 @@ -2765,6 +2771,11 @@ zh-CN: confirm: 您确定要撤销该封禁？ revoke: 撤销！ flash: 该封禁已经被撤销。 + revoke_all: + title: 正在撤销对%{block_on}的所有封禁 + heading_html: 正在撤销对%{block_on}的所有封禁 + confirm: 您确定要撤销%{active_blocks}吗？ + revoke: 撤销！ helper: time_future_html: 结束于 %{time}。 until_login: 用户登录时激活。 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 55dc7a619..b83cf01f4 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -1140,16 +1140,16 @@ zh-HK: motorway: 高速公路 rail: 鐵路 subway: 地鐵 - runway_only: 機場跑道 - apron_only: 機場停機坪 + runway: 機場跑道 + apron: 機場停機坪 admin: 行政邊界 - forest_only: 森林 + forest: 森林 golf: 哥爾夫球場 park: 公園 resident: 住宅區 industrial: 工業區 commercial: 商業區 - lake_only: 湖泊 + lake: 湖泊 reservoir: 水庫 brownfield: 棕地 cemetery: 墓地 @@ -1157,7 +1157,7 @@ zh-HK: centre: 運動中心 reserve: 自然保護區 military: 軍事區 - school_only: 學校 + school: 學校 university: 大學 station: 火車站 bicycle_shop: 單車店 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 344d9a2c9..03e7b99c8 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1472,9 +1472,9 @@ zh-TW: one: '%{count} 份回報' other: '%{count} 份回報' no_reports: 沒有回報 - report_created_at: 首次回報是在 %{datetime} - last_resolved_at: 最後回報是在 %{datetime} - last_updated_at: 最後更新是由 %{displayname} 在 %{datetime} + report_created_at_html: 首次回報是在 %{datetime} + last_resolved_at_html: 最後回報是在 %{datetime} + last_updated_at_html: 最後更新是由 %{displayname} 在 %{datetime} resolve: 解決 ignore: 忽略 reopen: 重新開啟 @@ -1620,6 +1620,7 @@ zh-TW: loaded: one: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。 other: 成功載入 %{count} 個可能軌跡點中的 %{trace_points} 個。 + all_your_traces_html: 您可以在 %{url} 找到所有您上傳成功的 GPX 軌跡。 subject: '[OpenStreetMap] GPX 匯入成功' signup_confirm: subject: '[OpenStreetMap] 歡迎加入 OpenStreetMap' @@ -2203,29 +2204,29 @@ zh-TW: subway: 地下鐵 ferry: 渡輪 light_rail: 輕軌 - tram_only: 路面電車 + tram: 路面電車 trolleybus: 無軌電車 bus: 公車 cable_car: 大型纜車 chair_lift: 升降吊椅 - runway_only: 機場跑道 + runway: 機場跑道 taxiway: 滑行道 - apron_only: 機場停機坪 + apron: 機場停機坪 admin: 行政區邊界 capital: 首都 city: 城市 - orchard_only: 果園 + orchard: 果園 vineyard: 葡萄園 - forest_only: 森林 + forest: 森林 wood: 森林 farmland: 農地 - grass_only: 草坪 + grass: 草坪 meadow: 牧草地 bare_rock: 裸岩 sand: 沙地 golf: 高爾夫球場 park: 公園 - common_only: 共有地 + common: 共有地 built_up: 組成面積 resident: 住宅區 retail: 商店區 @@ -2233,7 +2234,7 @@ zh-TW: commercial: 商業區 heathland: 石楠荒地 scrubland: 灌木叢林地 - lake_only: 湖泊 + lake: 湖泊 reservoir: 水庫 intermittent_water: 間歇性水體 glacier: 冰河 @@ -2247,12 +2248,12 @@ zh-TW: centre: 運動中心 reserve: 自然保護區 military: 軍事區 - school_only: 學校 + school: 學校；大學 university: 大學 hospital: 醫院 building: 重要建築 station: 鐵路車站 - summit_only: 頂峰 + summit: 頂峰 peak: 山峰 tunnel: 虛線邊框 = 隧道 bridge: 黑線邊框 = 橋樑 @@ -2653,6 +2654,7 @@ zh-TW: importer: 撤銷匯入權限 block_history: 已封鎖 moderator_history: 給予封鎖 + revoke_all_blocks: 撤銷所有封鎖 comments: 評論 create_block: 封鎖這位使用者 activate_user: 解除這位使用者的封鎖狀態 @@ -2750,6 +2752,16 @@ zh-TW: confirm: 你確定要撤銷這項封鎖？ revoke: 撤銷！ flash: 這項封鎖已被撤銷。 + revoke_all: + title: 正在撤銷對%{block_on}的封鎖 + heading_html: 正在撤銷對%{block_on}的所有封鎖 + empty: '%{name}沒有生效的封鎖。' + confirm: 您確定要撤銷%{active_blocks}嗎？ + active_blocks: + one: '%{count} 個生效封鎖' + other: '%{count} 個生效封鎖' + revoke: 撤銷！ + flash: 已撤銷所有生效封鎖。 helper: time_future_html: 於 %{time} 結束。 until_login: 生效直至這個使用者登入為止。 diff --git a/config/openlayers.cfg b/config/openlayers.cfg deleted file mode 100644 index 6f6b778a8..000000000 --- a/config/openlayers.cfg +++ /dev/null @@ -1,95 +0,0 @@ -[first] - -[last] - -[include] -OpenLayers/Map.js -OpenLayers/Control/ArgParser.js -OpenLayers/Control/Attribution.js -OpenLayers/Control/DragFeature.js -OpenLayers/Control/DrawFeature.js -OpenLayers/Control/LayerSwitcher.js -OpenLayers/Control/Navigation.js -OpenLayers/Control/PanZoomBar.js -OpenLayers/Control/Zoom.js -OpenLayers/Control/PinchZoom.js -OpenLayers/Control/ScaleLine.js -OpenLayers/Control/SelectFeature.js -OpenLayers/Control/TransformFeature.js -OpenLayers/Layer.js -OpenLayers/Layer/GML.js -OpenLayers/Layer/Markers.js -OpenLayers/Layer/SphericalMercator.js -OpenLayers/Layer/OSM.js -OpenLayers/Layer/Vector.js -OpenLayers/Tile.js -OpenLayers/Tile/Image.js -OpenLayers/Feature/Vector.js -OpenLayers/Strategy/Fixed.js -OpenLayers/Strategy/BBOX.js -OpenLayers/Protocol/HTTP.js -OpenLayers/Format/QueryStringFilter.js -OpenLayers/Format/GeoJSON.js -OpenLayers/Format/OSM.js -OpenLayers/Geometry/Point.js -OpenLayers/Geometry/LinearRing.js -OpenLayers/Handler/Point.js -OpenLayers/Handler/RegularPolygon.js -OpenLayers/Protocol/HTTP.js -OpenLayers/Renderer.js -OpenLayers/Renderer/Canvas.js -OpenLayers/Renderer/SVG.js -OpenLayers/Renderer/VML.js -OpenLayers/Rule.js -OpenLayers/Icon.js -OpenLayers/Marker.js -OpenLayers/Popup/FramedCloud.js -OpenLayers/Projection.js -OpenLayers/Console.js -OpenLayers/Lang.js -OpenLayers/Lang/ar.js -OpenLayers/Lang/be-tarask.js -OpenLayers/Lang/bg.js -OpenLayers/Lang/br.js -OpenLayers/Lang/ca.js -OpenLayers/Lang/cs-CZ.js -OpenLayers/Lang/da-DK.js -OpenLayers/Lang/de.js -OpenLayers/Lang/el.js -OpenLayers/Lang/en-CA.js -OpenLayers/Lang/en.js -OpenLayers/Lang/es.js -OpenLayers/Lang/fi.js -OpenLayers/Lang/fr.js -OpenLayers/Lang/fur.js -OpenLayers/Lang/gl.js -OpenLayers/Lang/gsw.js -OpenLayers/Lang/hr.js -OpenLayers/Lang/hsb.js -OpenLayers/Lang/hu.js -OpenLayers/Lang/ia.js -OpenLayers/Lang/id.js -OpenLayers/Lang/io.js -OpenLayers/Lang/is.js -OpenLayers/Lang/it.js -OpenLayers/Lang/ja.js -OpenLayers/Lang/km.js -OpenLayers/Lang/ksh.js -OpenLayers/Lang/lt.js -OpenLayers/Lang/nb.js -OpenLayers/Lang/nds.js -OpenLayers/Lang/nl.js -OpenLayers/Lang/nn.js -OpenLayers/Lang/oc.js -OpenLayers/Lang/pl.js -OpenLayers/Lang/pt-BR.js -OpenLayers/Lang/pt.js -OpenLayers/Lang/ru.js -OpenLayers/Lang/sk.js -OpenLayers/Lang/sv-SE.js -OpenLayers/Lang/te.js -OpenLayers/Lang/vi.js -OpenLayers/Lang/zh-CN.js -OpenLayers/Lang/zh-TW.js - -[exclude] diff --git a/db/migrate/20231213182102_add_canonical_user_index.rb b/db/migrate/20231213182102_add_canonical_user_index.rb new file mode 100644 index 000000000..905fb3248 --- /dev/null +++ b/db/migrate/20231213182102_add_canonical_user_index.rb @@ -0,0 +1,7 @@ +class AddCanonicalUserIndex < ActiveRecord::Migration[7.1] + disable_ddl_transaction! + + def change + add_index :users, "LOWER(NORMALIZE(display_name, NFKC))", :name => "users_display_name_canonical_idx", :algorithm => :concurrently + end +end diff --git a/db/structure.sql b/db/structure.sql index 0563417cd..c9fdebbc8 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2922,6 +2922,13 @@ CREATE INDEX user_tokens_user_id_idx ON public.user_tokens USING btree (user_id) CREATE UNIQUE INDEX users_auth_idx ON public.users USING btree (auth_provider, auth_uid); +-- +-- Name: users_display_name_canonical_idx; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX users_display_name_canonical_idx ON public.users USING btree (lower(NORMALIZE(display_name, NFKC))); + + -- -- Name: users_display_name_idx; Type: INDEX; Schema: public; Owner: - -- @@ -3581,6 +3588,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('23'), ('22'), ('21'), +('20231213182102'), ('20231206141457'), ('20231117170422'), ('20231101222146'), diff --git a/test/helpers/browse_tags_helper_test.rb b/test/helpers/browse_tags_helper_test.rb index 0786af61d..83c397b7d 100644 --- a/test/helpers/browse_tags_helper_test.rb +++ b/test/helpers/browse_tags_helper_test.rb @@ -54,7 +54,9 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_dom_equal "File:Test.jpg", html html = format_value("colour", "#f00") - assert_dom_equal %(#f00), html + dom = Rails::Dom::Testing.html_document_fragment.parse html + assert_select dom, "svg>rect>@fill", "#f00" + assert_match(/#f00$/, html) html = format_value("email", "foo@example.com") assert_dom_equal "foo@example.com", html diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 8ec0dc9bc..253f298a5 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -65,6 +65,26 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_select "form > div > input.is-invalid#user_display_name" end + def test_user_create_submit_mismatched_passwords + email = "newtester@osm.org" + display_name = "new_tester" + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => email, + :email_confirmation => email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "blahblah" } } + end + end + end + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_pass_crypt_confirmation" + end + def test_user_create_success new_email = "newtester@osm.org" display_name = "new_tester" @@ -94,18 +114,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end - # Check the e-mail - register_email = ActionMailer::Base.deliveries.first - - assert_equal register_email.to.first, new_email - # Check that the confirm account url is correct - assert_match(/#{@url}/, register_email.body.to_s) - - # Check the page assert_response :success assert_template "confirmations/confirm" + user = User.find_by(:email => "newtester@osm.org") + assert_not_nil user + assert_not_predicate user, :active? + + register_email = ActionMailer::Base.deliveries.first + assert_equal register_email.to.first, new_email + found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s} + assert found_confirmation_url + confirmation_url = Regexp.last_match(1) ActionMailer::Base.deliveries.clear + + post confirmation_url + + assert_response :redirect + assert_redirected_to welcome_path + + user.reload + assert_predicate user, :active? + + assert_equal user, User.authenticate(:username => new_email, :password => "testtest") end def test_user_create_no_tou_failure diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb index 8d597fc65..ea6e4ae27 100644 --- a/test/lib/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -2,7 +2,7 @@ require "test_helper" class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| - define_method(:"test_#{locale.to_s.underscore}") do + test locale.to_s do without_i18n_exceptions do # plural_keys = plural_keys(locale) @@ -57,7 +57,7 @@ class I18nTest < ActiveSupport::TestCase Rails.root.glob("config/locales/*.yml").each do |filename| lang = File.basename(filename, ".yml") - define_method(:"test_#{lang}_for_raw_html") do + test "#{lang} for raw html" do yml = YAML.load_file(filename) assert_nothing_raised do check_values_for_raw_html(yml) diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb index 537bb9d0d..751adcd82 100644 --- a/test/mailers/user_mailer_test.rb +++ b/test/mailers/user_mailer_test.rb @@ -15,7 +15,34 @@ class UserMailerTest < ActionMailer::TestCase end email = UserMailer.gpx_success(trace, 100) - assert_match(/one two three/, email.html_part.body.to_s) + assert_match("one, two, three", email.html_part.body.to_s) + end + + def test_gpx_success_all_traces_link + trace = create(:trace) + email = UserMailer.gpx_success(trace, 100) + body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body) + + url = Rails.application.routes.url_helpers.url_for(:controller => "traces", :action => "mine", :host => Settings.server_url, :protocol => Settings.server_protocol) + assert_select body, "a[href='#{url}']" + end + + def test_gpx_success_trace_link + trace = create(:trace) + email = UserMailer.gpx_success(trace, 100) + body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body) + + url = Rails.application.routes.url_helpers.show_trace_url(trace.user, trace, :host => Settings.server_url, :protocol => Settings.server_protocol) + assert_select body, "a[href='#{url}']", :text => trace.name + end + + def test_gpx_failure_no_trace_link + trace = create(:trace) + email = UserMailer.gpx_failure(trace, "some error") + body = Rails::Dom::Testing.html_document_fragment.parse(email.html_part.body) + + url = Rails.application.routes.url_helpers.show_trace_url(trace.user, trace, :host => Settings.server_url, :protocol => Settings.server_protocol) + assert_select body, "a[href='#{url}']", :count => 0 end def test_html_encoding diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 4e2675a2e..d21512f2a 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -27,10 +27,13 @@ class UserTest < ActiveSupport::TestCase end def test_unique_display_name - existing_user = create(:user) - new_user = build(:user, :display_name => existing_user.display_name) - assert_not new_user.save - assert_includes new_user.errors[:display_name], "has already been taken" + create(:user, :display_name => "H\u{e9}nryIV") + + %W[H\u{e9}nryIV he\u{301}nryiv H\u{c9}nry\u2163 he\u{301}nry\u2173].each do |name| + new_user = build(:user, :display_name => name) + assert_not new_user.save + assert_includes new_user.errors[:display_name], "has already been taken" + end end def test_email_valid