From: Andy Allan Date: Thu, 7 Mar 2024 13:51:44 +0000 (+0000) Subject: Merge pull request #4550 from tomhughes/drop-user-tokens X-Git-Tag: live~901 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0a10ac2e9be4246987951eea86ae201f14c65fc1?hp=29cc21c5990d7aec15e3cbed6e7410373904b5ac Merge pull request #4550 from tomhughes/drop-user-tokens Drop user tokens table --- diff --git a/Gemfile b/Gemfile index 832b96c9a..0b7e25ec9 100644 --- a/Gemfile +++ b/Gemfile @@ -53,6 +53,7 @@ gem "bootstrap_form", "~> 5.0" gem "cancancan" gem "config" gem "delayed_job_active_record" +gem "dry-validation" gem "frozen_record" gem "http_accept_language", "~> 2.1.1" gem "i18n-js", "~> 3.9.2" diff --git a/Gemfile.lock b/Gemfile.lock index 384a3055b..d57b4c5e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.894.0) + aws-partitions (1.895.0) aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -153,9 +153,8 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) concurrent-ruby (1.2.3) - config (5.1.0) + config (5.3.0) deep_merge (~> 1.2, >= 1.2.1) - dry-validation (~> 1.0, >= 1.0.0) connection_pool (2.4.1) crack (1.0.0) bigdecimal @@ -186,8 +185,7 @@ GEM doorkeeper-openid_connect (1.8.8) doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) dry-configurable (1.1.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) @@ -303,7 +301,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.7.1) - jwt (2.8.0) + jwt (2.8.1) base64 kgio (2.11.4) kramdown (2.4.0) @@ -325,7 +323,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) maxminddb (0.1.22) mini_magick (4.12.0) @@ -406,7 +404,7 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.5.5) + pg (1.5.6) popper_js (2.11.8) progress (3.6.0) psych (5.1.2) @@ -417,7 +415,7 @@ GEM quad_tile (1.0.1) racc (1.7.3) rack (2.2.8.1) - rack-cors (2.0.1) + rack-cors (2.0.2) rack (>= 2.0.0) rack-openid (1.4.2) rack (>= 1.1.0) @@ -487,7 +485,7 @@ GEM rouge (4.2.0) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.60.2) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -498,8 +496,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.1) + parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -510,18 +508,17 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) ruby-openid (2.9.2) ruby-progressbar (1.13.0) ruby-vips (2.2.1) ffi (~> 1.12) - ruby2_keywords (0.0.5) rubyzip (2.3.2) sanitize (6.1.0) crass (~> 1.0.2) @@ -619,6 +616,7 @@ DEPENDENCIES doorkeeper doorkeeper-i18n doorkeeper-openid_connect + dry-validation erb_lint factory_bot_rails faraday diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 5e0e835d4..ef4c0a778 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -4,8 +4,7 @@ class Ability include CanCan::Ability def initialize(user) - can [:relation, :relation_history, :way, :way_history, :node, :node_history, - :changeset, :query], :browse + can [:relation, :relation_history, :way, :way_history, :node, :node_history, :query], :browse can [:show], OldNode can [:show], OldWay can [:show], OldRelation @@ -17,7 +16,7 @@ class Ability can [:token, :request_token, :access_token, :test_request], :oauth if Settings.status != "database_offline" - can [:index, :feed], Changeset + can [:index, :feed, :show], Changeset can :index, ChangesetComment can [:confirm, :confirm_resend, :confirm_email], :confirmation can [:index, :rss, :show, :comments], DiaryEntry diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js index 5853193bc..43e2cf660 100644 --- a/app/assets/javascripts/login.js +++ b/app/assets/javascripts/login.js @@ -14,7 +14,8 @@ $(document).ready(function () { }); // Add click handler to show OpenID field - $("#openid_open_url").click(function () { + $("#openid_open_url").click(function (e) { + e.preventDefault(); $("#openid_url").val("http://"); $("#login_auth_buttons").hide(); $("#login_openid_url").show(); diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 88871a9e1..db291f6eb 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -6,6 +6,7 @@ class BrowseController < ApplicationController before_action -> { check_database_readable(:need_api => true) } before_action :require_oauth before_action :update_totp, :only => [:query] + before_action :require_moderator_for_unredacted_history, :only => [:relation_history, :way_history, :node_history] around_action :web_timeout authorize_resource :class => false @@ -57,24 +58,11 @@ class BrowseController < ApplicationController render :action => "not_found", :status => :not_found end - def changeset - @type = "changeset" - @changeset = Changeset.find(params[:id]) - @comments = if current_user&.moderator? - @changeset.comments.unscope(:where => :visible).includes(:author) - else - @changeset.comments.includes(:author) - end - @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page") - @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page") - @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page") - if @changeset.user.active? && @changeset.user.data_public? - @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first - @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first - end - rescue ActiveRecord::RecordNotFound - render :action => "not_found", :status => :not_found - end - def query; end + + private + + def require_moderator_for_unredacted_history + deny_access(nil) if params[:show_redactions] && !current_user&.moderator? + end end diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 5eb14629a..613a3ee2a 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -8,7 +8,8 @@ class ChangesetsController < ApplicationController before_action :authorize_web before_action :set_locale - before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed] + before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed, :show] + before_action :require_oauth, :only => :show before_action :check_database_writable, :only => [:subscribe, :unsubscribe] authorize_resource @@ -75,6 +76,26 @@ class ChangesetsController < ApplicationController index end + def show + @type = "changeset" + @changeset = Changeset.find(params[:id]) + @comments = if current_user&.moderator? + @changeset.comments.unscope(:where => :visible).includes(:author) + else + @changeset.comments.includes(:author) + end + @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page") + @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page") + @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page") + if @changeset.user.active? && @changeset.user.data_public? + @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first + @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first + end + render :layout => map_layout + rescue ActiveRecord::RecordNotFound + render :template => "browse/not_found", :status => :not_found, :layout => map_layout + end + ## # subscribe to a changeset def subscribe diff --git a/app/controllers/old_nodes_controller.rb b/app/controllers/old_nodes_controller.rb index a5b9cf563..9ef2ef881 100644 --- a/app/controllers/old_nodes_controller.rb +++ b/app/controllers/old_nodes_controller.rb @@ -8,6 +8,7 @@ class OldNodesController < ApplicationController authorize_resource + before_action :require_moderator_for_unredacted_history around_action :web_timeout def show @@ -16,4 +17,10 @@ class OldNodesController < ApplicationController rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end + + private + + def require_moderator_for_unredacted_history + deny_access(nil) if params[:show_redactions] && !current_user&.moderator? + end end diff --git a/app/controllers/old_relations_controller.rb b/app/controllers/old_relations_controller.rb index 9dda82021..b9e151a4f 100644 --- a/app/controllers/old_relations_controller.rb +++ b/app/controllers/old_relations_controller.rb @@ -8,6 +8,7 @@ class OldRelationsController < ApplicationController authorize_resource + before_action :require_moderator_for_unredacted_history around_action :web_timeout def show @@ -16,4 +17,10 @@ class OldRelationsController < ApplicationController rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end + + private + + def require_moderator_for_unredacted_history + deny_access(nil) if params[:show_redactions] && !current_user&.moderator? + end end diff --git a/app/controllers/old_ways_controller.rb b/app/controllers/old_ways_controller.rb index d18121e6f..dd3c3279f 100644 --- a/app/controllers/old_ways_controller.rb +++ b/app/controllers/old_ways_controller.rb @@ -8,6 +8,7 @@ class OldWaysController < ApplicationController authorize_resource + before_action :require_moderator_for_unredacted_history around_action :web_timeout def show @@ -16,4 +17,10 @@ class OldWaysController < ApplicationController rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end + + private + + def require_moderator_for_unredacted_history + deny_access(nil) if params[:show_redactions] && !current_user&.moderator? + end end diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb index a70883eda..26b21b6d9 100644 --- a/app/controllers/passwords_controller.rb +++ b/app/controllers/passwords_controller.rb @@ -42,12 +42,10 @@ class PasswordsController < ApplicationController if user token = user.generate_token_for(:password_reset) UserMailer.lost_password(user, token).deliver_later - flash[:notice] = t ".notice email on way" - redirect_to login_path - else - flash.now[:error] = t ".notice email cannot find" - render :new end + + flash[:notice] = t ".send_paranoid_instructions" + redirect_to login_path end def update diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 67b3c7cf7..53e980fdc 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -72,10 +72,10 @@ module BrowseHelper def type_and_paginated_count(type, pages) if pages.page_count == 1 - t "browse.changeset.#{type}", + t ".#{type.pluralize}", :count => pages.item_count else - t "browse.changeset.#{type}_paginated", + t ".#{type.pluralize}_paginated", :x => pages.current_page.first_item, :y => pages.current_page.last_item, :count => pages.item_count diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index 3a26c2001..dbee08c50 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -18,15 +18,15 @@ module ChangesetsHelper else action = :closed time = time_ago_in_words(changeset.closed_at, :scope => :"datetime.distance_in_words_ago") - title = safe_join([t("browse.created"), ": ", l(changeset.created_at), " ".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)]) + title = safe_join([t("changesets.show.created", :when => l(changeset.created_at)), " ".html_safe, t("changesets.show.closed", :when => l(changeset.closed_at))]) datetime = changeset.closed_at.xmlschema end if params.key?(:display_name) - t "browse.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime) + t "changesets.show.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime) else - t "browse.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime), - :user => changeset_user_link(changeset) + t "changesets.show.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime), + :user => changeset_user_link(changeset) end end diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 7d3f8e829..195332b09 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,5 +1,9 @@

- <%= t "browse.version" %> + <%= if common_details.redacted? + t "browse.redacted_version" + else + t "browse.version" + end %> #<%= link_to_unless_current common_details.version, :controller => "old_#{@type.pluralize}", :action => :show, :version => common_details.version %>

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index 6c6c1fdf3..e395a4283 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -1,4 +1,4 @@ -<% if node.redacted? %> +<% if node.redacted? && !params[:show_redactions] %>
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.node"), @@ -7,7 +7,7 @@ :id => node.redaction.id), node.redaction) %>
<% else %> -
+ <%= tag.div :class => ["browse-section", "browse-node", { "text-muted" => node.redacted? }] do %> <%= render :partial => "browse/common_details", :object => node %> <% unless node.ways.empty? and node.containing_relation_members.empty? %> @@ -31,5 +31,5 @@ <% end %> <% end %> -
+ <% end %> <% end %> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index c513ea6d1..922e642cc 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -1,4 +1,4 @@ -<% if relation.redacted? %> +<% if relation.redacted? && !params[:show_redactions] %>
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.relation"), @@ -7,7 +7,7 @@ :id => relation.redaction.id), relation.redaction) %>
<% else %> -
+ <%= tag.div :class => ["browse-section", "browse-relation", { "text-muted" => relation.redacted? }] do %> <%= render :partial => "browse/common_details", :object => relation %> <% unless relation.containing_relation_members.empty? %> @@ -29,5 +29,5 @@ <% end %> -
+ <% end %> <% end %> diff --git a/app/views/browse/_version_actions.erb b/app/views/browse/_version_actions.erb new file mode 100644 index 000000000..46bfd0dc2 --- /dev/null +++ b/app/views/browse/_version_actions.erb @@ -0,0 +1,32 @@ +
+ <%= link_to t("browse.view_details"), :controller => :browse, :action => @type %> + <% if !@feature.redacted? %> + · + <%= link_to t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => :version %> + <% elsif current_user&.moderator? %> + · + <% if !params[:show_redactions] %> + <%= link_to t("browse.view_redacted_data"), :params => { :show_redactions => true } %> + <% else %> + <%= link_to t("browse.view_redaction_message") %> + <% end %> + <% end %> +
+ +
+ <% if @feature.version > 1 %> + <%= link_to({ :version => @feature.version - 1 }, { :class => "icon-link" }) do %> + <%= previous_page_svg_tag :height => 11 %> + <%= "#{t('browse.version')} ##{@feature.version - 1}" %> + <% end %> + · + <% end %> + <%= link_to t("browse.view_history"), :controller => :browse, :action => "#{@type}_history" %> + <% unless @feature.latest_version? %> + · + <%= link_to({ :version => @feature.version + 1 }, { :class => "icon-link" }) do %> + <%= "#{t('browse.version')} ##{@feature.version + 1}" %> + <%= next_page_svg_tag :height => 11 %> + <% end %> + <% end %> +
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 7197298ac..d93321a0f 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,4 +1,4 @@ -<% if way.redacted? %> +<% if way.redacted? && !params[:show_redactions] %>
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), @@ -7,7 +7,7 @@ :id => way.redaction.id), way.redaction) %>
<% else %> -
+ <%= tag.div :class => ["browse-section", "browse-way", { "text-muted" => way.redacted? }] do %> <%= render :partial => "browse/common_details", :object => way %> <% unless way.containing_relation_members.empty? %> @@ -39,5 +39,5 @@ <% end %> -
+ <% end %> <% end %> diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb index cd333d3bf..9ee9f807f 100644 --- a/app/views/browse/feature.html.erb +++ b/app/views/browse/feature.html.erb @@ -18,6 +18,10 @@ · <% end %> <%= link_to t("browse.view_history"), :action => "#{@type}_history" %> + <% if current_user&.moderator? %> + · + <%= link_to(t("browse.view_unredacted_history"), :action => "#{@type}_history", :params => { :show_redactions => true }) %> + <% end %> <% if @feature.version > 1 %> · <%= link_to({ :controller => "old_#{@type.pluralize}", :action => :show, :version => @feature.version }, :class => "icon-link") do %> diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb index bf11e8f1e..b557c339b 100644 --- a/app/views/browse/history.html.erb +++ b/app/views/browse/history.html.erb @@ -8,4 +8,11 @@ <%= link_to(t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => "history") %> · <%= link_to(t("browse.view_details"), :action => @type) %> + <% if params[:show_redactions] %> + · + <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %> + <% elsif current_user&.moderator? %> + · + <%= link_to(t("browse.view_unredacted_history"), :action => "#{@type}_history", :params => { :show_redactions => true }) %> + <% end %> diff --git a/app/views/changeset_comments/_comments.rss.builder b/app/views/changeset_comments/_comments.rss.builder index 59973965f..b1344b488 100644 --- a/app/views/changeset_comments/_comments.rss.builder +++ b/app/views/changeset_comments/_comments.rss.builder @@ -2,8 +2,8 @@ comments.each do |comment| xml.item do xml.title t(".comment", :author => comment.author.display_name, :changeset_id => comment.changeset.id.to_s) - xml.link url_for(:controller => "browse", :action => "changeset", :id => comment.changeset.id, :anchor => "c#{comment.id}", :only_path => false) - xml.guid url_for(:controller => "browse", :action => "changeset", :id => comment.changeset.id, :anchor => "c#{comment.id}", :only_path => false) + xml.link changeset_url(comment.changeset, :anchor => "c#{comment.id}") + xml.guid changeset_url(comment.changeset, :anchor => "c#{comment.id}") xml.description do xml.cdata! render(:partial => "comment", :object => comment, :formats => [:html]) diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb similarity index 100% rename from app/views/browse/_paging_nav.html.erb rename to app/views/changesets/_paging_nav.html.erb diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder index 521dffe5f..c8ffe1a81 100644 --- a/app/views/changesets/index.atom.builder +++ b/app/views/changesets/index.atom.builder @@ -41,16 +41,16 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, xhtml.style "th { text-align: left } tr { vertical-align: top }" xhtml.table do |table| table.tr do |tr| - tr.th t("browse.created") + tr.th t(".feed.created") tr.td l(changeset.created_at) end table.tr do |tr| - tr.th t("browse.closed") + tr.th t(".feed.closed") tr.td l(changeset.closed_at) end if changeset.user.data_public? table.tr do |tr| - tr.th t("browse.changeset.belongs_to") + tr.th t(".feed.belongs_to") tr.td do |td| td.a changeset.user.display_name, :href => user_url(changeset.user, :only_path => false) end diff --git a/app/views/browse/changeset.html.erb b/app/views/changesets/show.html.erb similarity index 98% rename from app/views/browse/changeset.html.erb rename to app/views/changesets/show.html.erb index db6b9c966..57a3fdb56 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/changesets/show.html.erb @@ -8,7 +8,7 @@

<%= changeset_details(@changeset) %>

- <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> + <%= render :partial => "browse/tag_details", :object => @changeset.tags.except("comment") %>
diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 7e78a6895..b789f721b 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -25,9 +25,7 @@ <% if changeset %> <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %> <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %> - <%= link_to(comment, - { :controller => "browse", :action => "changeset", :id => changeset.id }, - { :title => t("changesets.changeset.view_changeset_details") }) %> + <%= link_to comment, changeset_path(changeset), :title => t("changesets.changeset.view_changeset_details") %> <% else %> <%= t "changesets.changeset.no_edits" %> <% end %> diff --git a/app/views/old_nodes/show.html.erb b/app/views/old_nodes/show.html.erb index 90be6b7c9..093a3e7c1 100644 --- a/app/views/old_nodes/show.html.erb +++ b/app/views/old_nodes/show.html.erb @@ -4,28 +4,4 @@ <%= render :partial => "browse/node", :object => @feature %> -
- <% unless @feature.redacted? %> - <%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %> - · - <% end %> - <%= link_to t("browse.view_details"), node_path(@feature.node_id) %> -
- -
- <% if @feature.version > 1 %> - <%= link_to old_node_path(@feature.node_id, @feature.version - 1), :class => "icon-link" do %> - <%= previous_page_svg_tag :height => 11 %> - <%= "#{t('browse.version')} ##{@feature.version - 1}" %> - <% end %> - · - <% end %> - <%= link_to t("browse.view_history"), node_history_path(@feature.node_id) %> - <% if @feature.version < @feature.current_node.version %> - · - <%= link_to old_node_path(@feature.node_id, @feature.version + 1), :class => "icon-link" do %> - <%= "#{t('browse.version')} ##{@feature.version + 1}" %> - <%= next_page_svg_tag :height => 11 %> - <% end %> - <% end %> -
+<%= render :partial => "browse/version_actions" %> diff --git a/app/views/old_relations/show.html.erb b/app/views/old_relations/show.html.erb index 42e80e651..94e3674d8 100644 --- a/app/views/old_relations/show.html.erb +++ b/app/views/old_relations/show.html.erb @@ -4,28 +4,4 @@ <%= render :partial => "browse/relation", :object => @feature %> -
- <% unless @feature.redacted? %> - <%= link_to t("browse.download_xml"), relation_version_path(*@feature.id) %> - · - <% end %> - <%= link_to t("browse.view_details"), relation_path(@feature.relation_id) %> -
- -
- <% if @feature.version > 1 %> - <%= link_to old_relation_path(@feature.relation_id, @feature.version - 1), :class => "icon-link" do %> - <%= previous_page_svg_tag :height => 11 %> - <%= "#{t('browse.version')} ##{@feature.version - 1}" %> - <% end %> - · - <% end %> - <%= link_to t("browse.view_history"), relation_history_path(@feature.relation_id) %> - <% if @feature.version < @feature.current_relation.version %> - · - <%= link_to old_relation_path(@feature.relation_id, @feature.version + 1), :class => "icon-link" do %> - <%= "#{t('browse.version')} ##{@feature.version + 1}" %> - <%= next_page_svg_tag :height => 11 %> - <% end %> - <% end %> -
+<%= render :partial => "browse/version_actions" %> diff --git a/app/views/old_ways/show.html.erb b/app/views/old_ways/show.html.erb index b16c6b291..1e4d14c80 100644 --- a/app/views/old_ways/show.html.erb +++ b/app/views/old_ways/show.html.erb @@ -4,28 +4,4 @@ <%= render :partial => "browse/way", :object => @feature %> -
- <% unless @feature.redacted? %> - <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %> - · - <% end %> - <%= link_to t("browse.view_details"), way_path(@feature.way_id) %> -
- -
- <% if @feature.version > 1 %> - <%= link_to old_way_path(@feature.way_id, @feature.version - 1), :class => "icon-link" do %> - <%= previous_page_svg_tag :height => 11 %> - <%= "#{t('browse.version')} ##{@feature.version - 1}" %> - <% end %> - · - <% end %> - <%= link_to t("browse.view_history"), way_history_path(@feature.way_id) %> - <% if @feature.version < @feature.current_way.version %> - · - <%= link_to old_way_path(@feature.way_id, @feature.version + 1), :class => "icon-link" do %> - <%= "#{t('browse.version')} ##{@feature.version + 1}" %> - <%= next_page_svg_tag :height => 11 %> - <% end %> - <% end %> -
+<%= render :partial => "browse/version_actions" %> diff --git a/config/locales/af.yml b/config/locales/af.yml index d02140f27..f6374862e 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -278,8 +278,6 @@ af: update: success: Gebruikersbesonderhede suksesvol bygewerk. browse: - created: Geskep - closed: Gesluit version: Weergawe in_changeset: Wysigingstel anonymous: anoniem @@ -295,21 +293,6 @@ af: view_history: Beskou geskiedenis view_details: Bekyk detail location: 'Ligging:' - changeset: - title: 'Wysigingstel: %{id}' - belongs_to: Skrywer - node: Knooppunte (%{count}) - node_paginated: Knooppunte (%{x}-%{y} van %{count}) - way: Weë (%{count}) - way_paginated: Weë (%{x}-%{y} van %{count}) - relation: Verwantskappe (%{count}) - relation_paginated: Verwantskappe (%{x}-%{y} of %{count}) - changesetxml: Wysigingstel XML - osmchangexml: osmWysiging XML - join_discussion: Meld aan en gesels saam - discussion: Bespreking - still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel - gesluit is. node: title_html: 'Knooppunt: %{name}' history_title_html: 'Knooppuntgeskiedenis: %{name}' @@ -416,6 +399,24 @@ af: feed: title: Wysigingstel %{id} title_comment: Wysigingstel %{id} - %{comment} + created: Geskep + closed: Gesluit + belongs_to: Skrywer + show: + title: 'Wysigingstel: %{id}' + discussion: Bespreking + join_discussion: Meld aan en gesels saam + still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel + gesluit is. + changesetxml: Wysigingstel XML + osmchangexml: osmWysiging XML + paging_nav: + nodes: Knooppunte (%{count}) + nodes_paginated: Knooppunte (%{x}-%{y} van %{count}) + ways: Weë (%{count}) + ways_paginated: Weë (%{x}-%{y} van %{count}) + relations: Verwantskappe (%{count}) + relations_paginated: Verwantskappe (%{x}-%{y} of %{count}) timeout: sorry: Jammer, die lys wysigingstelle wat u versoek het, neem lank om uit te haal. @@ -1525,8 +1526,6 @@ af: heading: Wagwoord vergeet? email address: 'E-posadres:' new password button: Herstel wagwoord - create: - notice email cannot find: E-posadres is ongelukkig onverkrygbaar, jammer. edit: title: Herstel wagwoord heading: Herstel wagwoord vir %{user} diff --git a/config/locales/aln.yml b/config/locales/aln.yml index b3bd19cf7..a54887498 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -144,10 +144,6 @@ aln: emailin per konfirmim. success: Informatat e shfrytëzuesit u ndryshuan me sukses. browse: - changeset: - title: Ndryshim - changesetxml: Ndryshim en XML - osmchangexml: Ndryshim i OSM-s en XML relation_member: entry_role_html: '%{type} %{name} asht si %{role}' type: @@ -202,6 +198,10 @@ aln: feed: title: Ndryshim %{id} title_comment: Ndryshimi %{id} - %{comment} + show: + title: Ndryshim + changesetxml: Ndryshim en XML + osmchangexml: Ndryshim i OSM-s en XML dashboards: contact: km away: '%{count}km larg' @@ -781,10 +781,6 @@ aln: new password button: Ndrysho fjalkalimin help_text: Shkrueje email adresen që je regjistrue me to, do t'ju deromi një lidhe rreth ksaj ku ju muni me ndrru fjalkalimin - create: - notice email on way: Na vjen keq që e keni hup :-( po ni email ka me ju ardh - së shpejti edhe muni me ricaktu. - notice email cannot find: Smujtëm me gjet qat email adres, na vjen keq. edit: title: Ricakto fjalëkalimin heading: Ricakto fjalëkalimin për %{user} diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 527d73710..6c5334204 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -404,12 +404,6 @@ ar: destroy: success: تم حذف الحساب. browse: - created: تم الإنشاء - closed: تم الإغلاق - created_ago_html: تم إنشاء %{time_ago} - closed_ago_html: مغلق %{time_ago} - created_ago_by_html: تم إنشاء %{time_ago} بواسطة %{user} - closed_ago_by_html: مغلق %{time_ago} بواسطة %{user} deleted_ago_by_html: تم حذف %{time_ago} بواسطة %{user} edited_ago_by_html: تم تحرير %{time_ago} بواسطة %{user} version: الإصدار @@ -428,23 +422,6 @@ ar: view_history: عرض السجل view_details: شاهد التفاصيل location: 'الموقع:' - changeset: - title: حزمة التغييرات %{id} - belongs_to: الصانع - node: العقد (%{count}) - node_paginated: العقد (%{x}-%{y} من %{count}) - way: الطرق (%{count}) - way_paginated: الطرق (%{x}-%{y} من %{count}) - relation: الصلات (%{count}) - relation_paginated: الصلات (%{x}-%{y} من %{count}) - hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user} - comment_by_html: تعليق من %{user}%{time_ago} - changesetxml: حزمة التغييرات XML - osmchangexml: osmChange XML - join_discussion: ادخل للاشتراك في المناقشة - discussion: مناقشة - still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق - مجموعة التغييرات. node: title_html: 'عقدة: %{name}' history_title_html: 'تاريخ العقدة: %{name}' @@ -546,6 +523,30 @@ ar: feed: title: حزمة التغييرات %{id} title_comment: حزمة التغييرات %{id} - %{comment} + created: تم الإنشاء + closed: تم الإغلاق + belongs_to: الصانع + show: + title: حزمة التغييرات %{id} + created_ago_html: تم إنشاء %{time_ago} + closed_ago_html: مغلق %{time_ago} + created_ago_by_html: تم إنشاء %{time_ago} بواسطة %{user} + closed_ago_by_html: مغلق %{time_ago} بواسطة %{user} + discussion: مناقشة + join_discussion: ادخل للاشتراك في المناقشة + still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق + مجموعة التغييرات. + comment_by_html: تعليق من %{user}%{time_ago} + hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user} + changesetxml: حزمة التغييرات XML + osmchangexml: osmChange XML + paging_nav: + nodes: العقد (%{count}) + nodes_paginated: العقد (%{x}-%{y} من %{count}) + ways: الطرق (%{count}) + ways_paginated: الطرق (%{x}-%{y} من %{count}) + relations: الصلات (%{count}) + relations_paginated: الصلات (%{x}-%{y} من %{count}) timeout: sorry: عذرا، لقد استغرقت قائمة مجموعات التغييرات اللتي طلبتها وقتا طويلا لاستردادها. changeset_comments: @@ -1823,10 +1824,6 @@ ar: new password button: أعد ضبط كلمة السر help_text: أدخل عنوان البريد الإلكتروني الذي استخدمته للتسجيل، وسوف نرسل عليه رابطا يمكنك استخدامه لإعادة تعيين كلمة المرور. - create: - notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رسالة إلكترونية في طريقها - إليك ستمكنك من إعادة تعيينها قريبًا. - notice email cannot find: معذرةً، تعذر إيجاد عنوان البريد الإلكتروني. edit: title: إعادة ضبط كلمة السر heading: إعادة تعيين كلمة السر %{user} diff --git a/config/locales/arz.yml b/config/locales/arz.yml index a7fafef89..8b767471c 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -124,10 +124,6 @@ arz: لمذكره تأكيد العنوان الإلكترونى الجديد. success: تم تحديث معلومات المستخدم بنجاح. browse: - changeset: - title: 'حزمه التغييرات: %{id}' - changesetxml: حزمه التغييرات إكس إم إل - osmchangexml: osmChange XML relation_member: entry_role_html: '%{type} %{name} كــ %{role}' type: @@ -170,6 +166,10 @@ arz: feed: title: حزمه التغييرات %{id} title_comment: حزمه التغييرات %{id} - %{comment} + show: + title: 'حزمه التغييرات: %{id}' + changesetxml: حزمه التغييرات إكس إم إل + osmchangexml: osmChange XML dashboards: contact: km away: على بعد %{count}كم @@ -702,10 +702,6 @@ arz: new password button: إعاده ضبط كلمه المرور help_text: أدخل عنوان البريد الإلكترونى الذى استخدمته للتسجيل ، وسوف نرسل عليه رابط يمكنك استخدامه لإعاده تعيين كلمه المرور. - create: - notice email on way: نأسف لأنك أضعتها :-( ولكن هناك رساله إلكترونيه فى طريقها - إليك ستمكنك من إعاده تعيينها قريبًا. - notice email cannot find: تعذّر إيجاد عنوان البريد الإلكترونى، نحن آسفون. edit: title: إعاده ضبط كلمه المرور heading: إعاده تعيين كلمه المرور %{user} diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 4c7c087ab..08144489c 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -259,8 +259,6 @@ ast: destroy: success: Desanicióse la cuenta. browse: - created: Creáu - closed: Zarráu version: Versión in_changeset: Conxuntu de cambios anonymous: anónimu @@ -270,21 +268,6 @@ ast: view_history: Ver historial view_details: Ver detalles location: 'Allugamientu:' - changeset: - title: 'Conxuntu de cambios: %{id}' - belongs_to: Autor - node: Nuedos (%{count}) - node_paginated: Nuedos (%{x}-%{y} de %{count}) - way: Víes (%{count}) - way_paginated: Víes (%{x}-%{y} de %{count}) - relation: Rellaciones (%{count}) - relation_paginated: Rellaciones (%{x}-%{y} de %{count}) - changesetxml: Conxuntu de cambeos XML - osmchangexml: osmChange XML - join_discussion: Anicia sesión pa xunite al alderique - discussion: Alderique - still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en - zarrando'l conxuntu de cambios. node: title_html: 'Nuedu: %{name}' history_title_html: 'Historial del nuedu: %{name}' @@ -383,6 +366,24 @@ ast: feed: title: Conxuntu de cambeos %{id} title_comment: Conxuntu de cambeos %{id} - %{comment} + created: Creáu + closed: Zarráu + belongs_to: Autor + show: + title: 'Conxuntu de cambios: %{id}' + discussion: Alderique + join_discussion: Anicia sesión pa xunite al alderique + still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en + zarrando'l conxuntu de cambios. + changesetxml: Conxuntu de cambeos XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nuedos (%{count}) + nodes_paginated: Nuedos (%{x}-%{y} de %{count}) + ways: Víes (%{count}) + ways_paginated: Víes (%{x}-%{y} de %{count}) + relations: Rellaciones (%{count}) + relations_paginated: Rellaciones (%{x}-%{y} de %{count}) timeout: sorry: Llevó demasiao tiempu baxar la llista de conxuntos de cambeos que pidisti. changeset_comments: @@ -1425,10 +1426,6 @@ ast: new password button: Reestablecer contraseña help_text: Escribi les señes de corréu qu'usasti pa date d'alta, unviarémoste un enllaz que pues usar pa reestablecer la contraseña. - create: - notice email on way: Sentimos que la perdieres :-( pero hai un corréu en camín - pa que puedas reaniciala ceo. - notice email cannot find: Nun s'alcontró esa direición de corréu. edit: title: Reestablecer contraseña heading: Reestablecer la contraseña de %{user} diff --git a/config/locales/az.yml b/config/locales/az.yml index 32e8bc347..53cbf4a77 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -162,8 +162,6 @@ az: link text: bu nədir? save changes button: Dəyişiklikləri yadda saxla browse: - created: Yaradılıb - closed: Bağlanıb version: Versiya in_changeset: Dəyişikliklər anonymous: anonim @@ -173,12 +171,6 @@ az: view_history: Tarixçəyə bax view_details: Xüsusiyyətlərə bax location: 'Yerləşməsi:' - changeset: - title: 'Dəyişikliklər dəsti: %{id}' - belongs_to: Müəllif - node: (%{count}) nöqtə - changesetxml: XML dəyişikliklər dəsti - osmchangexml: osmChange XML relation: members: İştirakçılar relation_member: @@ -247,6 +239,15 @@ az: feed: title: Dəyişikliklər dəsti %{id} title_comment: Dəyişikliklər dəsti %{id} - %{comment} + created: Yaradılıb + closed: Bağlanıb + belongs_to: Müəllif + show: + title: 'Dəyişikliklər dəsti: %{id}' + changesetxml: XML dəyişikliklər dəsti + osmchangexml: osmChange XML + paging_nav: + nodes: (%{count}) nöqtə timeout: sorry: Bağışlayın, tələb etdiyiniz dəyişikliklər dəstinin siyahısı, çıxarıla bilmək üçün cox böyükdür. diff --git a/config/locales/ba.yml b/config/locales/ba.yml index ca53e54c5..131bbb2d8 100644 --- a/config/locales/ba.yml +++ b/config/locales/ba.yml @@ -251,8 +251,6 @@ ba: comment: Комментарий full: Тулы текст browse: - created: Булдырылған - closed: Ябыҡ version: Версия in_changeset: Төҙәтеүҙәр пакеты anonymous: Аноним @@ -268,21 +266,6 @@ ba: view_history: Тарих view_details: Ентекләберәк location: 'Географик урын:' - changeset: - title: 'Төҙәтеүҙәр пакеты: %{id}' - belongs_to: Автор - node: Нөктәләр (%{count}) - node_paginated: Нөктәләр (%{x}-%{y} из %{count}) - way: Һыҙыҡтар (%{count}) - way_paginated: Юлдар (%{x}-%{y} %{count}һынан) - relation: Мөнәсәбәттәр (%{count}) - relation_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан) - changesetxml: Төҙәтеүҙәр пакетының XML-ы - osmchangexml: osmChange XML - join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ - discussion: Фекер алышыу - still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан - һуң ғына буласаҡ. node: title_html: 'Нөктә: %{name}' history_title_html: 'Нөктә тарихы: %{name}' @@ -387,6 +370,24 @@ ba: feed: title: 'Төҙәтеүҙәр пакеты: %{id}' title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment} + created: Булдырылған + closed: Ябыҡ + belongs_to: Автор + show: + title: 'Төҙәтеүҙәр пакеты: %{id}' + discussion: Фекер алышыу + join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ + still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан + һуң ғына буласаҡ. + changesetxml: Төҙәтеүҙәр пакетының XML-ы + osmchangexml: osmChange XML + paging_nav: + nodes: Нөктәләр (%{count}) + nodes_paginated: Нөктәләр (%{x}-%{y} из %{count}) + ways: Һыҙыҡтар (%{count}) + ways_paginated: Юлдар (%{x}-%{y} %{count}һынан) + relations: Мөнәсәбәттәр (%{count}) + relations_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан) timeout: sorry: Ҡыҙғанысҡа ҡаршы, һеҙ һораған төҙәтмә пакеттары исемлеген алыу өсөн күп ваҡыт талап итә. diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 6825dd85c..a99fc301f 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -281,8 +281,6 @@ be-Tarask: пошты. success: Зьвесткі пра карыстальніка пасьпяхова абноўленыя. browse: - created: Створана - closed: Закрытае version: Вэрсія in_changeset: Набор зьменаў anonymous: ананім @@ -302,17 +300,6 @@ be-Tarask: view_history: Паглядзець гісторыю view_details: Паглядзець зьвесткі location: 'Месцазнаходжаньне:' - changeset: - title: 'Набор зьменаў: %{id}' - belongs_to: Аўтар - node: Пункты (%{count}) - node_paginated: Пункты (%{x}-%{y} з %{count}) - way: Лініі (%{count}) - way_paginated: Лініі (%{x}-%{y} з %{count}) - relation: Сувязі (%{count}) - relation_paginated: Сувязі (%{x}-%{y} з %{count}) - changesetxml: Набор зьменаў у фармаце XML - osmchangexml: osmChange XML way: nodes: Вузлы nodes_count: @@ -396,6 +383,20 @@ be-Tarask: feed: title: Набор зьменаў %{id} title_comment: Набор зьменаў %{id} - %{comment} + created: Створана + closed: Закрытае + belongs_to: Аўтар + show: + title: 'Набор зьменаў: %{id}' + changesetxml: Набор зьменаў у фармаце XML + osmchangexml: osmChange XML + paging_nav: + nodes: Пункты (%{count}) + nodes_paginated: Пункты (%{x}-%{y} з %{count}) + ways: Лініі (%{count}) + ways_paginated: Лініі (%{x}-%{y} з %{count}) + relations: Сувязі (%{count}) + relations_paginated: Сувязі (%{x}-%{y} з %{count}) timeout: sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для атрыманьня. @@ -1039,11 +1040,6 @@ be-Tarask: new password button: Ачысьціць пароль help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі, і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для зьмены паролю. - create: - notice email on way: Шкада, што Вы яго згубілі, але электронны ліст ужо дасланы, - таму Вы хутка зможаце яго зьмяніць. - notice email cannot find: Прабачце, не атрымалася знайсьці такога адрасу электроннай - пошты. edit: title: Ачысьціць пароль heading: Скінуць пароль для %{user} diff --git a/config/locales/be.yml b/config/locales/be.yml index 0c3771d46..34f891672 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -317,8 +317,6 @@ be: сваю эл.пошту, вам павінен прыйсці запыт на пацвярджэнне вашага новага адраса. success: Звесткі аб карыстальніку паспяхова абноўленыя. browse: - created: Створаны - closed: Зачынены version: Версія in_changeset: Пакет правак anonymous: ананімны @@ -328,21 +326,6 @@ be: view_history: Прагляд гісторыі view_details: Прагляд звестак location: 'Месца:' - changeset: - title: 'Набор змен: %{id}' - belongs_to: Аўтар - node: Пункты (%{count}) - node_paginated: Пункты (%{x}-%{y} з %{count}) - way: Лініі (%{count}) - way_paginated: Лініі (%{x}-%{y} з %{count}) - relation: Дачыненні (%{count}) - relation_paginated: Дачыненні (%{x}-%{y} з %{count}) - changesetxml: XML пакета правак - osmchangexml: osmChange XML - join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання - discussion: Абмеркаванне - still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі - пакет правак закрыецца. node: title_html: 'Пункт: %{name}' history_title_html: 'Гісторыя пункта: %{name}' @@ -441,6 +424,24 @@ be: feed: title: Набор змен %{id} title_comment: Набор змен %{id} - %{comment} + created: Створаны + closed: Зачынены + belongs_to: Аўтар + show: + title: 'Набор змен: %{id}' + discussion: Абмеркаванне + join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання + still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі + пакет правак закрыецца. + changesetxml: XML пакета правак + osmchangexml: osmChange XML + paging_nav: + nodes: Пункты (%{count}) + nodes_paginated: Пункты (%{x}-%{y} з %{count}) + ways: Лініі (%{count}) + ways_paginated: Лініі (%{x}-%{y} з %{count}) + relations: Дачыненні (%{count}) + relations_paginated: Дачыненні (%{x}-%{y} з %{count}) timeout: sorry: Выбачайце, спіс набораў правак, што Вы запыталі, занадта вялікі для атрымання. changeset_comments: @@ -1448,10 +1449,6 @@ be: new password button: Выслаць мне новы пароль help_text: Увядзіце адрас электроннай пошты, які Вы выкарыстоўвалі пры рэгістрацыі, і мы вышлем Вам спасылку, якую Вы зможаце выкарыстаць для змены паролю. - create: - notice email on way: Жаль, што вы яго згубілі :-( але ліст ужо адпраўлены, і - вы хутка зможаце яго скінуць. - notice email cannot find: Немагчыма знайсці гэтакі паштовы адрас, прабачце. edit: title: скінуць пароль heading: Скінуць пароль для %{user} diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 29c42a050..4cff01a9b 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -293,11 +293,6 @@ bg: destroy: success: Профилът е изтрит. browse: - created: Създадена - closed: Затворена - closed_ago_html: Затворен %{time_ago} - created_ago_by_html: Създаден %{time_ago} от %{user} - closed_ago_by_html: Затворен %{time_ago} от %{user} edited_ago_by_html: Редактирано %{time_ago} от %{user} version: Версия in_changeset: Списък с промени @@ -308,21 +303,6 @@ bg: view_history: Показване на историята view_details: Показване на детайли location: 'Местоположение:' - changeset: - title: 'Списък с промени: %{id}' - belongs_to: Автор - node: Възли (%{count}) - node_paginated: Възли (%{x}-%{y} от общо %{count}) - way: Пътища (%{count}) - way_paginated: Пътища (%{x}-%{y} от общо %{count}) - relation: Релации (%{count}) - relation_paginated: Релации(%{x}-%{y} от %{count}) - changesetxml: XML на списъка с промени - osmchangexml: osmChange XML - join_discussion: Впишете се, за да се присъедините към обсъждането - discussion: Обсъждане - still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото - завършване. node: title_html: 'Възел: %{name}' history_title_html: 'История на възела: %{name}' @@ -415,6 +395,27 @@ bg: feed: title: Списък с промени %{id} title_comment: Списък с промени %{id} - %{comment} + created: Създадена + closed: Затворена + belongs_to: Автор + show: + title: 'Списък с промени: %{id}' + closed_ago_html: Затворен %{time_ago} + created_ago_by_html: Създаден %{time_ago} от %{user} + closed_ago_by_html: Затворен %{time_ago} от %{user} + discussion: Обсъждане + join_discussion: Впишете се, за да се присъедините към обсъждането + still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото + завършване. + changesetxml: XML на списъка с промени + osmchangexml: osmChange XML + paging_nav: + nodes: Възли (%{count}) + nodes_paginated: Възли (%{x}-%{y} от общо %{count}) + ways: Пътища (%{count}) + ways_paginated: Пътища (%{x}-%{y} от общо %{count}) + relations: Релации (%{count}) + relations_paginated: Релации(%{x}-%{y} от %{count}) timeout: sorry: Съжаляваме, но списъка с промени който заявихте се зарежда твърде дълго. changeset_comments: @@ -1434,8 +1435,6 @@ bg: help_text: Въведете имейл адреса, който сте използвали при регистрацията, и ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата си. - create: - notice email cannot find: Съжаляваме, но този електронен адрес не е намерен. edit: title: Възстановяване на парола heading: Смени Парола за %{user} diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 6c90192f7..ab9b7db6b 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -337,12 +337,6 @@ bn: destroy: success: অ্যাকাউন্ট অপসারণ করা হয়েছে। browse: - created: তৈরি হয়েছে - closed: বন্ধ হয়েছে - created_ago_html: '%{time_ago} তৈরি' - closed_ago_html: '%{time_ago} বন্ধকৃত' - created_ago_by_html: '%{user} কর্তৃক %{time_ago} তৈরিকৃত' - closed_ago_by_html: '%{user} কর্তৃক %{time_ago} বন্ধকৃত' deleted_ago_by_html: '%{user} কর্তৃক %{time_ago} অপসারিত' edited_ago_by_html: '%{user} কর্তৃক %{time_ago} সম্পাদিত' version: সংস্করণ @@ -360,21 +354,6 @@ bn: view_history: ইতিহাস দেখুন view_details: বিস্তারিত দেখুন location: 'অবস্থান:' - changeset: - title: 'পরিবর্তনধার্য: %{id}' - belongs_to: লেখক - node: সংযোগস্থল (%{count}টি) - node_paginated: সংযোগস্থল (%{count}টির %{x}-%{y}) - way: পথসমূহ (%{count}টি) - way_paginated: পথসমূহ (%{count}টির %{x}-%{y}) - relation: সম্পর্ক (%{count}টি) - relation_paginated: সম্পর্ক (%{count}টির %{x}-%{y}) - hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন' - changesetxml: পরিবর্তনধার্য এক্সএমএল - osmchangexml: osmChange এক্সএমএল - join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন - discussion: আলোচনা - still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে। node: title_html: 'সংযোগস্থল: %{name}' history_title_html: 'সংযোগস্থলের ইতিহাস: %{name}' @@ -482,6 +461,28 @@ bn: feed: title: পরিবর্তনধার্য %{id} title_comment: পরিবর্তনধার্য %{id} - %{comment} + created: তৈরি হয়েছে + closed: বন্ধ হয়েছে + belongs_to: লেখক + show: + title: 'পরিবর্তনধার্য: %{id}' + created_ago_html: '%{time_ago} তৈরি' + closed_ago_html: '%{time_ago} বন্ধকৃত' + created_ago_by_html: '%{user} কর্তৃক %{time_ago} তৈরিকৃত' + closed_ago_by_html: '%{user} কর্তৃক %{time_ago} বন্ধকৃত' + discussion: আলোচনা + join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন + still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে। + hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন' + changesetxml: পরিবর্তনধার্য এক্সএমএল + osmchangexml: osmChange এক্সএমএল + paging_nav: + nodes: সংযোগস্থল (%{count}টি) + nodes_paginated: সংযোগস্থল (%{count}টির %{x}-%{y}) + ways: পথসমূহ (%{count}টি) + ways_paginated: পথসমূহ (%{count}টির %{x}-%{y}) + relations: সম্পর্ক (%{count}টি) + relations_paginated: সম্পর্ক (%{count}টির %{x}-%{y}) timeout: sorry: দুঃখিত, আপনি যেই পরিবর্তনসেটটির জন্য আবেদন করছেন সেটি ফিরিয়ে আনতে আরও সময় লাগবে। @@ -602,6 +603,8 @@ bn: comment: মন্তব্য newer_comments: নতুনতর মন্তব্য older_comments: পুরাতন মন্তব্য + subscribe: + button: আলোচনায় সাবস্ক্রাইব করুন doorkeeper: flash: applications: diff --git a/config/locales/br.yml b/config/locales/br.yml index dc8bdbafa..49ba71aa8 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -250,9 +250,6 @@ br: few: '%{count} bloaz zo' many: '%{count} bloaz zo' other: '%{count} bloaz zo' - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Dre ziouer (%{name} er mare-mañ) id: @@ -355,12 +352,6 @@ br: destroy: success: Kont dilamet. browse: - created: Krouet - closed: Serret - created_ago_html: Krouet %{time_ago} - closed_ago_html: Serret %{time_ago} - created_ago_by_html: Bet krouet %{time_ago} gant %{user} - closed_ago_by_html: Bet serret %{time_ago} gant %{user} deleted_ago_by_html: Bet dilamet %{time_ago} gant %{user} edited_ago_by_html: Bet aozet %{time_ago} gant %{user} version: Stumm @@ -384,23 +375,6 @@ br: view_history: Gwelet an istor view_details: ↓Gwelet ar munudoù location: 'Lec''hiadur:' - changeset: - title: 'Hollad cheñchamantoù: %{id}' - belongs_to: Aozer - node: Skoulmoù (%{count}) - node_paginated: Skoulmoù (%{x}-%{y} diwar %{count}) - way: Hentoù (%{count}) - way_paginated: Hentoù (%{x}-%{y} diwar %{count}) - relation: Darempredoù (%{count}) - relation_paginated: Darempredoù (%{x}-%{y} diwar %{count}) - hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago} - comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago} - changesetxml: Hollad cheñchamantoù XML - osmchangexml: Cheñchoùosm XML - join_discussion: Kevreit evit mont er gaozeadenn - discussion: Kaozeadenn - still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret - an hollad cheñchamantoù. node: title_html: 'Skoulm: %{name}' history_title_html: 'Istor ar skoulm: %{name}' @@ -528,6 +502,40 @@ br: feed: title: Hollad cheñchamantoù %{id} title_comment: Hollad cheñchamantoù %{id} - %{comment} + created: Krouet + closed: Serret + belongs_to: Aozer + subscribe: + button: Koumanantiñ ouzh ar gaozeadenn + unsubscribe: + button: Digoumanantiñ diouzh ar gaozeadenn + heading: + title: Hollad cheñchamantoù %{id} + created_by_html: Bet krouet gant %{link_user} d'an %{created}. + no_such_entry: + title: N'eus ket eus an hollad cheñchamantoù-mañ + heading: 'Enmont ebet gant an id: %{id}' + show: + title: 'Hollad cheñchamantoù: %{id}' + created_ago_html: Krouet %{time_ago} + closed_ago_html: Serret %{time_ago} + created_ago_by_html: Bet krouet %{time_ago} gant %{user} + closed_ago_by_html: Bet serret %{time_ago} gant %{user} + discussion: Kaozeadenn + join_discussion: Kevreit evit mont er gaozeadenn + still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret + an hollad cheñchamantoù. + comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago} + hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago} + changesetxml: Hollad cheñchamantoù XML + osmchangexml: Cheñchoùosm XML + paging_nav: + nodes: Skoulmoù (%{count}) + nodes_paginated: Skoulmoù (%{x}-%{y} diwar %{count}) + ways: Hentoù (%{count}) + ways_paginated: Hentoù (%{x}-%{y} diwar %{count}) + relations: Darempredoù (%{count}) + relations_paginated: Darempredoù (%{x}-%{y} diwar %{count}) timeout: sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet. changeset_comments: @@ -1684,6 +1692,7 @@ br: click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit adderaouekaat ho ker-tremen. note_comment_notification: + description: 'Notenn OpenStreetMap #%{id}' anonymous: Un implijer dizanv greeting: Demat, commented: @@ -1728,6 +1737,7 @@ br: details: Munudoù ouzhpenn diwar-benn an notenn a c'hall bezañ kavet e %{url}. details_html: Munudoù ouzhpenn diwar-benn an notenn a c'hall bezañ kavet e %{url}. changeset_comment_notification: + description: 'Hollad cheñchamantoù OpenStreetMap #%{id}' hi: Demat %{to_user}, greeting: Demat, commented: @@ -1750,10 +1760,10 @@ br: partial_changeset_without_comment: Hep evezhiadenn details: Muioc'h a ditouroù war an holl cheñchamantoù e %{url}. details_html: Muioc'h a ditouroù war an holl cheñchamantoù e %{url}. - unsubscribe: Evit digoumanantiñ diouzh hizivadurioù an holl gemmoù, gweladennit - %{url} ha klikit war « Digoumanantiñ ». - unsubscribe_html: Evit digoumanantiñ diouzh hizivadurioù an holl gemmoù, gweladennit - %{url} ha klikit war "Digoumanantiñ". + unsubscribe: Gallout a rit digoumanantiñ diouzh hizivadurioù an hollad cheñchamantoù-mañ + e %{url}. + unsubscribe_html: Gallout a rit digoumanantiñ diouzh hizivadurioù an hollad + cheñchamantoù-mañ e %{url}. confirmations: confirm: heading: Taolit ur sell ouzh ho posteloù ! @@ -1861,10 +1871,6 @@ br: new password button: Adderaouekaat ar ger-tremen help_text: Ebarzhit ar chomlec'h postel ho poa implijet evit en em enskrivañ, kaset e vo deoc'h ul liamm a c'hallot implijout evit adderaouekaat ho ker-tremen. - create: - notice email on way: Kaset ez eus bet ur postel deoc'h evit adderaouekaat ho - ker-tremen. - notice email cannot find: Ho tigarez, n'eo ket bet kavet ar chomlec'h postel-se. edit: title: Adderaouekaat ar ger-tremen heading: Adderaouekaat ar ger-tremen evit %{user} diff --git a/config/locales/bs.yml b/config/locales/bs.yml index e661a4614..5e42b99a3 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -184,8 +184,6 @@ bs: e-mail za porukom za potvrdu nove e-mail adrese. success: Korisničke informacije su uspješno osvježene. browse: - created: Napravljeno - closed: Zatvoreno version: Verzija in_changeset: Skup izmjena anonymous: anonimno @@ -195,18 +193,6 @@ bs: view_history: Historija view_details: Prikaži detalje location: 'Lokacija:' - changeset: - title: 'Skup promjena: %{id}' - belongs_to: Autor - node: Čvorovi (%{count}) - node_paginated: Čvorovi (%{x}-%{y} of %{count}) - way: Putevi (%{count}) - way_paginated: Putevi (%{x}-%{y} of %{count}) - relation: Relacije (%{count}) - relation_paginated: Relacije (%{x}-%{y} of %{count}) - changesetxml: XML seta promjena - osmchangexml: osmChange XML - discussion: Diskusija node: title_html: 'Čvor: %{name}' way: @@ -282,6 +268,21 @@ bs: feed: title: Set promjena %{id} title_comment: Set promjena %{id} - %{comment} + created: Napravljeno + closed: Zatvoreno + belongs_to: Autor + show: + title: 'Skup promjena: %{id}' + discussion: Diskusija + changesetxml: XML seta promjena + osmchangexml: osmChange XML + paging_nav: + nodes: Čvorovi (%{count}) + nodes_paginated: Čvorovi (%{x}-%{y} of %{count}) + ways: Putevi (%{count}) + ways_paginated: Putevi (%{x}-%{y} of %{count}) + relations: Relacije (%{count}) + relations_paginated: Relacije (%{x}-%{y} of %{count}) timeout: sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za preuzimanje. @@ -1023,10 +1024,6 @@ bs: new password button: Ponovno postavljanje lozinke help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslaćemo Vam link kojim možete ponovo postaviti lozinku. - create: - notice email on way: Žao mi je što ste je izgubili :-( ali e-mail je na putu - tako da je možete pononvo postaviti uskoro. - notice email cannot find: Ne možemo pronaći tu e-mail adresu, žao nam je. edit: title: Ponovno postavljanje lozinke heading: Ponovno postavljanje lozinke za %{user} diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 54bbfeb27..63896de19 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -356,12 +356,6 @@ ca: destroy: success: Compte suprimit. browse: - created: Creat - closed: Tancat - created_ago_html: Creat %{time_ago} - closed_ago_html: Tancat %{time_ago} - created_ago_by_html: Creat %{time_ago} per %{user} - closed_ago_by_html: Tancat %{time_ago} per %{user} deleted_ago_by_html: Eliminat %{time_ago} per %{user} edited_ago_by_html: Editat %{time_ago} per %{user} version: Versió @@ -379,23 +373,6 @@ ca: view_history: Mostra l’historial view_details: Mostra els detalls location: 'Ubicació:' - changeset: - title: 'Conjunt de canvis: %{id}' - belongs_to: Autor - node: Nodes (%{count}) - node_paginated: Nodes (%{x}-%{y} de %{count}) - way: Vies (%{count}) - way_paginated: Vies (%{x}-%{y} de %{count}) - relation: Relacions (%{count}) - relation_paginated: Relacions (%{x}-%{y} de %{count}) - hidden_comment_by_html: Comentari ocult de %{user} %{time_ago} - comment_by_html: Comentari de %{user} %{time_ago} - changesetxml: XML del conjunt de canvis - osmchangexml: XML en format osmChange - join_discussion: Inicieu una sessió per a unir-vos al debat - discussion: Debat - still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui - el conjunt de canvis. node: title_html: 'Node: %{name}' history_title_html: 'Historial del node: %{name}' @@ -505,6 +482,30 @@ ca: feed: title: Conjunt de canvis %{id} title_comment: Conjunt de canvis %{id} - %{comment} + created: Creat + closed: Tancat + belongs_to: Autor + show: + title: 'Conjunt de canvis: %{id}' + created_ago_html: Creat %{time_ago} + closed_ago_html: Tancat %{time_ago} + created_ago_by_html: Creat %{time_ago} per %{user} + closed_ago_by_html: Tancat %{time_ago} per %{user} + discussion: Debat + join_discussion: Inicieu una sessió per a unir-vos al debat + still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui + el conjunt de canvis. + comment_by_html: Comentari de %{user} %{time_ago} + hidden_comment_by_html: Comentari ocult de %{user} %{time_ago} + changesetxml: XML del conjunt de canvis + osmchangexml: XML en format osmChange + paging_nav: + nodes: Nodes (%{count}) + nodes_paginated: Nodes (%{x}-%{y} de %{count}) + ways: Vies (%{count}) + ways_paginated: Vies (%{x}-%{y} de %{count}) + relations: Relacions (%{count}) + relations_paginated: Relacions (%{x}-%{y} de %{count}) timeout: sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a carregar-se. @@ -1837,10 +1838,6 @@ ca: new password button: Restableix la contrasenya help_text: Introduïu l'adreça de correu electrònic que vau utilitzar per registrar-vos; us hi enviarem un enllaç per a restablir la contrasenya. - create: - notice email on way: Lamentem que l'hàgiu perdut :-( però ja us hem enviat un - correu i la podreu restablir ben aviat. - notice email cannot find: No s'ha trobat aquesta adreça de correu. edit: title: Restableix la contrasenya heading: Restableix la contrasenya per a %{user} diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 8029aa442..45a1707b3 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -183,8 +183,6 @@ ce: link text: хӀун йу хӀара? save changes button: Ӏалашбе хийцамаш browse: - created: Кхоьллина - closed: ДӀачӀагӀа version: Верси in_changeset: Нисдарш anonymous: аноним @@ -194,19 +192,6 @@ ce: view_history: Хьажа истори view_details: Мадарра location: 'Географин йолу меттиг:' - changeset: - title: 'Нисдарш: %{id}' - belongs_to: Автор - node: ТӀадамаш (%{count}) - node_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count}) - way: Сиз (%{count}) - way_paginated: Сиз (%{x}-%{y} чуьра %{count}) - relation: Хилар (%{count}) - relation_paginated: Хилар (%{x}-%{y} чуьра %{count}) - changesetxml: Нисдарийн XML - osmchangexml: osmChange XML - join_discussion: Дийцарехь дакъалаца системин чугӀо - discussion: Дийцар node: title_html: 'ТӀадам: %{name}' history_title_html: 'ТӀадаман истори: %{name}' @@ -302,6 +287,22 @@ ce: feed: title: 'Нисдарш: %{id}' title_comment: Нисдарш %{id} — %{comment} + created: Кхоьллина + closed: ДӀачӀагӀа + belongs_to: Автор + show: + title: 'Нисдарш: %{id}' + discussion: Дийцар + join_discussion: Дийцарехь дакъалаца системин чугӀо + changesetxml: Нисдарийн XML + osmchangexml: osmChange XML + paging_nav: + nodes: ТӀадамаш (%{count}) + nodes_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count}) + ways: Сиз (%{count}) + ways_paginated: Сиз (%{x}-%{y} чуьра %{count}) + relations: Хилар (%{count}) + relations_paginated: Хилар (%{x}-%{y} чуьра %{count}) timeout: sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу. changeset_comments: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 2649ed220..ba9b12aab 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -386,12 +386,6 @@ cs: destroy: success: Účet smazán. browse: - created: Vytvořeno - closed: Uzavřeno - created_ago_html: Vytvořeno %{time_ago} - closed_ago_html: Uzavřeno %{time_ago} - created_ago_by_html: Vytvořeno %{time_ago} uživatelem %{user} - closed_ago_by_html: Uzavřeno %{time_ago} uživatelem %{user} deleted_ago_by_html: Smazáno %{time_ago} uživatelem %{user} edited_ago_by_html: Upraveno %{time_ago} uživatelem %{user} version: Verze @@ -413,23 +407,6 @@ cs: view_history: Zobrazit historii view_details: Zobrazit detaily location: 'Pozice:' - changeset: - title: 'Sada změn: %{id}' - belongs_to: Autor - node: Uzly (%{count}) - node_paginated: Uzly (%{x}-%{y} z %{count}) - way: Cesty (%{count}) - way_paginated: Cesty (%{x}-%{y} z %{count}) - relation: Relace (%{count}) - relation_paginated: Relace (%{x}–%{y} z %{count}) - hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago} - comment_by_html: Komentář od uživatele %{user} %{time_ago} - changesetxml: Sada změn XML - osmchangexml: osmChange XML - join_discussion: Chcete-li diskutovat, přihlaste se - discussion: Diskuse - still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude - sada změn uzavřena. node: title_html: 'Uzel: %{name}' history_title_html: 'Historie uzlu: %{name}' @@ -541,6 +518,30 @@ cs: feed: title: Sada změn %{id} title_comment: Sada změn %{id} - %{comment} + created: Vytvořeno + closed: Uzavřeno + belongs_to: Autor + show: + title: 'Sada změn: %{id}' + created_ago_html: Vytvořeno %{time_ago} + closed_ago_html: Uzavřeno %{time_ago} + created_ago_by_html: Vytvořeno %{time_ago} uživatelem %{user} + closed_ago_by_html: Uzavřeno %{time_ago} uživatelem %{user} + discussion: Diskuse + join_discussion: Chcete-li diskutovat, přihlaste se + still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude + sada změn uzavřena. + comment_by_html: Komentář od uživatele %{user} %{time_ago} + hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago} + changesetxml: Sada změn XML + osmchangexml: osmChange XML + paging_nav: + nodes: Uzly (%{count}) + nodes_paginated: Uzly (%{x}-%{y} z %{count}) + ways: Cesty (%{count}) + ways_paginated: Cesty (%{x}-%{y} z %{count}) + relations: Relace (%{count}) + relations_paginated: Relace (%{x}–%{y} z %{count}) timeout: sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliš dlouho. changeset_comments: @@ -1899,10 +1900,6 @@ cs: new password button: Resetovat heslo help_text: Zadejte e-mailovou adresu, pod kterou jste se zaregistrovali, my vám na ni pošleme odkaz, pomocí kterého si nastavíte nové heslo. - create: - notice email on way: Škoda zapomenutého hesla :-( e-mail už je na cestě, takže - si budete brzy moci zvolit nové. - notice email cannot find: Je mi líto, ale nemohu najít tuto e-mailovou adresu. edit: title: Obnovit heslo heading: Resetovat heslo pro %{user} diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 311180cc7..bada4729b 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -248,9 +248,6 @@ cy: few: '%{count} blynedd yn ôl' many: '%{count} blynedd yn ôl' other: '%{count} blynedd yn ôl' - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: (%{name} yn gyfredol) diofyn id: @@ -345,12 +342,6 @@ cy: destroy: success: Cyfrif wedi'i ddileu. browse: - created: Wedi creu - closed: Wedi cau - created_ago_html: Wedi creu %{time_ago} - closed_ago_html: Wedi cau %{time_ago} - created_ago_by_html: Wedi creu %{time_ago} gan %{user} - closed_ago_by_html: Wedi cau %{time_ago} gan %{user} deleted_ago_by_html: Wedi dileu %{time_ago} gan %{user} edited_ago_by_html: Golygwyd %{time_ago} gan %{user} version: Fersiwn @@ -376,23 +367,6 @@ cy: view_history: Gweld hanes view_details: Gweld manylion location: Lleoliadː - changeset: - title: 'Grŵp newid: %{id}' - belongs_to: Awdur - node: Nodau (%{count}) - node_paginated: Nodau (%{x}-%{y} o %{count}) - way: Llwybrau %{count} - way_paginated: Llwybrau (%{x}-%{y} o %{count}) - relation: Perthnasoedd (%{count}) - relation_paginated: Perthnasoedd (%{x}-%{y} o %{count}) - hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago} - comment_by_html: Sylw gan %{user} %{time_ago} - changesetxml: XML grŵp newid - osmchangexml: XML osmChange - join_discussion: Mewngofnodwch i ymuno â'r sgwrs - discussion: Sgwrs - still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd - y grŵp newid wedi cau. node: title_html: 'Nod: %{name}' history_title_html: 'Hanes y nod: %{name}' @@ -512,6 +486,42 @@ cy: feed: title: Grŵp newid %{id} title_comment: Grŵp newid %{id} - %{comment} + created: Wedi creu + closed: Wedi cau + belongs_to: Awdur + subscribe: + button: Tanysgrifio i drafodaeth + unsubscribe: + button: Dad-danysgrifio o'r drafodaeth + heading: + title: Grŵp newid %{id} + created_by_html: Crëwyd gan %{link_user} ar %{created}. + no_such_entry: + title: Dim grŵp newid o'r fath + heading: 'Dim cofnod gyda''r id: %{id}' + show: + title: 'Grŵp newid: %{id}' + created: 'Crëwyd: %{when}' + closed: 'Caëwyd: %{when}' + created_ago_html: Wedi creu %{time_ago} + closed_ago_html: Wedi cau %{time_ago} + created_ago_by_html: Wedi creu %{time_ago} gan %{user} + closed_ago_by_html: Wedi cau %{time_ago} gan %{user} + discussion: Sgwrs + join_discussion: Mewngofnodwch i ymuno â'r sgwrs + still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd + y grŵp newid wedi cau. + comment_by_html: Sylw gan %{user} %{time_ago} + hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago} + changesetxml: XML grŵp newid + osmchangexml: XML osmChange + paging_nav: + nodes: Nodau (%{count}) + nodes_paginated: Nodau (%{x}-%{y} o %{count}) + ways: Llwybrau %{count} + ways_paginated: Llwybrau (%{x}-%{y} o %{count}) + relations: Perthnasoedd (%{count}) + relations_paginated: Perthnasoedd (%{x}-%{y} o %{count}) timeout: sorry: Mae'n ddrwg gennym, cymerodd y rhestr o grwpiau newid y gofynnoch amdanynt rhy hir i'w hadalw. @@ -1605,6 +1615,7 @@ cy: details: Ceir rhagor o fanylion am y nodyn ar %{url}. details_html: Ceir rhagor o fanylion am y nodyn ar %{url}. changeset_comment_notification: + description: 'Grŵp newid OpenStreetMap #%{id}' hi: Helo %{to_user}, greeting: Helo, commented: @@ -1719,10 +1730,6 @@ cy: heading: Wedi anghofio'ch cyfrinair? email address: Cyfeiriad E-bost new password button: Ailosod cyfrinair - create: - notice email on way: Sori eich bod wedi ei golli :-( ond mae e-bost ar y ffordd - er mwyn ichi ei ailosod yn fuan. - notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno. edit: title: Ailosod cyfrinair heading: Ailosod cyfrinair ar gyfer %{user} @@ -1734,9 +1741,9 @@ cy: title: Dewisiadau preferred_editor: Hoff Olygydd preferred_languages: Ieithoedd - edit_preferences: Dewisiadau Golygu + edit_preferences: Golygu Dewisiadau edit: - title: Dewisiadau Golygu + title: Golygu Dewisiadau save: Diweddaru Dewisiadau cancel: Canslo update: @@ -2518,6 +2525,13 @@ cy: revoke: revoke: Dad-flocio! revoke_all: + active_blocks: + zero: '%{count} blociau cyfredol.' + one: '%{count} %{count} bloc cyfredol.' + two: '%{count} floc cyfredol.' + few: '%{count} bloc cyfredol.' + many: '%{count} bloc cyfredol.' + other: '%{count} bloc cyfredol.' revoke: Dad-flocio! helper: time_future_html: Yn dod i ben mewn %{time}. @@ -2747,6 +2761,7 @@ cy: distance_m: '%{distance}m' distance_km: '%{distance}km' errors: + no_route: Ni ellir dod o hyd i'r llwybr rhwng y ddau le. no_place: Ymddiheuriadau - ni ellir canfod '%{place}'. instructions: continue_without_exit: Parhau ar %{name} @@ -2754,27 +2769,33 @@ cy: offramp_right: Cymerwch y ramp ar y dde offramp_right_with_exit: Cymerwch allanfa %{exit} ar y dde offramp_right_with_exit_name: Cymerwch allanfa %{exit} ar y dde i %{name} + merge_right_without_exit: Cyfunwch i'r dde ar %{name} turn_right_without_exit: Trowch i'r dde ar %{name} sharp_right_without_exit: Siarp i'r dde ar %{name} uturn_without_exit: Tro pedol ar hyd %{name} sharp_left_without_exit: Siarp i'r chwith ar %{name} turn_left_without_exit: Trowch i'r chwith ar %{name} offramp_left: Cymerwch y ramp ar y chwith + offramp_left_with_exit: Cymerwch y %{exit} allanfa ar y chwith merge_left_without_exit: Cyfuno i'r chwith ar %{name} + slight_left_without_exit: Ychydig i'r chwith i %{name} via_point_without_exit: (trwy bwynt) follow_without_exit: Dilynwch %{name} + roundabout_without_exit: Ar y gylchfan cymerwch yr allanfa i %{name} leave_roundabout_without_exit: Gadael cylchfan - %{name} stay_roundabout_without_exit: Aros ar gylchfan - %{name} start_without_exit: Dechreuwch ar %{name} destination_without_exit: Wedi cyrraedd cyrchfan against_oneway_without_exit: Mynd yn erbyn unffordd ar %{name} end_oneway_without_exit: Diwedd unffordd ar %{name} + roundabout_with_exit: Ar y gylchfan cymerwch %{exit} allanfa i %{name} + roundabout_with_exit_ordinal: Ar y gylchfan cymerwch %{exit} allanfa i %{name} exit_roundabout: Gadael y gylchfan i %{name} unnamed: ffordd heb enw courtesy: Cyfarwyddiadau trwy garedigrwydd %{link} exit_counts: first: 1af - second: 2il + second: yr 2il third: 3ydd fourth: 4ydd fifth: 5ed diff --git a/config/locales/da.yml b/config/locales/da.yml index 82d1f61b2..b17966ea6 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -351,12 +351,6 @@ da: destroy: success: Kontoen er bleget slettet. browse: - created: Oprettet - closed: Lukket - created_ago_html: Oprettet %{time_ago} - closed_ago_html: Lukket %{time_ago} - created_ago_by_html: Oprettet %{time_ago} af %{user} - closed_ago_by_html: Lukket %{time_ago} af %{user} deleted_ago_by_html: Slettet %{time_ago} af %{user} edited_ago_by_html: Redigeret %{time_ago} af %{user} version: Version @@ -374,23 +368,6 @@ da: view_history: Se historik view_details: Se detaljer location: 'Sted:' - changeset: - title: 'Ændringssæt: %{id}' - belongs_to: Forfatter - node: Punkter (%{count}) - node_paginated: Punkter (%{x}-%{y} af %{count}) - way: Veje (%{count}) - way_paginated: Veje (%{x}-%{y} af %{count}) - relation: Relationer (%{count}) - relation_paginated: Relationer (%{x}-%{y} af %{count}) - hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago} - comment_by_html: Kommentar fra %{user} %{time_ago} - changesetxml: XML for ændringssæt - osmchangexml: XML for osmChange - join_discussion: Log på for at deltage i diskussionen - discussion: Diskussion - still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet - lukkes. node: title_html: 'Punkt: %{name}' history_title_html: 'Punkthistorik: %{name}' @@ -508,6 +485,30 @@ da: feed: title: Ændringssæt %{id} title_comment: Ændringssæt %{id} - %{comment} + created: Oprettet + closed: Lukket + belongs_to: Forfatter + show: + title: 'Ændringssæt: %{id}' + created_ago_html: Oprettet %{time_ago} + closed_ago_html: Lukket %{time_ago} + created_ago_by_html: Oprettet %{time_ago} af %{user} + closed_ago_by_html: Lukket %{time_ago} af %{user} + discussion: Diskussion + join_discussion: Log på for at deltage i diskussionen + still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet + lukkes. + comment_by_html: Kommentar fra %{user} %{time_ago} + hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago} + changesetxml: XML for ændringssæt + osmchangexml: XML for osmChange + paging_nav: + nodes: Punkter (%{count}) + nodes_paginated: Punkter (%{x}-%{y} af %{count}) + ways: Veje (%{count}) + ways_paginated: Veje (%{x}-%{y} af %{count}) + relations: Relationer (%{count}) + relations_paginated: Relationer (%{x}-%{y} af %{count}) timeout: sorry: Desværre tog det for lang tid at indlæse den liste af ændringssæt du har bedt om. @@ -1869,10 +1870,6 @@ da: new password button: Nulstil adgangskode help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. - create: - notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan - snart indstille en ny. - notice email cannot find: Kunne ikke finde den e-mailadresse, beklager. edit: title: Nulstil adgangskode heading: Nulstil adgangskode for %{user} diff --git a/config/locales/de.yml b/config/locales/de.yml index d105238ad..044715fba 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -430,12 +430,6 @@ de: destroy: success: Konto gelöscht. browse: - created: Erstellt - closed: Geschlossen - created_ago_html: Erstellt %{time_ago} - closed_ago_html: Geschlossen %{time_ago} - created_ago_by_html: Erstellt %{time_ago} von %{user} - closed_ago_by_html: Geschlossen %{time_ago} von %{user} deleted_ago_by_html: Gelöscht %{time_ago} von %{user} edited_ago_by_html: Bearbeitet %{time_ago} von %{user} version: Version @@ -453,23 +447,6 @@ de: view_history: Verlauf anzeigen view_details: Details anzeigen location: 'Standort:' - changeset: - title: 'Änderungssatz: %{id}' - belongs_to: Autor - node: Knoten (%{count}) - node_paginated: Knoten (%{x}–%{y} von %{count}) - way: Wege (%{count}) - way_paginated: Wege (%{x}–%{y} von %{count}) - relation: Relationen (%{count}) - relation_paginated: Relationen (%{x}–%{y} von %{count}) - hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago} - comment_by_html: Kommentar von %{user} %{time_ago} - changesetxml: Änderungssatz-XML - osmchangexml: osmChange-XML - join_discussion: Anmelden, um mitzudiskutieren - discussion: Diskussion - still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet, - sobald der Änderungssatz geschlossen ist. node: title_html: 'Knoten: %{name}' history_title_html: 'Knotenverlauf: %{name}' @@ -577,6 +554,30 @@ de: feed: title: 'Änderungssatz: %{id}' title_comment: Änderungssatz %{id} - %{comment} + created: Erstellt + closed: Geschlossen + belongs_to: Autor + show: + title: 'Änderungssatz: %{id}' + created_ago_html: Erstellt %{time_ago} + closed_ago_html: Geschlossen %{time_ago} + created_ago_by_html: Erstellt %{time_ago} von %{user} + closed_ago_by_html: Geschlossen %{time_ago} von %{user} + discussion: Diskussion + join_discussion: Anmelden, um mitzudiskutieren + still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet, + sobald der Änderungssatz geschlossen ist. + comment_by_html: Kommentar von %{user} %{time_ago} + hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago} + changesetxml: Änderungssatz-XML + osmchangexml: osmChange-XML + paging_nav: + nodes: Knoten (%{count}) + nodes_paginated: Knoten (%{x}–%{y} von %{count}) + ways: Wege (%{count}) + ways_paginated: Wege (%{x}–%{y} von %{count}) + relations: Relationen (%{count}) + relations_paginated: Relationen (%{x}–%{y} von %{count}) timeout: sorry: Es hat leider zu lange gedauert, die angeforderten Änderungssätze abzurufen. changeset_comments: @@ -1952,11 +1953,6 @@ de: help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast. Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurücksetzen kannst. - create: - notice email on way: Eine E-Mail mit Hinweisen zum Zurücksetzen des Passworts - wurde an dich versandt. - notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast - dich möglicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet. edit: title: Passwort zurücksetzen heading: Passwort für %{user} zurücksetzen diff --git a/config/locales/diq.yml b/config/locales/diq.yml index 15aa85683..95d498f7b 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -178,8 +178,6 @@ diq: go_public: heading: 'Pêron rê akerde vırnayış:' browse: - created: Vıraziya - closed: Kerd kip version: Versiyon in_changeset: Qeydê Vurnayışan anonymous: anonim @@ -195,19 +193,6 @@ diq: view_history: Verêni bıvêne view_details: Teferuatan Bıvêne location: 'Lokasyon:' - changeset: - title: 'Koma vurnayışi: %{id}' - belongs_to: Nuştekar - node: '%{count} noqtey' - node_paginated: pero piya (%{x}-%{y} - %{count}) noqtey - way: '%{count} ray' - way_paginated: Ray (%{x}-%{y} - pêro piya %{count}) - relation: Elaqeyi %{count} - relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count} - changesetxml: Vurnayışê peyênê XML - osmchangexml: OsmVurnayışê XML - join_discussion: Dekewtena vatenayışi rê qeyd bê - discussion: Werênayış node: title_html: Noqta:%{name} history_title_html: 'Verora nokta: %{name}' @@ -288,6 +273,22 @@ diq: feed: title: 'Koma vurnayışi: %{id}' title_comment: '%{id} - %{comment} vurniyayışi' + created: Vıraziya + closed: Kerd kip + belongs_to: Nuştekar + show: + title: 'Koma vurnayışi: %{id}' + discussion: Werênayış + join_discussion: Dekewtena vatenayışi rê qeyd bê + changesetxml: Vurnayışê peyênê XML + osmchangexml: OsmVurnayışê XML + paging_nav: + nodes: '%{count} noqtey' + nodes_paginated: pero piya (%{x}-%{y} - %{count}) noqtey + ways: '%{count} ray' + ways_paginated: Ray (%{x}-%{y} - pêro piya %{count}) + relations: Elaqeyi %{count} + relations_paginated: Elaqeyi %{x}-%{y} pêro piya %{count} dashboards: contact: km away: '%{count} km duriyo' diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index e418bc832..2102e1a76 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -177,8 +177,6 @@ dsb: e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś. success: Wužywarske informacije wuspěšnje zaktualizěrowane. browse: - created: Napórany - closed: Zacynjony version: Wersija in_changeset: Sajźba změnow anonymous: anonymny @@ -188,17 +186,6 @@ dsb: view_history: Historiju pokazaś view_details: Drobnostki pokazaś location: 'Městno:' - changeset: - title: 'Sajźba změnow: %{id}' - belongs_to: Awtor - node: Suki (%{count}) - node_paginated: Suki (%{x}-%{y} z %{count}) - way: Puśe (%{count}) - way_paginated: Puśe (%{x}-%{y} z %{count}) - relation: Relacije (%{count}) - relation_paginated: Relacije (%{x}-%{y} z %{count}) - changesetxml: Sajźbu změnow XML - osmchangexml: osmChange XML node: title_html: 'Suk: %{name}' history_title_html: 'Sukowa historija: %{name}' @@ -290,6 +277,20 @@ dsb: feed: title: Sajźba změnow %{id} title_comment: Sajźba změnow %{id} - %{comment} + created: Napórany + closed: Zacynjony + belongs_to: Awtor + show: + title: 'Sajźba změnow: %{id}' + changesetxml: Sajźbu změnow XML + osmchangexml: osmChange XML + paging_nav: + nodes: Suki (%{count}) + nodes_paginated: Suki (%{x}-%{y} z %{count}) + ways: Puśe (%{count}) + ways_paginated: Puśe (%{x}-%{y} z %{count}) + relations: Relacije (%{count}) + relations_paginated: Relacije (%{x}-%{y} z %{count}) timeout: sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež sy póžedał, wótwołaś. dashboards: @@ -302,6 +303,7 @@ dsb: nearby mapper: Kartěrowaŕ w bliskosći friend: Pśijaśel show: + title: Mój pśeglědowy bok no friends: Hyšći njejsy žednych pśijaśelow pśidał. nearby users: Druge wužywarje w bliskosći no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći. @@ -884,6 +886,7 @@ dsb: help: Pomoc about: Wó copyright: Awtorske pšawo + communities: Zgromadnosći community: Zgromaźeństwo community_blogs: Blogi zgromaźeństwa community_blogs_title: Blogi cłonkow zgromaźeństwa OpenStreetMap @@ -1065,10 +1068,6 @@ dsb: new password button: Gronidło slědk stajiś help_text: Zapódaj e-mailowu adresu, kótaruž sy za registrěrowanje wužył, pósćelomy wótkaz na nju, kótaryž móžoš wužywaś, aby swójo gronidło slědk stajił. - create: - notice email on way: Bóžko sy jo zabył :-(, ale e-mail jo k tebje ducy, tak - až móžoš jo skóro slědk stajiś. - notice email cannot find: Bóžko ta e-mailowa adresa njejo se namakała. edit: title: Gronidło slědk stajiś heading: Gronidło za %{user} slědk stajiś @@ -1219,6 +1218,12 @@ dsb: title: Witaj k OSM description: Zachop z toś tym spěšnym rozpokazanim, kótarež wopsímujo zakłady OpenStreetMap. + community: + description: Zgromadne městno, źož móžośo za pomocu pytaś a se wó OpenStreetMap + rozgranjaś. + welcomemat: + description: Z organizaciju plany za OpenStreetMap cyniś? Wuslěźćo na boku + wuwitanja, což musyśo wěźeś. wiki: title: wiki.openstreetmap.org description: Pśepytaj wiki za nadrobneju OSM-dokumentaciju @@ -1300,6 +1305,13 @@ dsb: title: Njamaš chyle za wobźěłowanje? Pśidaj pokazku! para_1: Jolic coš jano drobnosć korigěrowaś a njamaš chyle, aby se zregistrěrował a wuknuł, kak se wobźěłujo, móžoš jadnorje pokazku pśidaś. + communities: + title: Zgromadnosći + local_chapters: + title: Lokalne zwězki + list_text: 'Slědujuce zgromadnosći su oficielnje ako lokalne zwězki zregistrěrowane:' + other_groups: + title: Druge kupki traces: visibility: private: Priwatny (jano źělony ako anonymne, njezrědowane dypki) @@ -1498,6 +1510,7 @@ dsb: my profile: Mój profil my settings: Móje nastajenja my comments: Móje komentary + my_dashboard: Mój pśeglědowy bok blocks on me: Dostane blokowanja blocks by me: Dane blokěrowanja send message: Powěsć pósłaś diff --git a/config/locales/el.yml b/config/locales/el.yml index 0affff2bf..98daf1318 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -364,12 +364,6 @@ el: destroy: success: Ο λογαριασμός διαγράφηκε... browse: - created: Δημιουργήθηκε - closed: Έκλεισε - created_ago_html: Δημιουργήθηκε %{time_ago} - closed_ago_html: Έκλεισε %{time_ago} - created_ago_by_html: Δημιουργήθηκε %{time_ago} από %{user} - closed_ago_by_html: Έκλεισε %{time_ago} από %{user} deleted_ago_by_html: Διαγράφηκε %{time_ago} από %{user} edited_ago_by_html: Επεξεργάστηκε %{time_ago} από %{user} version: Έκδοση @@ -387,23 +381,6 @@ el: view_history: Προβολή ιστορικού view_details: Προβολή λεπτομερειών location: 'Τοποθεσία:' - changeset: - title: 'Ομάδα αλλαγών: %{id}' - belongs_to: Συντάκτης - node: Kόμβοι (%{count}) - node_paginated: Κόμβοι (%{x}-%{y} από %{count}) - way: Διαδρομές (%{count}) - way_paginated: Διαδρομές (%{x}-%{y} από %{count}) - relation: Σχέσεις (%{count}) - relation_paginated: Σχέσεις (%{x}-%{y} από %{count}) - hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago} - comment_by_html: Σχόλιο από %{user} %{time_ago} - changesetxml: Ομάδας αλλαγών XML - osmchangexml: osmChange XML - join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση - discussion: Συζήτηση - still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει - μόλις ολοκληρωθεί η ομάδα αλλαγών. node: title_html: 'Κόμβος: %{name}' history_title_html: 'Ιστορικό κόμβου: %{name}' @@ -522,6 +499,30 @@ el: feed: title: Ομάδα αλλαγών %{id} title_comment: Ομάδα αλλαγών %{id} - %{comment} + created: Δημιουργήθηκε + closed: Έκλεισε + belongs_to: Συντάκτης + show: + title: 'Ομάδα αλλαγών: %{id}' + created_ago_html: Δημιουργήθηκε %{time_ago} + closed_ago_html: Έκλεισε %{time_ago} + created_ago_by_html: Δημιουργήθηκε %{time_ago} από %{user} + closed_ago_by_html: Έκλεισε %{time_ago} από %{user} + discussion: Συζήτηση + join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση + still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει + μόλις ολοκληρωθεί η ομάδα αλλαγών. + comment_by_html: Σχόλιο από %{user} %{time_ago} + hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago} + changesetxml: Ομάδας αλλαγών XML + osmchangexml: osmChange XML + paging_nav: + nodes: Kόμβοι (%{count}) + nodes_paginated: Κόμβοι (%{x}-%{y} από %{count}) + ways: Διαδρομές (%{count}) + ways_paginated: Διαδρομές (%{x}-%{y} από %{count}) + relations: Σχέσεις (%{count}) + relations_paginated: Σχέσεις (%{x}-%{y} από %{count}) timeout: sorry: Λυπάμαι, ο κατάλογος των αλλαγών που ζητήσατε χρειάστηκε πολύ χρόνο για να ανακτηθεί. @@ -1909,11 +1910,6 @@ el: help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε για να επαναφέρετε το συνθηματικό σας. - create: - notice email on way: Λυπούμαστε που το χάσατε :-(, αλλά ένα μήνυμα ηλεκτρονικού - ταχυδρομείου εστάλη, ώστε να μπορέσετε να το επαναφέρετε σύντομα. - notice email cannot find: Λυπούμαστε, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού - ταχυδρομείου. edit: title: Επαναφορά συνθηματικού heading: Επαναφορά συνθηματικού για τον χρήστη %{user} diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 6d3be7da8..55077fc48 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -277,8 +277,6 @@ en-GB: for a note to confirm your new email address. success: User information updated successfully. browse: - created: Created - closed: Closed version: Version in_changeset: Changeset anonymous: anonymous @@ -288,21 +286,6 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' - changeset: - title: 'Changeset: %{id}' - belongs_to: Author - node: Nodes (%{count}) - node_paginated: Nodes (%{x}-%{y} of %{count}) - way: Ways (%{count}) - way_paginated: Ways (%{x}-%{y} of %{count}) - relation: Relations (%{count}) - relation_paginated: Relations (%{x}-%{y} of %{count}) - changesetxml: Changeset XML - osmchangexml: osmChange XML - join_discussion: Log in to join the discussion - discussion: Discussion - still_open: Changeset still open - discussion will open once the changeset is - closed. node: title_html: 'Node: %{name}' history_title_html: 'Node History: %{name}' @@ -402,6 +385,24 @@ en-GB: feed: title: Changeset %{id} title_comment: Changeset %{id} - %{comment} + created: Created + closed: Closed + belongs_to: Author + show: + title: 'Changeset: %{id}' + discussion: Discussion + join_discussion: Log in to join the discussion + still_open: Changeset still open - discussion will open once the changeset is + closed. + changesetxml: Changeset XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nodes (%{count}) + nodes_paginated: Nodes (%{x}-%{y} of %{count}) + ways: Ways (%{count}) + ways_paginated: Ways (%{x}-%{y} of %{count}) + relations: Relations (%{count}) + relations_paginated: Relations (%{x}-%{y} of %{count}) timeout: sorry: Sorry, the list of changesets you requested took too long to retrieve. changeset_comments: @@ -1341,10 +1342,6 @@ en-GB: new password button: Reset password help_text: Enter the e-mail address you used to sign up, we will send a link to it that you can use to reset your password. - create: - notice email on way: Sorry you lost it :-( but an email is on its way so you - can reset it soon. - notice email cannot find: Could not find that email address, sorry. edit: title: Reset password heading: Reset Password for %{user} diff --git a/config/locales/en.yml b/config/locales/en.yml index 2f1e4d016..0cc35863b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -308,15 +308,10 @@ en: destroy: success: "Account Deleted." browse: - created: "Created" - closed: "Closed" - created_ago_html: "Created %{time_ago}" - closed_ago_html: "Closed %{time_ago}" - created_ago_by_html: "Created %{time_ago} by %{user}" - closed_ago_by_html: "Closed %{time_ago} by %{user}" deleted_ago_by_html: "Deleted %{time_ago} by %{user}" edited_ago_by_html: "Edited %{time_ago} by %{user}" version: "Version" + redacted_version: "Redacted Version" in_changeset: "Changeset" anonymous: "anonymous" no_comment: "(no comment)" @@ -329,26 +324,13 @@ en: other: "%{count} ways" download_xml: "Download XML" view_history: "View History" + view_unredacted_history: "View Unredacted History" view_details: "View Details" + view_redacted_data: "View Redacted Data" + view_redaction_message: "View Redaction Message" location: "Location:" common_details: coordinates_html: "%{latitude}, %{longitude}" - changeset: - title: "Changeset: %{id}" - belongs_to: "Author" - node: "Nodes (%{count})" - node_paginated: "Nodes (%{x}-%{y} of %{count})" - way: "Ways (%{count})" - way_paginated: "Ways (%{x}-%{y} of %{count})" - relation: "Relations (%{count})" - relation_paginated: "Relations (%{x}-%{y} of %{count})" - hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" - comment_by_html: "Comment from %{user} %{time_ago}" - changesetxml: "Changeset XML" - osmchangexml: "osmChange XML" - join_discussion: "Log in to join the discussion" - discussion: Discussion - still_open: "Changeset still open - discussion will open once the changeset is closed." node: title_html: "Node: %{name}" history_title_html: "Node History: %{name}" @@ -464,6 +446,9 @@ en: feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" + created: "Created" + closed: "Closed" + belongs_to: "Author" subscribe: heading: Subscribe to the following changeset discussion? button: Subscribe to discussion @@ -477,6 +462,28 @@ en: title: "No such changeset" heading: "No entry with the id: %{id}" body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." + show: + title: "Changeset: %{id}" + created: "Created: %{when}" + closed: "Closed: %{when}" + created_ago_html: "Created %{time_ago}" + closed_ago_html: "Closed %{time_ago}" + created_ago_by_html: "Created %{time_ago} by %{user}" + closed_ago_by_html: "Closed %{time_ago} by %{user}" + discussion: Discussion + join_discussion: "Log in to join the discussion" + still_open: "Changeset still open - discussion will open once the changeset is closed." + comment_by_html: "Comment from %{user} %{time_ago}" + hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + changesetxml: "Changeset XML" + osmchangexml: "osmChange XML" + paging_nav: + nodes: "Nodes (%{count})" + nodes_paginated: "Nodes (%{x}-%{y} of %{count})" + ways: "Ways (%{count})" + ways_paginated: "Ways (%{x}-%{y} of %{count})" + relations: "Relations (%{count})" + relations_paginated: "Relations (%{x}-%{y} of %{count})" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." changeset_comments: @@ -1770,7 +1777,7 @@ en: wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: destroy_button: "Delete" - heading: + heading: my_inbox: "My Inbox" my_outbox: "My Outbox" muted_messages: "Muted messages" @@ -1790,8 +1797,7 @@ en: new password button: "Reset password" help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." create: - notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." - notice email cannot find: "Could not find that email address, sorry." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." edit: title: "Reset password" heading: "Reset Password for %{user}" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 50dd051ca..c1e51136a 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -226,9 +226,6 @@ eo: x_years: one: antaŭ %{count} jaro other: antaŭ %{count} jaroj - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Implicita (nune %{name}) id: @@ -341,12 +338,6 @@ eo: destroy: success: Via konto estas forigita. browse: - created: Kreita - closed: Fermita - created_ago_html: Kreita %{time_ago} - closed_ago_html: Fermita %{time_ago} - created_ago_by_html: Kreita %{time_ago} de %{user} - closed_ago_by_html: Fermita %{time_ago} de %{user} deleted_ago_by_html: Forigita %{time_ago} de %{user} edited_ago_by_html: Redaktita %{time_ago} de %{user} version: Versio @@ -366,23 +357,6 @@ eo: location: 'Pozicio:' common_details: coordinates_html: '%{latitude}; %{longitude}' - changeset: - title: 'Ŝanĝaro: %{id}' - belongs_to: Aŭtoro - node: Nodoj (%{count}) - node_paginated: Nodoj (%{x}-%{y} el %{count}) - way: Linioj (%{count}) - way_paginated: Linioj (%{x}-%{y} el %{count}) - relation: Rilatoj (%{count}) - relation_paginated: Rilatoj (%{x}-%{y} el %{count}) - hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user} - comment_by_html: Komento de %{time_ago} de %{user} - changesetxml: Ŝanĝaro XML - osmchangexml: osmŜanĝo XML - join_discussion: Ensalutu por aliĝi al la diskuto - discussion: Diskuto - still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la - ŝanĝaro estos fermita. node: title_html: 'Nodo: %{name}' history_title_html: 'Historio de nodo: %{name}' @@ -500,6 +474,44 @@ eo: feed: title: Ŝanĝaro %{id} title_comment: Ŝanĝaro %{id} - %{comment} + created: Kreita + closed: Fermita + belongs_to: Aŭtoro + subscribe: + heading: Ĉu aboni diskuton pri tiu ĉi ŝanĝaro? + button: Aboni diskuton + unsubscribe: + heading: Ĉu malaboni diskuton pri tiu ĉi ŝanĝaro? + button: Malaboni diskuton + heading: + title: Ŝanĝaro %{id} + created_by_html: Kreita de %{link_user} je %{created}. + no_such_entry: + title: Neniu tia ŝanĝaro + heading: 'Neniu ŝanĝaro kun la identigilo: %{id}' + body: Bedaŭrinde ne ekzistas ŝanĝaro kun la identigilo %{id}. Kontrolu pri liter-eraroj + aŭ eble vi alklakis eraran ligilon. + show: + title: 'Ŝanĝaro: %{id}' + created_ago_html: Kreita %{time_ago} + closed_ago_html: Fermita %{time_ago} + created_ago_by_html: Kreita %{time_ago} de %{user} + closed_ago_by_html: Fermita %{time_ago} de %{user} + discussion: Diskuto + join_discussion: Ensalutu por aliĝi al la diskuto + still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la + ŝanĝaro estos fermita. + comment_by_html: Komento de %{time_ago} de %{user} + hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user} + changesetxml: Ŝanĝaro XML + osmchangexml: osmŜanĝo XML + paging_nav: + nodes: Nodoj (%{count}) + nodes_paginated: Nodoj (%{x}-%{y} el %{count}) + ways: Linioj (%{count}) + ways_paginated: Linioj (%{x}-%{y} el %{count}) + relations: Rilatoj (%{count}) + relations_paginated: Rilatoj (%{x}-%{y} el %{count}) timeout: sorry: Bedaŭrinde daŭris tro longe kompili la petitan liston de ŝanĝaroj. changeset_comments: @@ -1613,6 +1625,7 @@ eo: more: Pli user_mailer: diary_comment_notification: + description: 'OpenStreetMap: taglibra afiŝo %{id}' subject: '[OpenStreetMap] %{user} komentis pri taglibra afiŝo' hi: Saluton %{to_user}, header: '%{from_user} komentis pri la OpenStreetMap-taglibra afiŝo kun la temo @@ -1683,6 +1696,7 @@ eo: click_the_link: Se tiu estas vi, bonvolu alklaki la ligilon sube por restarigi la pasvorton. note_comment_notification: + description: 'OpenStreetMap: rimarko %{id}' anonymous: Anonimulo greeting: Saluton, commented: @@ -1717,6 +1731,7 @@ eo: details: Pli da detaloj pri la rimarko, vi povas trovi je %{url}. details_html: Pli da detaloj pri la noto troveblas ĉe %{url}. changeset_comment_notification: + description: 'OpenStreetMap: ŝanĝaro %{id}' hi: Saluton %{to_user}, greeting: Saluton, commented: @@ -1734,10 +1749,8 @@ eo: partial_changeset_without_comment: sen komento details: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. details_html: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. - unsubscribe: Por malaboni el ĝisdatigoj pri ĉi tiu ŝanĝaro, vizitu %{url} kaj - alklaku "Malobservi". - unsubscribe_html: Por malaboni la ĝisdatigojn de ĉi tiu ŝanĝaro, vizitu %{url}kaj - alklaku "Malaboni". + unsubscribe: Vi povas malaboni ĝisdatigojn pri tiu ĉi ŝanĝaro ĉe %{url}. + unsubscribe_html: Vi povas malaboni ĝisdatigojn pri tiu ĉi ŝanĝaro ĉe %{url}. confirmations: confirm: heading: Kontrolu vian retpoŝtkeston! @@ -1852,10 +1865,6 @@ eo: new password button: Nuligi pasvorton help_text: Entajpu la retpoŝtan adreson kiun vi uzis por ensaluto, ni sendos al vi ligilon, kiun vi povos uzi por restarigi vian pasvorton. - create: - notice email on way: Bedaŭras, ke vi perdis ĝin :-( sed baldaŭ vi ricevos retleteron, - kiun vi uzos por restarigi ĝin. - notice email cannot find: Bedaŭrinde, tiu retadreso ne troveblas. edit: title: Nuligi pasvorton heading: Nuligi Pasvorton por %{user} diff --git a/config/locales/es.yml b/config/locales/es.yml index 42fe29783..5479e94a9 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -418,12 +418,6 @@ es: destroy: success: Cuenta eliminada. browse: - created: Creado - closed: Cerrado - created_ago_html: Creado %{time_ago} - closed_ago_html: Cerrado %{time_ago} - created_ago_by_html: Creado %{time_ago} por %{user} - closed_ago_by_html: Cerrado %{time_ago} por %{user} deleted_ago_by_html: Eliminado %{time_ago} por %{user} edited_ago_by_html: Editado %{time_ago} por %{user} version: Versión @@ -441,23 +435,6 @@ es: view_history: Ver historial view_details: Ver detalles location: 'Ubicación:' - changeset: - title: 'Conjunto de cambios: %{id}' - belongs_to: Autor - node: Nodos (%{count}) - node_paginated: Nodos (%{x}-%{y} de %{count}) - way: Vías (%{count}) - way_paginated: Vías (%{x}-%{y} de %{count}) - relation: Relaciones (%{count}) - relation_paginated: Relaciones (%{x}-%{y} de %{count}) - hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago} - comment_by_html: Comentario de %{user} %{time_ago} - changesetxml: XML del conjunto de cambios - osmchangexml: XML en formato osmChange - join_discussion: Inicia sesión para unirte a la discusión - discussion: Discusión - still_open: El conjunto de cambios sigue abierto; la discusión se abrirá cuando - se cierre el conjunto de cambios. node: title_html: 'Nodo: %{name}' history_title_html: 'Historial de nodo: %{name}' @@ -576,6 +553,44 @@ es: feed: title: Conjunto de cambios %{id} title_comment: Conjunto de cambios %{id} - %{comment} + created: Creado + closed: Cerrado + belongs_to: Autor + subscribe: + heading: ¿Deseas suscribirte a la siguiente discusión del conjunto de cambios? + button: Suscribirse a la discusión + unsubscribe: + heading: ¿Deseas desuscribirte de la siguiente discusión del conjunto de cambios? + button: Desuscribirse de la discusión + heading: + title: Conjunto de cambios %{id} + created_by_html: Creado por %{link_user} el %{created}. + no_such_entry: + title: No existe tal conjunto de cambios + heading: 'No hay entrada con id: %{id}' + body: Lo sentimos, no existe algún conjunto de cambios con id %{id}. Revisa + los dígitos, o tal vez el enlace en el que hiciste clic sea incorrecto. + show: + title: 'Conjunto de cambios: %{id}' + created_ago_html: Creado %{time_ago} + closed_ago_html: Cerrado %{time_ago} + created_ago_by_html: Creado %{time_ago} por %{user} + closed_ago_by_html: Cerrado %{time_ago} por %{user} + discussion: Discusión + join_discussion: Inicia sesión para unirte a la discusión + still_open: El conjunto de cambios sigue abierto; la discusión se abrirá cuando + se cierre el conjunto de cambios. + comment_by_html: Comentario de %{user} %{time_ago} + hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago} + changesetxml: XML del conjunto de cambios + osmchangexml: XML en formato osmChange + paging_nav: + nodes: Nodos (%{count}) + nodes_paginated: Nodos (%{x}-%{y} de %{count}) + ways: Vías (%{count}) + ways_paginated: Vías (%{x}-%{y} de %{count}) + relations: Relaciones (%{count}) + relations_paginated: Relaciones (%{x}-%{y} de %{count}) timeout: sorry: Lo sentimos, la lista de conjuntos de cambios que solicitó tardó demasiado en obtenerse. @@ -694,6 +709,12 @@ es: comment: Comentario newer_comments: Comentarios más recientes older_comments: Comentarios más antiguos + subscribe: + heading: ¿Deseas suscribirte a la siguiente discusión sobre la entrada al diario? + button: Suscribirse a la discusión + unsubscribe: + heading: ¿Deseas desuscribirte de la siguiente discusión de entrada de diario? + button: Desuscribirse de la discusión doorkeeper: errors: messages: @@ -1698,6 +1719,7 @@ es: more: Más user_mailer: diary_comment_notification: + description: 'Entrada de diario de OpenStreetMap #%{id}' subject: '[OpenStreetMap] %{user} ha comentado en una entrada de diario' hi: 'Hola, %{to_user}:' header: '%{from_user} ha comentado en la entrada de diario con asunto %{subject}:' @@ -1706,6 +1728,8 @@ es: %{commenturl} o responder en %{replyurl} footer_html: También puedes leer el comentario en %{readurl} y puedes comentar en %{commenturl} o responder en %{replyurl} + footer_unsubscribe: Puedes cancelar la suscripción de la discusión en %{unsubscribeurl} + footer_unsubscribe_html: Puedes cancelar la suscripción de la discusión en %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Hola %{to_user}, @@ -1768,6 +1792,7 @@ es: click_the_link: Si este eres tú, por favor, haz clic en el enlace siguiente para restablecer tu contraseña. note_comment_notification: + description: 'Nota de OpenStreetMap #%{id}' anonymous: Un usuario anónimo greeting: Hola, commented: @@ -1807,6 +1832,7 @@ es: details: Más detalles acerca de la nota pueden encontrarse en %{url}. details_html: Puedes encontrar más detalles acerca de la nota en %{url}. changeset_comment_notification: + description: 'Conjunto de cambios de OpenStreetMap #%{id}' hi: Hola %{to_user}, greeting: Hola, commented: @@ -1828,10 +1854,10 @@ es: details: Puedes encontrar más detalles sobre el conjunto de cambios en %{url}. details_html: Puedes encontrar más detalles sobre el conjunto de cambios en %{url}. - unsubscribe: Para cancelar la suscripción a las actualizaciones de este conjunto - de cambios, visita %{url} y haz clic en "Cancelar suscripción". - unsubscribe_html: Para darte de baja de las actualizaciones de este conjunto - de cambios, visita %{url} y haz clic en "Cancelar suscripción". + unsubscribe: Puedes desinscrirte de las actualizaciones de este conjunto de + cambios en %{url}. + unsubscribe_html: Puedes desinscrirte de las actualizaciones de este conjunto + de cambios en %{url}. confirmations: confirm: heading: ¡Revisa tu correo electrónico! @@ -1948,12 +1974,6 @@ es: help_text: Escribe la dirección de correo electrónico con la que te registraste, te enviaremos un enlace a esa dirección que podrás utilizar para restablecer tu contraseña. - create: - notice email on way: Sentimos que la hayas perdido :-( pero ya va de camino - un mensaje de correo electrónico que te servirá para restablecer tu contraseña - enseguida. - notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de - correo electrónico. edit: title: Restablecer contraseña heading: Restablecer contraseña para %{user} diff --git a/config/locales/et.yml b/config/locales/et.yml index d715d5a0e..7af1f2f5c 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -297,12 +297,6 @@ et: destroy: success: Konto kustutatud. browse: - created: Loodud - closed: Suletud - created_ago_html: Loodud %{time_ago} - closed_ago_html: Suletud %{time_ago} - created_ago_by_html: Loonud %{user} %{time_ago} - closed_ago_by_html: Sulgenud %{user} %{time_ago} deleted_ago_by_html: Kustutanud %{user} %{time_ago} edited_ago_by_html: Muutnud %{user} %{time_ago} version: Versioon @@ -320,23 +314,6 @@ et: view_history: Vaata ajalugu view_details: Vaata üksikasju location: 'Asukoht:' - changeset: - title: 'Muudatuskogum: %{id}' - belongs_to: Autor - node: Sõlmed (%{count}) - node_paginated: Sõlmed (%{x}–%{y} %{count}-st) - way: Jooned (%{count}) - way_paginated: Jooned (%{x}–%{y} %{count}-st) - relation: Relatsioonid (%{count}) - relation_paginated: Relatsioonid (%{x}–%{y} %{count}-st) - hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago} - comment_by_html: Kommentaar kasutajalt %{user} %{time_ago} - changesetxml: Muudatuskogumi XML - osmchangexml: osmChange XML - join_discussion: Logi sisse, kui soovid arutelus osaleda - discussion: Arutelu - still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum - on suletud. node: title_html: 'Sõlm: %{name}' history_title_html: 'Sõlme ajalugu: %{name}' @@ -442,6 +419,30 @@ et: feed: title: Muudatuskogum %{id} title_comment: Muudatuskogum %{id} – %{comment} + created: Loodud + closed: Suletud + belongs_to: Autor + show: + title: 'Muudatuskogum: %{id}' + created_ago_html: Loodud %{time_ago} + closed_ago_html: Suletud %{time_ago} + created_ago_by_html: Loonud %{user} %{time_ago} + closed_ago_by_html: Sulgenud %{user} %{time_ago} + discussion: Arutelu + join_discussion: Logi sisse, kui soovid arutelus osaleda + still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum + on suletud. + comment_by_html: Kommentaar kasutajalt %{user} %{time_ago} + hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago} + changesetxml: Muudatuskogumi XML + osmchangexml: osmChange XML + paging_nav: + nodes: Sõlmed (%{count}) + nodes_paginated: Sõlmed (%{x}–%{y} %{count}-st) + ways: Jooned (%{count}) + ways_paginated: Jooned (%{x}–%{y} %{count}-st) + relations: Relatsioonid (%{count}) + relations_paginated: Relatsioonid (%{x}–%{y} %{count}-st) timeout: sorry: Kahjuks võttis taotletud muudatuskogumite laadimine liiga kaua aega. changeset_comments: @@ -1224,10 +1225,9 @@ et: partial_changeset_without_comment: ilma kommentaarita. details: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. details_html: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. - unsubscribe: Et selle muudatuskogumi uuendusteadetest ära ütelda, mine aadressile - %{url} ja klõpsa nuppu "Lõpeta tellimus". - unsubscribe_html: Et selle muudatuskogumi uuendusteadetest ära ütelda, mine - aadressile %{url} ja klõpsa nuppu "Lõpeta tellimus". + unsubscribe: Saad muudatuskogumi uuendusteadetest ära ütelda aadressil %{url}. + unsubscribe_html: Saad muudatuskogumi uuendusteadetest ära ütelda aadressil + %{url}. confirmations: confirm: heading: Kontrolli oma e-posti. @@ -1337,14 +1337,10 @@ et: new: title: Unustatud parool heading: Parool ununenud? - email address: 'E-posti aadress:' + email address: E-posti aadress new password button: Lähtesta parool help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Saadame sinna lingi, mida saad kasutada parooli lähtestamiseks. - create: - notice email on way: Kahju, et parooli kaotasid, kuid ära muretse. Peagi saad - e-kirja, mille abil saad parooli lähtestada. - notice email cannot find: Seda e-posti aadressi ei leitud. edit: title: Lähtesta parool heading: Kasutaja %{user} parooli lähtestamine @@ -1390,8 +1386,8 @@ et: new: title: Sisselogimine heading: Logi sisse - email or username: 'E-posti aadress või kasutajanimi:' - password: 'Parool:' + email or username: E-posti aadress või kasutajanimi + password: Parool remember: Jäta mind meelde lost password link: Kas unustasid parooli? login_button: Logi sisse @@ -1740,8 +1736,8 @@ et: title: Juhend algajatele description: Kogukonna hallatav juhend algajatele. community: - title: Kogukonna foorum - description: Ühine arutelukoht OpenStreetMapi kohta käivateks vestlusteks. + title: Abi- ja kogukonnafoorum + description: Ühine koht, kus küsida abi ja kus arutada OpenStreetMapi üle. mailing_lists: title: Postiloendid description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes @@ -1997,6 +1993,7 @@ et: oauth1_settings: OAuth 1 sätted oauth2_applications: OAuth 2 rakendused oauth2_authorizations: OAuth 2 volitused + muted_users: Vaigistatud kasutajad oauth: authorize: title: Lubada juurdepääs sinu kontole @@ -2553,8 +2550,8 @@ et: centre_map: Kuva kaardi keskel redactions: edit: - heading: Redigeeri kinnikatmist - title: Redigeeri kinnikatmist + heading: Kinnikatmise redigeerimine + title: Kinnikatmise redigeerimine index: empty: Pole ühtegi kinnikatmist, mida näidata. heading: Kinnikatmiste loend diff --git a/config/locales/eu.yml b/config/locales/eu.yml index d4bd1c4e7..a8736cb0a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -337,12 +337,6 @@ eu: destroy: success: Kontua ezabatu da. browse: - created: Sortua - closed: Itxita - created_ago_html: Sortua orain dela %{time_ago} - closed_ago_html: Itxia orain dela %{time_ago} - created_ago_by_html: '%{user}-ek %{time_ago} sortua' - closed_ago_by_html: '%{user}-ek %{time_ago} itxia' deleted_ago_by_html: '%{user}-ek %{time_ago} ezabatua' edited_ago_by_html: '%{user}-ek %{time_ago} editatua' version: Bertsioa @@ -360,23 +354,6 @@ eu: view_history: Ikusi historia view_details: Ikusi xehetasunak location: 'Kokapena:' - changeset: - title: 'Aldaketa: %{id}' - belongs_to: Egilea - node: Nodoak (%{count}) - node_paginated: Nodoak (%{x}-%{y} %{count}-tik) - way: Bideak (%{count}) - way_paginated: Bideak (%{x}-%{y} %{count}-tik) - relation: Erlazioak (%{count}) - relation_paginated: Erlazioak (%{x}-%{y} %{count}-tik) - hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik' - comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}' - changesetxml: Aldaketaren XML kodea - osmchangexml: osmChange XML kodea - join_discussion: Hasi saioa eztabaidan parte hartzeko - discussion: Eztabaida - still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko - da. node: title_html: 'Nodoa: %{name}' history_title_html: 'Nodoaren historia: %{name}' @@ -494,6 +471,30 @@ eu: feed: title: '%{id} aldaketak' title_comment: '%{id} aldaketa - %{comment}' + created: Sortua + closed: Itxita + belongs_to: Egilea + show: + title: 'Aldaketa: %{id}' + created_ago_html: Sortua orain dela %{time_ago} + closed_ago_html: Itxia orain dela %{time_ago} + created_ago_by_html: '%{user}-ek %{time_ago} sortua' + closed_ago_by_html: '%{user}-ek %{time_ago} itxia' + discussion: Eztabaida + join_discussion: Hasi saioa eztabaidan parte hartzeko + still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko + da. + comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}' + hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik' + changesetxml: Aldaketaren XML kodea + osmchangexml: osmChange XML kodea + paging_nav: + nodes: Nodoak (%{count}) + nodes_paginated: Nodoak (%{x}-%{y} %{count}-tik) + ways: Bideak (%{count}) + ways_paginated: Bideak (%{x}-%{y} %{count}-tik) + relations: Erlazioak (%{count}) + relations_paginated: Erlazioak (%{x}-%{y} %{count}-tik) timeout: sorry: Barkatu, zuk eskatutako aldaketen zerrenda berreskuratzeko denbora gehiegi behar izan da. @@ -1848,10 +1849,6 @@ eu: new password button: Pasahitza berrezarri help_text: Sartu saioa hastean erabiltzen zenuen helbide elektronikoa, zure pasahitza berrezarri ahal izateko erabil dezakezu bidaliko dizugun esteka. - create: - notice email on way: Sentitzen duzu hau galdu izatea :-( baina posta elektronikoa - bidaltzen ari zaizu laster berrabiarazi dezakezun. - notice email cannot find: Eposta helbide hori ezin izan dugu aurkitu, barkatu. edit: title: Pasahitza berrezarri heading: '%{user}-ren pasahitza berrezarri' diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 4c2243872..76db09a1c 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -353,12 +353,6 @@ fa: destroy: success: حساب حذف شد. browse: - created: ایجاد شد - closed: بسته شد - created_ago_html: ایجاد شد %{time_ago} - closed_ago_html: بسته شد %{time_ago} - created_ago_by_html: '%{time_ago} %{user} ایجادش کرد' - closed_ago_by_html: '%{time_ago} %{user} بستش' deleted_ago_by_html: '%{time_ago} %{user} حذفش کرد' edited_ago_by_html: '%{time_ago} %{user} ویرایشش کرد' version: نسخهٔ @@ -376,22 +370,6 @@ fa: view_history: نمایش تاریخچه view_details: نمایش جزئیات location: 'مکان: ‪' - changeset: - title: 'بستهٔ تغییر: %{id}' - belongs_to: پدیدآور - node: گره‌ها (%{count}) - node_paginated: گره‌ها (%{x}-%{y} از %{count}) - way: راه‌ها (%{count}) - way_paginated: راه‌ها (%{x}-%{y} از %{count}) - relation: رابطه‌ها (%{count}) - relation_paginated: رابطه‌ها (%{x}-%{y} از %{count}) - hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago} - comment_by_html: نظر از %{user}‏ %{time_ago} - changesetxml: Changeset XML - osmchangexml: osmChange XML - join_discussion: وارد شوید تا به بحث بپیوندید - discussion: بحث - still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود. node: title_html: 'گره: %{name}' history_title_html: 'تاریخچهٔ گره: %{name}' @@ -500,6 +478,29 @@ fa: feed: title: بستهٔ تغییر %{id} title_comment: بستهٔ تغییر %{id} - %{comment} + created: ایجاد شد + closed: بسته شد + belongs_to: پدیدآور + show: + title: 'بستهٔ تغییر: %{id}' + created_ago_html: ایجاد شد %{time_ago} + closed_ago_html: بسته شد %{time_ago} + created_ago_by_html: '%{time_ago} %{user} ایجادش کرد' + closed_ago_by_html: '%{time_ago} %{user} بستش' + discussion: بحث + join_discussion: وارد شوید تا به بحث بپیوندید + still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود. + comment_by_html: نظر از %{user}‏ %{time_ago} + hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago} + changesetxml: Changeset XML + osmchangexml: osmChange XML + paging_nav: + nodes: گره‌ها (%{count}) + nodes_paginated: گره‌ها (%{x}-%{y} از %{count}) + ways: راه‌ها (%{count}) + ways_paginated: راه‌ها (%{x}-%{y} از %{count}) + relations: رابطه‌ها (%{count}) + relations_paginated: رابطه‌ها (%{x}-%{y} از %{count}) timeout: sorry: شوربختانه بازیابی بسته‌های تغییر که درخواست نموده‌اید، خیلی طولانی شد. changeset_comments: @@ -1771,10 +1772,6 @@ fa: new password button: بازنشانی رمز عبور help_text: رایانامه‌ای که با آن نام‌نویسی کرده‌اید را وارد کنید. ما پیوندی به آن می‌فرستیم تا بتوانید به وسیلهٔ آن گذرواژه‌تان را بازنشانی کنید. - create: - notice email on way: متأسفیم که آن را گم کرده‌اید :-( اما رایانامه‌ای در راه - است که می‌توانید به‌زودی آن را مجدد تنظیم کنید. - notice email cannot find: چنین رایانامه‌ای پیدا نشد، متأسفیم. edit: title: بازنشانی رمز عبور heading: بازنشانی رمز عبور برای %{user} diff --git a/config/locales/fi.yml b/config/locales/fi.yml index fe5daef1c..e2a53fe95 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -91,6 +91,9 @@ fi: messages: invalid_email_address: '"%s" ei näytä olevan kelvollinen sähköpostiosoite.' email_address_not_routable: reittiohjeet eivät ole saatavilla + models: + user_mute: + is_already_muted: on jo hiljennetty models: acl: Pääsyoikeuslista changeset: Muutoskokoelma @@ -350,12 +353,6 @@ fi: destroy: success: Käyttäjä poistettu. browse: - created: Luotu - closed: Suljettu - created_ago_html: Luotu %{time_ago} - closed_ago_html: Suljettu %{time_ago} - created_ago_by_html: Luonut %{user}, %{time_ago} - closed_ago_by_html: Sulkenut %{user}, %{time_ago} deleted_ago_by_html: Poistanut %{user}, %{time_ago} edited_ago_by_html: Muokannut %{time_ago} %{user} version: Versio @@ -373,23 +370,6 @@ fi: view_history: Näytä historia view_details: Näytä tiedot location: 'Sijainti:' - changeset: - title: 'Muutoskokoelma: %{id}' - belongs_to: Lähettäjä - node: Pisteet (%{count}) - node_paginated: Pisteet (%{x}-%{y} / %{count}) - way: Reitit (%{count}) - way_paginated: Reitit (%{x}-%{y} of %{count}) - relation: Relaatiot (%{count}) - relation_paginated: Relaatiot (%{x}-%{y} / %{count}) - hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago} - comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago} - changesetxml: Muutoskokoelman XML - osmchangexml: osmChange XML - join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun - discussion: Keskustelu - still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun - muutoskokoelma on suljettu. node: title_html: 'Piste: %{name}' history_title_html: Pisteen %{name} historia @@ -497,6 +477,30 @@ fi: feed: title: Muutoskokoelma %{id} title_comment: Muutoskokoelma %{id} - %{comment} + created: Luotu + closed: Suljettu + belongs_to: Lähettäjä + show: + title: 'Muutoskokoelma: %{id}' + created_ago_html: Luotu %{time_ago} + closed_ago_html: Suljettu %{time_ago} + created_ago_by_html: Luonut %{user}, %{time_ago} + closed_ago_by_html: Sulkenut %{user}, %{time_ago} + discussion: Keskustelu + join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun + still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun + muutoskokoelma on suljettu. + comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago} + hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago} + changesetxml: Muutoskokoelman XML + osmchangexml: osmChange XML + paging_nav: + nodes: Pisteet (%{count}) + nodes_paginated: Pisteet (%{x}-%{y} / %{count}) + ways: Reitit (%{count}) + ways_paginated: Reitit (%{x}-%{y} of %{count}) + relations: Relaatiot (%{count}) + relations_paginated: Relaatiot (%{x}-%{y} / %{count}) timeout: sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian kauan. @@ -1677,9 +1681,9 @@ fi: details: 'Lisätietoja muutoskokoelmasta: %{url}' details_html: 'Lisätietoja muutoskokoelmasta: %{url}' unsubscribe: Peru tämän muutoskokoelman sähköposti-ilmoitukset siirtymällä osoitteeseen - %{url} ja napsauttamalla Lopeta tilaus. + %{url}. unsubscribe_html: Peru tämän muutoskokoelman sähköposti-ilmoitukset siirtymällä - osoitteeseen %{url} ja napsauttamalla Lopeta tilaus. + osoitteeseen %{url}. confirmations: confirm: heading: Tarkista sähköpostisi! @@ -1778,9 +1782,6 @@ fi: new password button: Lähetä salasanan palautusohjeet help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen lähetetään salasanan palautusohjeet. - create: - notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen. - notice email cannot find: Annettu sähköpostiosoite ei ole käytössä. edit: title: Salasanan vaihto heading: Vaihda käyttäjän %{user} salasana @@ -2118,8 +2119,9 @@ fi: title: Aloitusopas description: Yhteisön ylläpitämä opas aloittelijoille. community: - title: Yhteisön keskustelupalsta - description: Jaettu paikka OpenStreetMapiin liittyville keskusteluille. + title: Ohje- ja yhteisöfoorumi + description: Yhteinen paikka avun hakemiselle ja OpenStreetMapiin liittyville + keskusteluille. mailing_lists: title: Postituslistat description: Esitä kysymyksiä tai keskustele laajalti kiinnostavista aiheista @@ -2412,6 +2414,7 @@ fi: oauth1_settings: OAuth 1 -asetukset oauth2_applications: OAuth 2 -sovellukset oauth2_authorizations: OAuth 2 -käyttöoikeudet + muted_users: Hiljennetyt käyttäjät oauth: authorize: title: Salli tilisi käyttö @@ -2440,6 +2443,7 @@ fi: permissions: missing: Et ole sallinut sovelluksen käyttöoikeutta tähän palveluun scopes: + openid: Kirjaudu sisään OpenStreetMapin avulla read_prefs: Käyttäjäasetusten käsittely write_prefs: Käyttäjäasetusten muuttaminen write_diary: Päiväkirjamerkintöjen luonti, kommentointi ja kavereiden lisääminen @@ -2795,11 +2799,14 @@ fi: user_mutes: index: table: + thead: + muted_user: Hiljennetty käyttäjä + actions: Toiminnot tbody: send_message: Lähetä viesti create: - notice: Mykistit käyttäjän %{name}. - error: Käyttäjää %{name} ei voitu mykistää. %{full_message}. + notice: Hiljensit käyttäjän %{name}. + error: Käyttäjää %{name} ei voitu hiljentää. %{full_message}. destroy: notice: Poistit mykistyksen käyttäjältä %{name}. notes: diff --git a/config/locales/fit.yml b/config/locales/fit.yml index bc653f3a7..50fa71f75 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -200,8 +200,6 @@ fit: heading: 'Mookkaukset julkisia:' make_edits_public_button: Tee mookkauksistani julkisia browse: - created: Luotu - closed: Ratkaistu version: Versuuni in_changeset: Muutoskokoelma anonymous: tuntematon @@ -211,21 +209,6 @@ fit: view_history: Näytä histuuria view_details: Näytä tieot location: 'Sijainti:' - changeset: - title: 'Muutoskokoelma: %{id}' - belongs_to: Lähättäjä - node: Pisteet (%{count}) - node_paginated: Pisteet (%{x}-%{y} / %{count}) - way: Reitit (%{count}) - way_paginated: Reitit (%{x}-%{y} of %{count}) - relation: Relaatiot (%{count}) - relation_paginated: Relaatiot (%{x}-%{y} / %{count}) - changesetxml: Muutoskokoelman XML - osmchangexml: osmChange XML - join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun - discussion: Keskustelu - still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun - muutoskokoelma on suljettu. node: title_html: 'Piste: %{name}' history_title_html: Pisteen %{name} histuuria @@ -323,6 +306,24 @@ fit: feed: title: Muutoskokoelma %{id} title_comment: Muutoskokoelma %{id} - %{comment} + created: Luotu + closed: Ratkaistu + belongs_to: Lähättäjä + show: + title: 'Muutoskokoelma: %{id}' + discussion: Keskustelu + join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun + still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun + muutoskokoelma on suljettu. + changesetxml: Muutoskokoelman XML + osmchangexml: osmChange XML + paging_nav: + nodes: Pisteet (%{count}) + nodes_paginated: Pisteet (%{x}-%{y} / %{count}) + ways: Reitit (%{count}) + ways_paginated: Reitit (%{x}-%{y} of %{count}) + relations: Relaatiot (%{count}) + relations_paginated: Relaatiot (%{x}-%{y} / %{count}) timeout: sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian kauan. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index fa09fc52d..84fda351a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -56,6 +56,7 @@ # Author: Ltrlg # Author: Lucky # Author: Lulucmy +# Author: MacOS Weed # Author: Macofe # Author: Manaviko # Author: Mathieu @@ -435,15 +436,10 @@ fr: destroy: success: Compte supprimé. browse: - created: Créé - closed: Fermé - created_ago_html: Créé %{time_ago} - closed_ago_html: Fermé %{time_ago} - created_ago_by_html: Créé %{time_ago} par %{user} - closed_ago_by_html: Fermé %{time_ago} par %{user} deleted_ago_by_html: Supprimé %{time_ago} par %{user} edited_ago_by_html: Modifié %{time_ago} par %{user} version: Version + redacted_version: Version censurée in_changeset: Groupe de modifications anonymous: anonyme no_comment: (aucun commentaire) @@ -456,27 +452,12 @@ fr: other: '%{count} chemins' download_xml: Télécharger en XML view_history: Voir l’historique + view_unredacted_history: Voir l'historique non censuré view_details: Afficher les détails + view_redacted_data: Afficher les données censurées location: 'Emplacement :' common_details: coordinates_html: '%{latitude} ; %{longitude}' - changeset: - title: 'Groupe de modifications : %{id}' - belongs_to: Auteur - node: Nœuds (%{count}) - node_paginated: Nœuds (%{x} à %{y} sur %{count}) - way: Chemins (%{count}) - way_paginated: Chemins (%{x} à %{y} sur %{count}) - relation: Relations (%{count}) - relation_paginated: Relations (%{x} à %{y} sur %{count}) - hidden_comment_by_html: Commentaire caché de %{user} %{time_ago} - comment_by_html: Commentaire de %{user} %{time_ago} - changesetxml: XML du groupe de modifications - osmchangexml: XML osmChange - join_discussion: Se connecter pour rejoindre la discussion - discussion: Discussion - still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira - une fois que l’ensemble de modifications sera fermé. node: title_html: 'Nœud : %{name}' history_title_html: 'Historique du nœud : %{name}' @@ -596,6 +577,34 @@ fr: feed: title: Groupe de modifications %{id} title_comment: 'Groupe de modifications %{id} : %{comment}' + created: Créé + closed: Fermé + belongs_to: Auteur + unsubscribe: + button: Se désinscrire de la discussion + show: + title: 'Groupe de modifications : %{id}' + created: 'Créé : %{when}' + closed: 'Fermé : %{when}' + created_ago_html: Créé %{time_ago} + closed_ago_html: Fermé %{time_ago} + created_ago_by_html: Créé %{time_ago} par %{user} + closed_ago_by_html: Fermé %{time_ago} par %{user} + discussion: Discussion + join_discussion: Se connecter pour rejoindre la discussion + still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira + une fois que l’ensemble de modifications sera fermé. + comment_by_html: Commentaire de %{user} %{time_ago} + hidden_comment_by_html: Commentaire caché de %{user} %{time_ago} + changesetxml: XML du groupe de modifications + osmchangexml: XML osmChange + paging_nav: + nodes: Nœuds (%{count}) + nodes_paginated: Nœuds (%{x} à %{y} sur %{count}) + ways: Chemins (%{count}) + ways_paginated: Chemins (%{x} à %{y} sur %{count}) + relations: Relations (%{count}) + relations_paginated: Relations (%{x} à %{y} sur %{count}) timeout: sorry: Désolé, la liste des groupes de modifications que vous avez demandée a mis trop de temps à récupérer. @@ -717,6 +726,10 @@ fr: comment: Commentaire newer_comments: Commentaires plus récents older_comments: Commentaires plus anciens + subscribe: + button: S'abonner à la discussion + unsubscribe: + button: Se désinscrire de la discussion doorkeeper: errors: messages: @@ -1733,6 +1746,7 @@ fr: sur %{commenturl} ou envoyer un message à l'auteur sur %{replyurl} footer_html: Vous pouvez aussi lire le commentaire sur %{readurl} et vous pouvez commenter sur %{commenturl} ou envoyer un message à l’auteur sur %{replyurl} + footer_unsubscribe: Vous pouvez vous désabonner de la discussion depuis %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Bonjour %{to_user}, @@ -1856,10 +1870,10 @@ fr: details: Plus de détails sur l’ensemble de modifications à %{url}. details_html: Vous pouvez trouver plus de détails sur l’ensemble de modifications sur %{url}. - unsubscribe: Pour vous désabonner des mises à jour de cet ensemble de modifications, - visitez %{url} et cliquez sur « Désabonner ». - unsubscribe_html: Pour vous désabonner des mises à jour de cet ensemble de modifications, - visitez %{url} et cliquez sur « Désabonner ». + unsubscribe: Vous pouvez vous désabonner des mises à jour de cet ensemble de + modifications depuis %{url}. + unsubscribe_html: Vous pouvez vous désabonner des mises à jour de cet ensemble + de modifications depuis %{url}. confirmations: confirm: heading: Vérifiez votre courriel ! @@ -1981,9 +1995,9 @@ fr: nous enverrons à cette adresse un lien que vous pourrez utiliser pour réinitialiser votre mot de passe. create: - notice email on way: Désolé que vous ayez perdu votre mot de passe :-( Un courriel - vous a été envoyé pour que vous puissiez vite le réinitialiser. - notice email cannot find: Cette adresse de courriel est introuvable, désolé. + send_paranoid_instructions: Si votre adresse courriel existe dans notre base + de données, vous recevrez dans quelques minutes un courriel avec un lien de + récupération de mot de passe à votre adresse de courriel. edit: title: Réinitialiser le mot de passe heading: Réinitialiser le mot de passe de %{user} diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 9615be1f6..395aeb32e 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -264,12 +264,6 @@ fur: destroy: success: Profîl eliminât. browse: - created: Creât - closed: Sierât - created_ago_html: Creât %{time_ago} - closed_ago_html: Sierât %{time_ago} - created_ago_by_html: Creât di %{user} %{time_ago} - closed_ago_by_html: Sierât di %{user} %{time_ago} deleted_ago_by_html: Eliminât di %{user} %{time_ago} edited_ago_by_html: Modificât di %{user} %{time_ago} version: Version @@ -287,21 +281,6 @@ fur: view_history: Cjale il storic view_details: Cjale i detais location: 'Lûc:' - changeset: - title: 'Grup di cambiaments: %{id}' - belongs_to: Autôr - node: Grops (%{count}) - node_paginated: Grops (%{x}-%{y} su %{count}) - way: Viis (%{count}) - way_paginated: Viis (%{x}-%{y} su %{count}) - relation: Relazions (%{count}) - relation_paginated: Relazions (%{x}-%{y} su %{count}) - hidden_comment_by_html: Coment platât di %{user} %{time_ago} - comment_by_html: Comentât di %{user} %{time_ago} - changesetxml: Grup di cambiaments XML - osmchangexml: XML in formât osmChange - join_discussion: Jentre par partecipâ ae discussion - discussion: Discussion node: title_html: 'Grop: %{name}' history_title_html: 'Storic dal grop: %{name}' @@ -401,6 +380,28 @@ fur: feed: title: Grup di cambiaments %{id} title_comment: Grup di cambiaments %{id} - %{comment} + created: Creât + closed: Sierât + belongs_to: Autôr + show: + title: 'Grup di cambiaments: %{id}' + created_ago_html: Creât %{time_ago} + closed_ago_html: Sierât %{time_ago} + created_ago_by_html: Creât di %{user} %{time_ago} + closed_ago_by_html: Sierât di %{user} %{time_ago} + discussion: Discussion + join_discussion: Jentre par partecipâ ae discussion + comment_by_html: Comentât di %{user} %{time_ago} + hidden_comment_by_html: Coment platât di %{user} %{time_ago} + changesetxml: Grup di cambiaments XML + osmchangexml: XML in formât osmChange + paging_nav: + nodes: Grops (%{count}) + nodes_paginated: Grops (%{x}-%{y} su %{count}) + ways: Viis (%{count}) + ways_paginated: Viis (%{x}-%{y} su %{count}) + relations: Relazions (%{count}) + relations_paginated: Relazions (%{x}-%{y} su %{count}) timeout: sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je stade masse timp a cjamâsi. @@ -1104,8 +1105,6 @@ fur: new password button: Azere la password help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti e ti mandarin un leam par tornâ a impuestâ la tô password. - create: - notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs. edit: title: Azere la password heading: Azere la password par %{user} diff --git a/config/locales/fy.yml b/config/locales/fy.yml index d50bb21d9..02ab1193a 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -300,8 +300,6 @@ fy: destroy: success: Akkount wiske. browse: - created: Makke - closed: Ofdien version: Ferzje in_changeset: Wizigingsset anonymous: anonym @@ -317,21 +315,6 @@ fy: view_history: Skiednis besjen view_details: Gegevens besjen location: 'Lokaasje:' - changeset: - title: 'Wizigingsset: %{id}' - belongs_to: Makker - node: Punten (%{count}) - node_paginated: Punten (%{x}-%{y} fan %{count}) - way: Linen (%{count}) - way_paginated: Linen (%{x}-%{y} fan %{count}) - relation: Relaasjes (%{count}) - relation_paginated: Relaasjes (%{x}-%{y} fan %{count}) - changesetxml: Wizigingsset-XML - osmchangexml: osmWizigings-XML - join_discussion: Meld jo oan en oerlis mei - discussion: Oerlis - still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset - ôfdien is. node: title_html: 'Punt: %{name}' history_title_html: 'Skiednis fan punt: %{name}' @@ -437,6 +420,24 @@ fy: feed: title: Wizigingsset %{id} title_comment: Wizigingsset %{id} - %{comment} + created: Makke + closed: Ofdien + belongs_to: Makker + show: + title: 'Wizigingsset: %{id}' + discussion: Oerlis + join_discussion: Meld jo oan en oerlis mei + still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset + ôfdien is. + changesetxml: Wizigingsset-XML + osmchangexml: osmWizigings-XML + paging_nav: + nodes: Punten (%{count}) + nodes_paginated: Punten (%{x}-%{y} fan %{count}) + ways: Linen (%{count}) + ways_paginated: Linen (%{x}-%{y} fan %{count}) + relations: Relaasjes (%{count}) + relations_paginated: Relaasjes (%{x}-%{y} fan %{count}) timeout: sorry: Spitich, it opheljen fan 'e list wizigingssets dy't jo fregen duorre te lang. @@ -1727,10 +1728,6 @@ fy: help_text: Folje it e-mailadres yn dat jo by it ynskriuwen brûkt hawwe. Wy stjoere der dan in keppeling hinne dy't jo brûke kinne om jo wachtwurd op 'e nij yn te stellen. - create: - notice email on way: Spitich dat jo 'm kwyt binne :-( mar in e-mail is ûnderweis, - dat jo kinne gau in nijenien ynstelle. - notice email cannot find: Koe dat e-mailadres net fine, spitich. edit: title: Nij wachtwurd heading: Wachtwurd op 'e nij ynstelle foar %{user} diff --git a/config/locales/ga.yml b/config/locales/ga.yml index b64dc4fff..f2016986e 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -207,8 +207,6 @@ ga: go_public: heading: Eagarthóireacht phoiblí browse: - created: Cruthaithe ag - closed: Dúnta ag version: Leagan in_changeset: Tacar athruithe anonymous: gan ainm @@ -218,19 +216,6 @@ ga: view_history: Féach ar Stair view_details: Amharc ar Shonraí location: 'Suíomh:' - changeset: - title: 'Tacar athruithe: %{id}' - belongs_to: Údar - node: Nóid (%{count}) - node_paginated: Nóid (%{x}-%{y} de %{count}) - way: Bealaí (%{count}) - way_paginated: Bealaí (%{x}-%{y} de %{count}) - relation: Gaolta (%{count}) - relation_paginated: Gaolta (%{x}-%{y} de %{count}) - changesetxml: XML an Tacair athruithe - osmchangexml: XML osmChange - join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé - discussion: Plé node: title_html: 'Nód: %{name}' history_title_html: 'Stair an Nóid: %{name}' @@ -327,6 +312,22 @@ ga: feed: title: Tacar athruithe %{id} title_comment: Tacar athruithe %{id} - %{comment} + created: Cruthaithe ag + closed: Dúnta ag + belongs_to: Údar + show: + title: 'Tacar athruithe: %{id}' + discussion: Plé + join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé + changesetxml: XML an Tacair athruithe + osmchangexml: XML osmChange + paging_nav: + nodes: Nóid (%{count}) + nodes_paginated: Nóid (%{x}-%{y} de %{count}) + ways: Bealaí (%{count}) + ways_paginated: Bealaí (%{x}-%{y} de %{count}) + relations: Gaolta (%{count}) + relations_paginated: Gaolta (%{x}-%{y} de %{count}) timeout: sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr tú a aisghabháil. @@ -1299,11 +1300,6 @@ ga: new password button: Athshocraigh an focal faire help_text: Iontráil an seoladh ríomhphoist a d'úsáid tú le clárú, agus seolfaimid nasc chugat a bheidh tú in ann a úsáid chun do phasfhocal a athshocrú. - create: - notice email on way: Is oth linn gur chaill tú é :-( ach tá ríomhphost ar an - mbealach chugat le go mbeidh tú in ann é a athshocrú go luath. - notice email cannot find: Níorbh fhéidir an seoladh ríomhphoist sin a aimsiú, - ár leithscéil faoi sin. edit: title: Focal faire a athshocrú heading: Focal Faire le haghaidh %{user} a Athshocrú diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index 05513dbe4..7881b7087 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -104,13 +104,6 @@ gcf: no_comment: (pon komantasyon) download_xml: Chantyé XML location: 'Ki koté:' - changeset: - hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago} - comment_by_html: Komantasyon a %{user} %{time_ago} - changesetxml: Niméwo Chanjeman XML - osmchangexml: osmChanjeman XML - join_discussion: Konèkté-w pou jwenn bokantaj-la - discussion: Bokantaj containing_relation: entry_html: Rèlasion %{relation_name} entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role}) @@ -131,6 +124,13 @@ gcf: previous: Pwochenn changesets: comment: Komantasyon + show: + discussion: Bokantaj + join_discussion: Konèkté-w pou jwenn bokantaj-la + comment_by_html: Komantasyon a %{user} %{time_ago} + hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago} + changesetxml: Niméwo Chanjeman XML + osmchangexml: osmChanjeman XML dashboards: contact: km away: '%{count} km' diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 8082f2ae2..3a378003d 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -182,8 +182,6 @@ gd: Thoir sùil air a' phost-d agad gus an seòladh puist-d ùr agad a dhearbhadh. success: Chaidh fiosrachadh a' chleachdaiche ùrachadh gu soirbheachail. browse: - created: Air a chruthachadh - closed: Dùinte version: Tionndadh in_changeset: Seata atharraichean anonymous: gun ainm @@ -193,19 +191,6 @@ gd: view_history: Seall an eachdraidh view_details: Seall am mion-fhiosrachadh location: 'Àite:' - changeset: - title: 'Seata atharraichean: %{id}' - belongs_to: Ùghdar - node: Nòdan (%{count}) - node_paginated: Nòdan (%{x}-%{y} à %{count}) - way: Slighean (%{count}) - way_paginated: Slighean (%{x}-%{y} à %{count}) - relation: Dàimhean (%{count}) - relation_paginated: Dàimhean (%{x}-%{y} à %{count}) - changesetxml: XML le seata atharraichean - osmchangexml: XML osmChange - join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd - discussion: Deasbaireachd node: title_html: 'Nòd: %{name}' history_title_html: 'Eachdraidh an nòd: %{name}' @@ -304,6 +289,22 @@ gd: feed: title: Seata atharraichean %{id} title_comment: Seata atharraichean %{id} - %{comment} + created: Air a chruthachadh + closed: Dùinte + belongs_to: Ùghdar + show: + title: 'Seata atharraichean: %{id}' + discussion: Deasbaireachd + join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd + changesetxml: XML le seata atharraichean + osmchangexml: XML osmChange + paging_nav: + nodes: Nòdan (%{count}) + nodes_paginated: Nòdan (%{x}-%{y} à %{count}) + ways: Slighean (%{count}) + ways_paginated: Slighean (%{x}-%{y} à %{count}) + relations: Dàimhean (%{count}) + relations_paginated: Dàimhean (%{x}-%{y} à %{count}) timeout: sorry: Duilich ach thug e ro fhada gus an seata atharraichean a dh'iarr thu fhaighinn. @@ -1139,11 +1140,6 @@ gd: help_text: Cuir a-steach an seòladh puist-d a chleachd thu gus an cunntas agad a chlàradh agus cuiridh sinn post-d dha as urrainn dhut cleachdadh gus am facal-faire agad ath-shuidheachadh. - create: - notice email on way: Tha sinn duilich gun do chaill thu e :-( ach tha post-d - gu bhith tighinn thugad ach an urrainn dhut ath-shuidheachadh a dh'aithghearr. - notice email cannot find: Duilich ach cha do rinn sinn lorg air an t-seòladh - puist-d ud. edit: title: Ath-shuidhich am facal-faire heading: Ath-shuidhich am facal-faire aig %{user} diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 987212e45..4a06b46e2 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -339,12 +339,6 @@ gl: destroy: success: Conta borrada. browse: - created: Creado - closed: Pechado - created_ago_html: Creado %{time_ago} - closed_ago_html: Pechado %{time_ago} - created_ago_by_html: Creado %{time_ago} por %{user} - closed_ago_by_html: Pechado %{time_ago} por %{user} deleted_ago_by_html: Borrado %{time_ago} por %{user} edited_ago_by_html: Editado %{time_ago} por %{user} version: Versión @@ -362,23 +356,6 @@ gl: view_history: Ollar o historial view_details: Ollar os detalles location: 'Localización:' - changeset: - title: 'Conxunto de modificacións: %{id}' - belongs_to: Autor - node: Nós (%{count}) - node_paginated: Nós (%{x}-%{y} de %{count}) - way: Vías (%{count}) - way_paginated: Vías (%{x}-%{y} de %{count}) - relation: Relacións (%{count}) - relation_paginated: Relacións (%{x}-%{y} de %{count}) - hidden_comment_by_html: Comentario de %{user} agochado %{time_ago} - comment_by_html: Comentario de %{user} %{time_ago} - changesetxml: XML do conxunto de modificacións - osmchangexml: XML de osmChange - join_discussion: Inicia a sesión para unirte á parola - discussion: Parola - still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando - o conxunto de modificacións estea pechado. node: title_html: 'Nó: %{name}' history_title_html: 'Historial do nó: %{name}' @@ -496,6 +473,30 @@ gl: feed: title: Conxunto de modificacións %{id} title_comment: Conxunto de modificacións %{id} - %{comment} + created: Creado + closed: Pechado + belongs_to: Autor + show: + title: 'Conxunto de modificacións: %{id}' + created_ago_html: Creado %{time_ago} + closed_ago_html: Pechado %{time_ago} + created_ago_by_html: Creado %{time_ago} por %{user} + closed_ago_by_html: Pechado %{time_ago} por %{user} + discussion: Parola + join_discussion: Inicia a sesión para unirte á parola + still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando + o conxunto de modificacións estea pechado. + comment_by_html: Comentario de %{user} %{time_ago} + hidden_comment_by_html: Comentario de %{user} agochado %{time_ago} + changesetxml: XML do conxunto de modificacións + osmchangexml: XML de osmChange + paging_nav: + nodes: Nós (%{count}) + nodes_paginated: Nós (%{x}-%{y} de %{count}) + ways: Vías (%{count}) + ways_paginated: Vías (%{x}-%{y} de %{count}) + relations: Relacións (%{count}) + relations_paginated: Relacións (%{x}-%{y} de %{count}) timeout: sorry: Desculpe que levase moito tempo obter a listaxe do conxunto de modificacións que solicitou. @@ -1867,10 +1868,6 @@ gl: help_text: Escribe o enderezo de correo electrónico que empregaches para te rexistrares. Enviarémosche unha ligazón que poderás empregar para restablecer o teu contrasinal. - create: - notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe - de correo electrónico ca que o poderá restabelecelo axiña. - notice email cannot find: Non se puido atopar o enderezo de correo electrónico. edit: title: Restablecer o contrasinal heading: Restablecer o contrasinal de %{user} diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index cf3854f93..595b47f34 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -93,8 +93,6 @@ gsw: name: externer Editor description: externer Editor (JOSM odda Merkaartor) browse: - created: Aagleit - closed: Zue version: Version in_changeset: Änderige anonymous: anonym @@ -104,19 +102,6 @@ gsw: view_history: Versionsgschicht view_details: Details aagucke location: 'Ort:' - changeset: - title: 'Änderigssatz: %{id}' - belongs_to: Autor - node: Gnode (%{count}) - node_paginated: Gnode (%{x}-%{y} of %{count}) - way: Wäg (%{count}) - way_paginated: Wäg (%{x}-%{y} von %{count}) - relation: Relatione (%{count}) - relation_paginated: Relatione (%{x}-%{y} of %{count}) - changesetxml: Changeset-XML - osmchangexml: osmChange XML - join_discussion: Meld dich aa, wennd mitdiskutiere willsch. - discussion: Diskussion node: title_html: 'Gnode: %{name}' history_title_html: 'Versionsgschicht vum Gnote: %{name}' @@ -168,6 +153,22 @@ gsw: feed: title: Changeset %{id} title_comment: Changeset %{id} - %{comment} + created: Aagleit + closed: Zue + belongs_to: Autor + show: + title: 'Änderigssatz: %{id}' + discussion: Diskussion + join_discussion: Meld dich aa, wennd mitdiskutiere willsch. + changesetxml: Changeset-XML + osmchangexml: osmChange XML + paging_nav: + nodes: Gnode (%{count}) + nodes_paginated: Gnode (%{x}-%{y} of %{count}) + ways: Wäg (%{count}) + ways_paginated: Wäg (%{x}-%{y} von %{count}) + relations: Relatione (%{count}) + relations_paginated: Relatione (%{x}-%{y} of %{count}) dashboards: popup: your location: Dyy Standort diff --git a/config/locales/he.yml b/config/locales/he.yml index ea2b675ab..ec25bd174 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -371,12 +371,6 @@ he: destroy: success: חשבון נמחק. browse: - created: נוצרה - closed: נסגרה - created_ago_html: נוצרה %{time_ago} - closed_ago_html: נסגרה %{time_ago} - created_ago_by_html: נוצרה %{time_ago} על־ידי %{user} - closed_ago_by_html: נסגרה %{time_ago} על־ידי %{user} deleted_ago_by_html: נמחקה %{time_ago} על־ידי %{user} edited_ago_by_html: נערכה %{time_ago} על־ידי %{user} version: גרסה @@ -398,22 +392,6 @@ he: view_history: הצגת ההיסטוריה view_details: הצגת פרטים location: 'מיקום:' - changeset: - title: 'ערכת שינויים: %{id}' - belongs_to: יוצר - node: נקודות (%{count}) - node_paginated: נקודות (%{x}–%{y} מתוך %{count}) - way: קווים (%{count}) - way_paginated: קווים (%{x}–%{y} מתוך %{count}) - relation: יחסים (%{count}) - relation_paginated: יחסים (%{x}–%{y} מתוך %{count}) - hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago} - comment_by_html: הערה מאת %{user} %{time_ago} - changesetxml: XML של ערכת השינויים - osmchangexml: osmChange XML - join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון - discussion: דיון - still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר. node: title_html: 'נקודה: %{name}' history_title_html: 'היסטוריית הנקודה: %{name}' @@ -536,6 +514,43 @@ he: feed: title: ערכת שינויים %{id} title_comment: ערכת שינויים %{id} – %{comment} + created: נוצרה + closed: נסגרה + belongs_to: יוצר + subscribe: + heading: לעשות מינוי לדיון בערכת השינויים הבאה? + button: מינוי לדיון + unsubscribe: + heading: לבטל את המינוי לדיון בערכת השינויים הבאה? + button: ביטול המינוי לדיון + heading: + title: ערכת שינויים %{id} + created_by_html: נוצרה על־ידי %{link_user} ב־%{created}. + no_such_entry: + title: אין ערכת שינויים כזאת + heading: 'אין רשומה עם המזהה: %{id}' + body: סליחה, אין ערכת שינויים עם המזהה %{id}. אולי האיות לא נכון ואולי לחצת + על קישור שגוי. + show: + title: 'ערכת שינויים: %{id}' + created_ago_html: נוצרה %{time_ago} + closed_ago_html: נסגרה %{time_ago} + created_ago_by_html: נוצרה %{time_ago} על־ידי %{user} + closed_ago_by_html: נסגרה %{time_ago} על־ידי %{user} + discussion: דיון + join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון + still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר. + comment_by_html: הערה מאת %{user} %{time_ago} + hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago} + changesetxml: XML של ערכת השינויים + osmchangexml: osmChange XML + paging_nav: + nodes: נקודות (%{count}) + nodes_paginated: נקודות (%{x}–%{y} מתוך %{count}) + ways: קווים (%{count}) + ways_paginated: קווים (%{x}–%{y} מתוך %{count}) + relations: יחסים (%{count}) + relations_paginated: יחסים (%{x}–%{y} מתוך %{count}) timeout: sorry: קבלת רשימת ערכות השינויים שביקשת אורכת זמן רב מדי, עמך הסליחה. changeset_comments: @@ -652,6 +667,12 @@ he: comment: תגובה newer_comments: הערות חדשות older_comments: הערות ישנות + subscribe: + heading: לעשות מינוי לדיון ברשומת היומן הבאה? + button: מינוי לדיון + unsubscribe: + heading: לבטל את המינוי לדיון ברשומת היומן הבאה? + button: ביטול המינוי לדיון doorkeeper: errors: messages: @@ -1646,6 +1667,7 @@ he: more: עוד user_mailer: diary_comment_notification: + description: רשומת יומן OpenStreetMap מס׳ %{id} subject: '[אופן סטריט מאפ OpenStreetMap] תגובה מאת %{user} נוספה לרשומת יומן' hi: שלום %{to_user}, header: '%{from_user} הגיב לרשומת היומן ב־OpenStreetMap עם הנושא %{subject}:' @@ -1654,6 +1676,8 @@ he: או לשלוח הודעה ליוצר בכתובת %{replyurl} footer_html: אפשר גם לקרוא את התגובה בכתובת %{readurl} ולהגיב בכתובת %{commenturl} או לשלוח הודעה למחבר בכתובת %{replyurl} + footer_unsubscribe: אפשר לבטל את המינוי לדיון בכתובת %{unsubscribeurl} + footer_unsubscribe_html: אפשר לבטל את המינוי לדיון בכתובת %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: שלום %{to_user}, @@ -1709,6 +1733,7 @@ he: כתובת הדוא"ל הזאת באתר openstreetmap.org. click_the_link: אם אכן עשית זאת, יש ללחוץ על הקישור להלן כדי לאפס את הסיסמה. note_comment_notification: + description: הערת OpenStreetMap מס׳ %{id} anonymous: משתמש אלמוני greeting: שלום, commented: @@ -1743,6 +1768,7 @@ he: details: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url} details_html: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url}. changeset_comment_notification: + description: ערכת שינויים של OpenStreetMap מס׳ %{id} hi: שלום %{to_user}, greeting: שלום, commented: @@ -1763,10 +1789,9 @@ he: partial_changeset_without_comment: ללא הערה details: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} details_html: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} - unsubscribe: כדי לבטל את המינוי לעדכונים מערכת השינויים הזאת, נא לבקר בכתובת - %{url} וללחוץ על „ביטול מינוי”. - unsubscribe_html: כדי לבטל את המעקב אחרי עדכוני מערכת השינויים הזאת, נא לבקר - בכתובת %{url} וללחוץ על „ביטול מינוי”. + unsubscribe: באפשרותך לבטל את המינוי לעדכונים מערכת השינויים הזאת בכתובת %{url}. + unsubscribe_html: באפשרותך לבטל את המינוי לעדכונים מערכת השינויים הזאת בכתובת + %{url}. confirmations: confirm: heading: אימות חשבון משתמש @@ -1878,10 +1903,6 @@ he: new password button: נא לשלוח לי סיסמה חדשה help_text: נא להזין את כתובת הדוא״ל שהשתמשת בה כדי להירשם. אנו נשלח אליה קישור שאפשר להשתמש בו כדי לאפס את סיסמתך. - create: - notice email on way: אנו מצטערים לשמוע שאיבדת אותה :-( אבל נשלח לדואר האלקטרוני - שלך מכתב שבאמצעותו אפשר לאפס אותה. - notice email cannot find: סליחה, הכתובת הזאת לא נמצאה. edit: title: איפוס סיסמה heading: איפוס הסיסמה עבור %{user} diff --git a/config/locales/hi.yml b/config/locales/hi.yml index baf8275ce..afed0e0dd 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -280,8 +280,6 @@ hi: link text: यह क्या है? save changes button: बदलाव सहेजें browse: - created: बनाया गया - closed: बंद किया गया version: संस्करण in_changeset: Changeset anonymous: अनामक @@ -297,21 +295,6 @@ hi: view_history: इतिहास देखें view_details: जानकारी देखें location: 'स्थान:' - changeset: - title: 'Changeset: %{id}' - belongs_to: लेखक - node: बिंदु (%{count}) - node_paginated: नोड (%{count} का %{x}-%{y}) - way: रेखाएं (%{count}) - way_paginated: रास्तें (%{count} का %{x}-%{y}) - relation: सम्बन्ध (%{count}) - relation_paginated: सम्बन्ध (%{count} के %{x}-%{y}) - changesetxml: Changeset XML - osmchangexml: osmChange XML - join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें - discussion: चर्चा - still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा - होगी। node: title_html: 'बिंदु: %{name}' history_title_html: 'नोड इतिहास: %{name}' @@ -418,6 +401,24 @@ hi: feed: title: 'Changeset: %{id}' title_comment: Changeset %{id} - %{comment} + created: बनाया गया + closed: बंद किया गया + belongs_to: लेखक + show: + title: 'Changeset: %{id}' + discussion: चर्चा + join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें + still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा + होगी। + changesetxml: Changeset XML + osmchangexml: osmChange XML + paging_nav: + nodes: बिंदु (%{count}) + nodes_paginated: नोड (%{count} का %{x}-%{y}) + ways: रेखाएं (%{count}) + ways_paginated: रास्तें (%{count} का %{x}-%{y}) + relations: सम्बन्ध (%{count}) + relations_paginated: सम्बन्ध (%{count} के %{x}-%{y}) timeout: sorry: माफ़ कीजिए, जिन चेंजसेट की आपने अनुरोध की थी उन्हें लाने में कुछ ज़्यादा ही वक्त लग गया। diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 561b54641..38c898289 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -266,8 +266,6 @@ hr: email za poruku potvrde nove email adrese. success: Korisničke informacije su uspješno ažurirane. browse: - created: Stvoreno - closed: Zatvoreno version: Inačica in_changeset: Set promjena anonymous: anonimno @@ -285,19 +283,6 @@ hr: view_history: Prikaži povijest view_details: Prikaži detalje location: 'Lokacija:' - changeset: - title: 'Set promjena: %{id}' - belongs_to: Autor - node: Točaka (%{count}) - node_paginated: Točke (%{x}-%{y} od %{count}) - way: Putovi (%{count}) - way_paginated: Putovi(%{x}-%{y} od %{count}) - relation: Relacije (%{count}) - relation_paginated: Relacije(%{x}-%{y} od %{count}) - changesetxml: XLM Set promjena - osmchangexml: osmChange XML - join_discussion: Prijavi se za uključivanje u raspravu - discussion: Razgovor node: title_html: 'Točka: %{name}' history_title_html: 'Povijest točke: %{name}' @@ -402,6 +387,22 @@ hr: feed: title: Set promjena %{id} title_comment: Set promjena %{id} - %{comment} + created: Stvoreno + closed: Zatvoreno + belongs_to: Autor + show: + title: 'Set promjena: %{id}' + discussion: Razgovor + join_discussion: Prijavi se za uključivanje u raspravu + changesetxml: XLM Set promjena + osmchangexml: osmChange XML + paging_nav: + nodes: Točaka (%{count}) + nodes_paginated: Točke (%{x}-%{y} od %{count}) + ways: Putovi (%{count}) + ways_paginated: Putovi(%{x}-%{y} od %{count}) + relations: Relacije (%{count}) + relations_paginated: Relacije(%{x}-%{y} od %{count}) timeout: sorry: Nažalost, preuzimanje popisa setova promjena predugo traje. changeset_comments: @@ -1203,10 +1204,6 @@ hr: new password button: Reset lozinke help_text: Unesite email adresu koju ste koristili za otvaranje računa i poslati ćemo vam poveznicu kojom možete resetirati zaporku. - create: - notice email on way: Žao mi je što ste je izgubili :-( ali email je na putu - tako da je možete resetirati uskoro. - notice email cannot find: Ne mogu pronaći email adresu. edit: title: Reset lozinke heading: Reset lozinke za %{user} diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 20dd33bd1..2b27fada7 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -45,6 +45,9 @@ hsb: messages: invalid_email_address: njezda so płaćiwa mejlkowa adresa być email_address_not_routable: njeje routojomna + models: + user_mute: + is_already_muted: je so hižo zněmił models: acl: Lisćina za přistupnu kontrolu changeset: Sadźba změnow @@ -305,8 +308,6 @@ hsb: e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić. success: Wužiwarske informacije wuspěšnje zaktualizowane. browse: - created: Wutworjeny - closed: 'Začinjeny:' version: Wersija in_changeset: Sadźba změnow anonymous: anonymny @@ -326,21 +327,6 @@ hsb: view_history: Historiju pokazać view_details: Podrobnosće pokazać location: 'Městno:' - changeset: - title: 'Sadźba změnow: %{id}' - belongs_to: Awtor - node: Suki (%{count}) - node_paginated: Suki (%{x}-%{y} z %{count}) - way: Puće (%{count}) - way_paginated: Puće (%{x}-%{y} z %{count}) - relation: Relacije (%{count}) - relation_paginated: Relacije (%{x}-%{y} z %{count}) - changesetxml: Sadźba změnow XML - osmchangexml: osmChange XML - join_discussion: Přizjew so, zo by móhł(a) sobu diskutować - discussion: Diskusija - still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je - sadźba změnow začinjena. node: title_html: 'Suk: %{name}' history_title_html: 'Sukata historija: %{name}' @@ -452,6 +438,24 @@ hsb: feed: title: Sadźba změnow %{id} title_comment: Sadźba změnow %{id} - %{comment} + created: Wutworjeny + closed: 'Začinjeny:' + belongs_to: Awtor + show: + title: 'Sadźba změnow: %{id}' + discussion: Diskusija + join_discussion: Přizjew so, zo by móhł(a) sobu diskutować + still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je + sadźba změnow začinjena. + changesetxml: Sadźba změnow XML + osmchangexml: osmChange XML + paging_nav: + nodes: Suki (%{count}) + nodes_paginated: Suki (%{x}-%{y} z %{count}) + ways: Puće (%{count}) + ways_paginated: Puće (%{x}-%{y} z %{count}) + relations: Relacije (%{count}) + relations_paginated: Relacije (%{x}-%{y} z %{count}) timeout: sorry: Bohužel je předołho trało, požadanu lisćinu změnow wotwołać. changeset_comments: @@ -1465,6 +1469,7 @@ hsb: help: Pomoc about: Wo projekće copyright: Awtorske prawo + communities: Zhromadnosće community: Zhromadźenstwo community_blogs: Dźeniki zhromadźenstwa community_blogs_title: Dźeniki čłonow zhromadźenstwa OpenStreetMap @@ -1679,6 +1684,13 @@ hsb: no_sent_messages_html: Hišće njejsy žane powěsće pósłał(a). Chceš z %{people_mapping_nearby_link} styki nawjazać? people_mapping_nearby: ludźimi, kotřiž w bliskosći kartěruja + muted: + title: Zněmjene powěsće + messages: + one: '%{count} zněmjena powěsć' + two: Maš %{count} zněmjenej powěsći + few: Maš %{count} zněmjene powěsće + other: Maš %{count} zněmjenych powěsćow reply: wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, na kotruž chceš wotmołwić, bu na druheho wužiwarja pósłana. Prošu přizjew so z prawym kontom, zo by wotmołwił(a). @@ -1695,6 +1707,7 @@ hsb: heading: my_inbox: Moja póšta my_outbox: Mój póstowy wuchad + muted_messages: Zněmjene powěsće mark: as_read: Powěsć jako přečitanu markěrowana as_unread: Powěsć jako njepřečitanu markěrowana @@ -1708,10 +1721,6 @@ hsb: new password button: Hesło wróćo stajić help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił, pósćelemy wotkaz na nju, kotryž móžeš za wróćostajenje hesła wužić. - create: - notice email on way: Sy jo zabył :-(, ale e-mejl je po puću, zo by móhł jo borze - wróćo stajić. - notice email cannot find: Wodaj, ale njemóžachmy tutu e-mejlowu adresu namakać. edit: title: Hesło wróćo stajić heading: Hesło za wužiwarja %{user} wróćo stajić @@ -1935,6 +1944,9 @@ hsb: url: http://wiki.openstreetmap.org/wiki/hsb:Beginners%27_guide title: Instrukcije za nowačkow description: Přez zhromadźenstwo wothladowany nawod za započatkowarjow. + community: + description: Zhromadne městno, hdźež móžeće za pomocu pytać a so wo OpenStreetMap + rozmołwjeć. mailing_lists: title: Rozesyłanske lisćiny description: Staj prašenje abo diskutuj zajimawe wěcy w šěrokim wobłuku temow @@ -1948,6 +1960,8 @@ hsb: słužbach bazuja a k OpenStreetMap přeńdu. welcomemat: title: Za organizacije + description: Z organizaciju plany za OpenStreetMap činić? Wuslědźće na stronje + na powitanje, štož dyrbiće wědźeć. wiki: title: Wiki OpenStreetMap description: Přepytaj wiki za nadrobnej dokumentaciju OpenStreetMap @@ -2042,6 +2056,14 @@ hsb: title: Nimaš chwile za wobdźěłowanje? Přidaj pokazku! para_1: Jeli chceš jenož drobnosć korigować a nimaš chwile, zo by so zregistrował a wuknył, kak so wobdźěłuje, móžeš prosće pokazku přidać. + communities: + title: Zhromadnosće + local_chapters: + title: Lokalne zwjazki + list_text: 'Slědowace zhromadnosće su oficielnje jako lokalne zwjazki zregistrowane:' + other_groups: + title: Druhe skupiny + communities_wiki: Wikistrona zhromadnosćow traces: visibility: private: Priwatna (jenož jako anonymna, njezrjadowane dypki ) @@ -2164,6 +2186,7 @@ hsb: oauth1_settings: Nastajenja OAUTH 1 oauth2_applications: Nastajenja OAUTH 2 oauth2_authorizations: Prawa OAUTH 2 + muted_users: Zněmjeni wužiwarjo oauth: authorize: title: Přistup na twoje konto awtorizować @@ -2338,6 +2361,7 @@ hsb: my_preferences: Moje nastajenja blocks on me: Dostane blokowanja blocks by me: Date blokowanja + create_mute: Tutoho wužiwarja zněmić edit_profile: Profil wobdźěłać send message: Powěsć pósłać diary: Dźenik @@ -2533,6 +2557,25 @@ hsb: showing_page: Strona %{page} next: Přichodny » previous: « Předchadny + user_mutes: + index: + title: Zněmjeni wužiwarjo + my_muted_users: Moji zněmjeni wužiwarjo + you_have_muted_n_users: + one: Sy %{count} wužiwarja zněmił + two: Sy %{count} wužiwarjow zněmił + few: Sy %{count} wužiwarjow zněmił + other: Sy %{count} wužiwarjow zněmił + user_mute_explainer: Powěsće zněmjenych wužiwarjow so do separatneho póstoweho + dochada přesuwaja a sy e-mejlowe zdźělenki njedóstawaš. + user_mute_admins_and_moderators: Móžeš administratorow a moderatorow zněmić, + ale jich powěsće so njezněmja. + table: + thead: + muted_user: Zněmjeny wužiwar + create: + notice: Sy wužiwarja %{name} zněmił. + error: Wužiwar %{name} njeda so zněmić. %{full_message}. notes: index: title: Pokazki, kotrež su so wot %{user} dali abo komentowali diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 106e86b5b..c96b6eadc 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -348,12 +348,6 @@ hu: destroy: success: Fiók törölve. browse: - created: Létrehozva - closed: Lezárva - created_ago_html: Létrehozva %{time_ago} - closed_ago_html: Lezárva %{time_ago} - created_ago_by_html: Létrehozta %{user} %{time_ago} - closed_ago_by_html: Lezárta %{user} %{time_ago} deleted_ago_by_html: Törölte %{user} %{time_ago} edited_ago_by_html: Szerkesztette %{user} %{time_ago} version: Verzió @@ -371,23 +365,6 @@ hu: view_history: Előzmények megtekintése view_details: Részletek megtekintése location: 'Hely:' - changeset: - title: '%{id} módosításcsomag' - belongs_to: Szerző - node: Pontok (%{count}) - node_paginated: 'Pontok (%{x}-%{y} ennyiből: %{count})' - way: Vonalak (%{count}) - way_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})' - relation: Kapcsolatok (%{count}) - relation_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})' - hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago} - comment_by_html: Hozzászólt %{user} %{time_ago} - changesetxml: Módosításcsomag adatai (XML) - osmchangexml: Módosításcsomag tartalma (osmChange XML) - join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe - discussion: Megbeszélés - still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg, - ha a módosításcsomag lezárul. node: title_html: '%{name} pont' history_title_html: '%{name} pont előzményei' @@ -496,6 +473,30 @@ hu: feed: title: '%{id} módosításcsomag' title_comment: '%{id} módosításcsomag - %{comment}' + created: Létrehozva + closed: Lezárva + belongs_to: Szerző + show: + title: '%{id} módosításcsomag' + created_ago_html: Létrehozva %{time_ago} + closed_ago_html: Lezárva %{time_ago} + created_ago_by_html: Létrehozta %{user} %{time_ago} + closed_ago_by_html: Lezárta %{user} %{time_ago} + discussion: Megbeszélés + join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe + still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg, + ha a módosításcsomag lezárul. + comment_by_html: Hozzászólt %{user} %{time_ago} + hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago} + changesetxml: Módosításcsomag adatai (XML) + osmchangexml: Módosításcsomag tartalma (osmChange XML) + paging_nav: + nodes: Pontok (%{count}) + nodes_paginated: 'Pontok (%{x}-%{y} ennyiből: %{count})' + ways: Vonalak (%{count}) + ways_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})' + relations: Kapcsolatok (%{count}) + relations_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})' timeout: sorry: Sajnáljuk, az általad kért módosításcsomagok listájának beolvasása túl sokáig tartott. @@ -1856,10 +1857,6 @@ hu: new password button: Jelszó alaphelyzetbe állítása help_text: Add meg az e-mail-címed, amellyel regisztráltál. Küldeni fogunk egy hivatkozást, amellyel visszaállíthatod a jelszavad. - create: - notice email on way: Sajnáljuk, hogy elvesztetted :-( de már úton van egy e-mail, - így nemsokára alaphelyzetbe állíthatod. - notice email cannot find: Sajnáljuk, az e-mail-cím nem található. edit: title: Jelszó alaphelyzetbe állítása heading: '%{user} jelszavának alaphelyzetbe állítása' diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 714f65380..b349832e8 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -323,12 +323,6 @@ ia: destroy: success: Conto delite. browse: - created: Create a - closed: Claudite a - created_ago_html: Create %{time_ago} - closed_ago_html: Claudite %{time_ago} - created_ago_by_html: Create %{time_ago} per %{user} - closed_ago_by_html: Claudite %{time_ago} per %{user} deleted_ago_by_html: Delite %{time_ago} per %{user} edited_ago_by_html: Modificate %{time_ago} per %{user} version: Version @@ -346,23 +340,6 @@ ia: view_history: Vider historia view_details: Vider detalios location: 'Loco:' - changeset: - title: 'Gruppo de modificationes: %{id}' - belongs_to: Autor - node: Nodos (%{count}) - node_paginated: Nodos (%{x}-%{y} de %{count}) - way: Vias (%{count}) - way_paginated: Vias (%{x}-%{y} de %{count}) - relation: Relationes (%{count}) - relation_paginated: Relationes (%{x}-%{y} de %{count}) - hidden_comment_by_html: Commento celate de %{user} %{time_ago} - comment_by_html: Commento de %{user} %{time_ago} - changesetxml: XML del gruppo de modificationes - osmchangexml: XML osmChange - join_discussion: Aperi session pro unir te al discussion - discussion: Discussion - still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira - quando le gruppo de modificationes essera claudite. node: title_html: 'Nodo: %{name}' history_title_html: 'Historia del nodo: %{name}' @@ -480,6 +457,30 @@ ia: feed: title: Gruppo de modificationes %{id} title_comment: Gruppo de modificationes %{id} - %{comment} + created: Create a + closed: Claudite a + belongs_to: Autor + show: + title: 'Gruppo de modificationes: %{id}' + created_ago_html: Create %{time_ago} + closed_ago_html: Claudite %{time_ago} + created_ago_by_html: Create %{time_ago} per %{user} + closed_ago_by_html: Claudite %{time_ago} per %{user} + discussion: Discussion + join_discussion: Aperi session pro unir te al discussion + still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira + quando le gruppo de modificationes essera claudite. + comment_by_html: Commento de %{user} %{time_ago} + hidden_comment_by_html: Commento celate de %{user} %{time_ago} + changesetxml: XML del gruppo de modificationes + osmchangexml: XML osmChange + paging_nav: + nodes: Nodos (%{count}) + nodes_paginated: Nodos (%{x}-%{y} de %{count}) + ways: Vias (%{count}) + ways_paginated: Vias (%{x}-%{y} de %{count}) + relations: Relationes (%{count}) + relations_paginated: Relationes (%{x}-%{y} de %{count}) timeout: sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo de tempore pro esser recuperate. @@ -1734,10 +1735,10 @@ ia: %{url}. details_html: Plus detalios sur le gruppo de modificationes pote esser trovate a %{url}. - unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes, - visita %{url} e clicca sur "Disabonar". - unsubscribe_html: Pro disabonar te del actualisationes de iste gruppo de modificationes, - visita %{url} e clicca sur "Disabonar". + unsubscribe: Tu pote disabonar te del actualisationes de iste gruppo de modificationes + sur %{url}. + unsubscribe_html: Tu pote disabonar te del actualisationes de iste gruppo de + modificationes sur %{url}. confirmations: confirm: heading: Verifica tu e-mail! @@ -1854,10 +1855,6 @@ ia: new password button: Reinitialisar contrasigno help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno. - create: - notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate - un e-mail que te permittera de reinitialisar lo. - notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono. edit: title: Reinitialisar contrasigno heading: Reinitialisar le contrasigno de %{user} @@ -2268,8 +2265,8 @@ ia: title: Guida pro comenciantes description: Guida pro comenciantes, mantenite per le communitate. community: - title: Foro del communitate - description: Un sito commun de conversation sur OpenStreetMap. + title: Foro de assistentia e communitate + description: Un loco commun ubi cercar adjuta e conversar sur OpenStreetMap. mailing_lists: title: Listas de diffusion description: Pone un question o discute cosas interessante sur un varietate diff --git a/config/locales/id.yml b/config/locales/id.yml index c930a0a2b..c57c8c6f0 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -342,12 +342,6 @@ id: destroy: success: Akun Telah Dihapus. browse: - created: Dibuat - closed: Ditutup - created_ago_html: Dibuat %{time_ago} - closed_ago_html: Ditutup %{time_ago} - created_ago_by_html: Dibuat %{time_ago} oleh %{user} - closed_ago_by_html: Ditutup %{time_ago} oleh %{user} deleted_ago_by_html: Dihapus %{time_ago} oleh %{user} edited_ago_by_html: Disunting %{time_ago} oleh %{user} version: Versi @@ -363,23 +357,6 @@ id: view_history: Versi terdahulu view_details: Lihat Rincian location: 'Lokasi:' - changeset: - title: 'Set Perubahan: %{id}' - belongs_to: Pembuat - node: Simpul (%{count}) - node_paginated: Simpul (%{x}-%{y} dari %{count}) - way: Jalan (%{count}) - way_paginated: Jalan (%{x}-%{y} dari %{count}) - relation: Hubungan (%{count}) - relation_paginated: Hubungan (%{x}-%{y} dari %{count}) - hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago} - comment_by_html: Komentar dari %{user} %{time_ago} - changesetxml: Set Perubahan XML - osmchangexml: osmChange XML - join_discussion: Masuk untuk bergabung diskusi - discussion: Diskusi - still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan - telah ditutup. node: title_html: 'Simpul: %{name}' history_title_html: 'Riwayat Simpul: %{name}' @@ -494,6 +471,30 @@ id: feed: title: Set Perubahan %{id} title_comment: Set Perubahan %{id} - %{comment} + created: Dibuat + closed: Ditutup + belongs_to: Pembuat + show: + title: 'Set Perubahan: %{id}' + created_ago_html: Dibuat %{time_ago} + closed_ago_html: Ditutup %{time_ago} + created_ago_by_html: Dibuat %{time_ago} oleh %{user} + closed_ago_by_html: Ditutup %{time_ago} oleh %{user} + discussion: Diskusi + join_discussion: Masuk untuk bergabung diskusi + still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan + telah ditutup. + comment_by_html: Komentar dari %{user} %{time_ago} + hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago} + changesetxml: Set Perubahan XML + osmchangexml: osmChange XML + paging_nav: + nodes: Simpul (%{count}) + nodes_paginated: Simpul (%{x}-%{y} dari %{count}) + ways: Jalan (%{count}) + ways_paginated: Jalan (%{x}-%{y} dari %{count}) + relations: Hubungan (%{count}) + relations_paginated: Hubungan (%{x}-%{y} dari %{count}) timeout: sorry: Maaf, daftar kumpulan set perubahan yang Anda minta terlalu lama untuk diambil. @@ -1857,10 +1858,6 @@ id: help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang kata sandi Anda. - create: - notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan - agar Anda dapat segera mengatur ulang. - notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf. edit: title: Setel ulang kata sandi heading: Setel ulang kata sandi untuk %{user} diff --git a/config/locales/is.yml b/config/locales/is.yml index dc7dd7427..11cece8ee 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -330,12 +330,6 @@ is: destroy: success: Aðgangi eytt. browse: - created: Búið til - closed: Lokað - created_ago_html: Búið til %{time_ago} - closed_ago_html: Lokað %{time_ago} - created_ago_by_html: Búið til %{time_ago} af %{user} - closed_ago_by_html: Lokað %{time_ago} af %{user} deleted_ago_by_html: Eytt %{time_ago} af %{user} edited_ago_by_html: Breytt %{time_ago} af %{user} version: Útgáfa @@ -355,23 +349,6 @@ is: location: 'Staðsetning:' common_details: coordinates_html: '%{latitude}, %{longitude}' - changeset: - title: 'Breytingasett: %{id}' - belongs_to: Höfundur - node: Liðir (%{count}) - node_paginated: Liðir (%{x}-%{y} af %{count}) - way: Leiðir (%{count}) - way_paginated: Leiðir (%{x}-%{y} af %{count}) - relation: Vensl (%{count}) - relation_paginated: Vensl (%{x}-%{y} af %{count}) - hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago} - comment_by_html: Umsögn frá %{user} %{time_ago} - changesetxml: XML breytingasetts - osmchangexml: XML osmChange - join_discussion: Skráðu þig inn til að taka þátt í umræðunni - discussion: Umræða - still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu - hefur verið lokað. node: title_html: 'Liður: %{name}' history_title_html: 'Saga hnúts: %{name}' @@ -482,6 +459,30 @@ is: feed: title: Breytingasett %{id} title_comment: Breytingasett %{id} - %{comment} + created: Búið til + closed: Lokað + belongs_to: Höfundur + show: + title: 'Breytingasett: %{id}' + created_ago_html: Búið til %{time_ago} + closed_ago_html: Lokað %{time_ago} + created_ago_by_html: Búið til %{time_ago} af %{user} + closed_ago_by_html: Lokað %{time_ago} af %{user} + discussion: Umræða + join_discussion: Skráðu þig inn til að taka þátt í umræðunni + still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu + hefur verið lokað. + comment_by_html: Umsögn frá %{user} %{time_ago} + hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago} + changesetxml: XML breytingasetts + osmchangexml: XML osmChange + paging_nav: + nodes: Liðir (%{count}) + nodes_paginated: Liðir (%{x}-%{y} af %{count}) + ways: Leiðir (%{count}) + ways_paginated: Leiðir (%{x}-%{y} af %{count}) + relations: Vensl (%{count}) + relations_paginated: Vensl (%{x}-%{y} af %{count}) timeout: sorry: Því miður, það tók of langan tíma að ná í listann yfir þau breytingasett sem þú baðst um. @@ -1824,9 +1825,6 @@ is: new password button: Endurstilla lykilorð help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil á það sem þú getur notað til að breyta lykilorðinu þínu. - create: - notice email on way: Nýtt lykilorð er á leiðinni í innhólfið þitt. - notice email cannot find: Þetta netfang fannst ekki. edit: title: Endurstilla lykilorð heading: Endurstilla lykilorð fyrir %{user} diff --git a/config/locales/it.yml b/config/locales/it.yml index 712fbe1e5..8971883bc 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -26,6 +26,7 @@ # Author: Jlrb+ # Author: Kaitu # Author: Karika +# Author: LametinoWiki # Author: Lollo # Author: Lorelai87 # Author: Lorem Ipsum @@ -379,12 +380,6 @@ it: destroy: success: Account eliminato. browse: - created: Creato - closed: Chiuso - created_ago_html: Creato %{time_ago} - closed_ago_html: Chiuso %{time_ago} - created_ago_by_html: Creato %{time_ago} da %{user} - closed_ago_by_html: Chiuso %{time_ago} da %{user} deleted_ago_by_html: Cancellato %{time_ago} da %{user} edited_ago_by_html: Modificato %{time_ago} da %{user} version: Versione @@ -400,25 +395,9 @@ it: other: '%{count} percorsi' download_xml: Scarica XML view_history: Visualizza cronologia + view_unredacted_history: Visualizza la cronologia non oscurata view_details: Vedi dettagli location: 'Posizione:' - changeset: - title: 'Gruppo di modifiche: %{id}' - belongs_to: Autore - node: Nodi (%{count}) - node_paginated: Nodi (%{x}-%{y} di %{count}) - way: Percorsi (%{count}) - way_paginated: Percorsi (%{x}-%{y} di %{count}) - relation: Relazioni (%{count}) - relation_paginated: Relazioni (%{x}-%{y} di %{count}) - hidden_comment_by_html: Commento nascosto da %{user} %{time_ago} - comment_by_html: Commento da %{user} %{time_ago} - changesetxml: Gruppo di modifiche XML - osmchangexml: XML in formato osmChange - join_discussion: Accedi per unirti alla discussione - discussion: Discussione - still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno - disponibili quando verrà chiuso. node: title_html: 'Nodo: %{name}' history_title_html: 'Cronologia nodo: %{name}' @@ -528,6 +507,30 @@ it: feed: title: Gruppo di modifiche %{id} title_comment: Gruppo di modifiche %{id} - %{comment} + created: Creato + closed: Chiuso + belongs_to: Autore + show: + title: 'Gruppo di modifiche: %{id}' + created_ago_html: Creato %{time_ago} + closed_ago_html: Chiuso %{time_ago} + created_ago_by_html: Creato %{time_ago} da %{user} + closed_ago_by_html: Chiuso %{time_ago} da %{user} + discussion: Discussione + join_discussion: Accedi per unirti alla discussione + still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno + disponibili quando verrà chiuso. + comment_by_html: Commento da %{user} %{time_ago} + hidden_comment_by_html: Commento nascosto da %{user} %{time_ago} + changesetxml: Gruppo di modifiche XML + osmchangexml: XML in formato osmChange + paging_nav: + nodes: Nodi (%{count}) + nodes_paginated: Nodi (%{x}-%{y} di %{count}) + ways: Percorsi (%{count}) + ways_paginated: Percorsi (%{x}-%{y} di %{count}) + relations: Relazioni (%{count}) + relations_paginated: Relazioni (%{x}-%{y} di %{count}) timeout: sorry: Spiacenti, l'elenco dei gruppi di modifiche che hai richiesto ha impiegato troppo tempo per poter essere recuperato. @@ -1777,10 +1780,10 @@ it: %{url}. details_html: Ulteriori dettagli sul gruppo di modifiche possono essere trovati su %{url}. - unsubscribe: Per cancellarsi dagli aggiornamenti di questo insieme di modifiche, - visita %{url} e fai clic su "Cancellazione". - unsubscribe_html: Per cancellarsi dagli aggiornamenti di questo insieme di modifiche, - visita %{url} e fai clic su "Cancellazione". + unsubscribe: Puoi annullare l'iscrizione agli aggiornamenti di questo insieme + di modifiche su %{url}. + unsubscribe_html: Puoi annullare l'iscrizione agli aggiornamenti di questo insieme + di modifiche su %{url}. confirmations: confirm: heading: Controlla la tua e-mail! @@ -1899,11 +1902,6 @@ it: help_text: Inserire l'indirizzo email che si è utilizzato per l'iscrizione, a cui verrà inviato un collegamento che permetterà la reimpostazione della propria password. - create: - notice email on way: Siamo spiacenti che tu l'abbia persa :-( ma una email ti - è stata spedita in modo che tu la possa presto reimpostare. - notice email cannot find: Spiacenti, ma non è possibile trovare l'indirizzo - email. edit: title: Reimposta password heading: Reimposta password per %{user} diff --git a/config/locales/ja.yml b/config/locales/ja.yml index a0e69c09e..dfb3cc153 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -342,12 +342,6 @@ ja: destroy: success: アカウントを削除しました browse: - created: 作成 - closed: クローズ - created_ago_html: '%{time_ago} に作成' - closed_ago_html: '%{time_ago}に閉じられました' - created_ago_by_html: '%{user}が%{time_ago}に作成' - closed_ago_by_html: '%{user}が%{time_ago}に閉じました' deleted_ago_by_html: '%{user}が%{time_ago}に削除' edited_ago_by_html: '%{user}が%{time_ago}に編集' version: バージョン @@ -363,20 +357,6 @@ ja: view_history: 履歴を表示 view_details: 詳細を表示 location: '場所:' - changeset: - title: '変更セット: %{id}' - belongs_to: 著者 - node: ノード (%{count}) - node_paginated: ノード (%{x}-%{y} / %{count}) - way: ウェイ (%{count}件) - way_paginated: ウェイ (%{x}-%{y} / %{count}) - relation: リレーション (%{count}件) - relation_paginated: リレーション (%{x}-%{y} / %{count}) - changesetxml: 変更セット XML - osmchangexml: OSM 差分 XML - join_discussion: 議論に参加するにはログインしてください - discussion: 議論 - still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。 node: title_html: 'ノード: %{name}' history_title_html: 'ノード: %{name} の履歴' @@ -480,6 +460,29 @@ ja: feed: title: 変更セット %{id} title_comment: 変更セット %{id} - %{comment} + created: 作成 + closed: クローズ + belongs_to: 著者 + subscribe: + button: 議論に参加する + show: + title: '変更セット: %{id}' + created_ago_html: '%{time_ago} に作成' + closed_ago_html: '%{time_ago}に閉じられました' + created_ago_by_html: '%{user}が%{time_ago}に作成' + closed_ago_by_html: '%{user}が%{time_ago}に閉じました' + discussion: 議論 + join_discussion: 議論に参加するにはログインしてください + still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。 + changesetxml: 変更セット XML + osmchangexml: OSM 差分 XML + paging_nav: + nodes: ノード (%{count}) + nodes_paginated: ノード (%{x}-%{y} / %{count}) + ways: ウェイ (%{count}件) + ways_paginated: ウェイ (%{x}-%{y} / %{count}) + relations: リレーション (%{count}件) + relations_paginated: リレーション (%{x}-%{y} / %{count}) timeout: sorry: 申し訳ありませんが、要求した変更セットの一覧は時間がかかりすぎたため取得できませんでした。 changeset_comments: @@ -1711,9 +1714,6 @@ ja: email address: 'メールアドレス:' new password button: パスワードを再設定 help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。 - create: - notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。 - notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。 edit: title: パスワードの再設定 heading: '%{user} のパスワードのリセット' diff --git a/config/locales/ka.yml b/config/locales/ka.yml index baf9f28ed..a92fa8016 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -137,8 +137,6 @@ ka: link text: რა არის ეს? save changes button: ცვლილებების შენახვა browse: - created: შეიქმნა - closed: დახურულია version: ვერსია in_changeset: ცვლილებების პაკეტი anonymous: ანონიმი @@ -147,18 +145,6 @@ ka: view_history: ისტორიის ნახვა view_details: დეტალების ნახვა location: 'მდებარეობა:' - changeset: - title: 'ცვლილებების პაკეტი: %{id}' - belongs_to: ავტორი - node: წერტილები (%{count}) - node_paginated: წერტილები (%{x}-%{y} %{count}-დან) - way: ხაზები (%{count}) - way_paginated: ხაზები (%{x}-%{y} %{count}-დან) - relation: ურთიერთობები (%{count}) - relation_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან) - changesetxml: ცვლილებების პაკეტის XML - osmchangexml: osmChange XML - discussion: განხილვა node: title_html: 'წერტილი: %{name}' history_title_html: 'წერტილის ისტორია: %{name}' @@ -228,6 +214,21 @@ ka: feed: title: ცვლილებების პაკეტი %{id} title_comment: ცვლილებების პაკეტი %{id} - %{comment} + created: შეიქმნა + closed: დახურულია + belongs_to: ავტორი + show: + title: 'ცვლილებების პაკეტი: %{id}' + discussion: განხილვა + changesetxml: ცვლილებების პაკეტის XML + osmchangexml: osmChange XML + paging_nav: + nodes: წერტილები (%{count}) + nodes_paginated: წერტილები (%{x}-%{y} %{count}-დან) + ways: ხაზები (%{count}) + ways_paginated: ხაზები (%{x}-%{y} %{count}-დან) + relations: ურთიერთობები (%{count}) + relations_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან) changeset_comments: comment: commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user} diff --git a/config/locales/kab.yml b/config/locales/kab.yml index bde2c84e1..5182c2053 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -232,8 +232,6 @@ kab: update: success: Talɣut n useqdac tettwasnifel akken iwata browse: - created: Yettwarna - closed: Yemdel version: Lqem in_changeset: Agraw n usnifel anonymous: udrig @@ -243,21 +241,6 @@ kab: view_history: Sken amazray view_details: Wali talqayt location: 'Adig:' - changeset: - title: 'Agraw n usnifel: %{id}' - belongs_to: Ameskar - node: Tikerras (%{count}) - node_paginated: Tikerras (%{x}-%{y} si %{count}) - way: Iberdan (%{count}) - way_paginated: Iberdan (%{x}-%{y} si %{count}) - relation: Assaɣen (%{count}) - relation_paginated: Assaɣen (%{x}-%{y} si %{count}) - changesetxml: XML n ugraw n ibeddilen - osmchangexml: XML osmChange - join_discussion: Qqen akken ad tedduḍ ar usqerdec - discussion: Asqerdec - still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa - ttwamedlen. node: title_html: 'Takerrist: %{name}' history_title_html: 'Amazray n tkerrist: %{name}' @@ -356,6 +339,24 @@ kab: feed: title: Agraw n usnifel %{id} title_comment: Agraw n ubeddel %{id} - %{comment} + created: Yettwarna + closed: Yemdel + belongs_to: Ameskar + show: + title: 'Agraw n usnifel: %{id}' + discussion: Asqerdec + join_discussion: Qqen akken ad tedduḍ ar usqerdec + still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa + ttwamedlen. + changesetxml: XML n ugraw n ibeddilen + osmchangexml: XML osmChange + paging_nav: + nodes: Tikerras (%{count}) + nodes_paginated: Tikerras (%{x}-%{y} si %{count}) + ways: Iberdan (%{count}) + ways_paginated: Iberdan (%{x}-%{y} si %{count}) + relations: Assaɣen (%{count}) + relations_paginated: Assaɣen (%{x}-%{y} si %{count}) timeout: sorry: Suref-aɣ, tabdart n igrawen n usnifel i d-sutreḍ tettwai ddeqs n wakud akkena d d-ali. diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml index da3d4ddfc..388713462 100644 --- a/config/locales/kk-cyrl.yml +++ b/config/locales/kk-cyrl.yml @@ -228,7 +228,6 @@ kk-cyrl: destroy: success: Тіркелгі жойылды. browse: - closed: Жабық version: Нұсқа in_changeset: Өңдеме дестесі anonymous: аноним @@ -243,14 +242,6 @@ kk-cyrl: view_history: Тарихын көру view_details: Егжей-тегжейін көру location: 'Географиялық орны:' - changeset: - title: 'Өңдеме дестесі: %{id}' - node: Нүктелер (%{count}) - way: Сызықтар (%{count}) - relation: Қатынастар (%{count}) - changesetxml: Өңдеме дестесінің XML-і - osmchangexml: osmChange XML - discussion: Талқылау node: title_html: 'Нүкте: %{name}' history_title_html: 'Нүкте тарихы: %{name}' @@ -321,6 +312,16 @@ kk-cyrl: load_more: Көбірек жүктеу feed: title: Өңдеме дестесі %{id} + closed: Жабық + show: + title: 'Өңдеме дестесі: %{id}' + discussion: Талқылау + changesetxml: Өңдеме дестесінің XML-і + osmchangexml: osmChange XML + paging_nav: + nodes: Нүктелер (%{count}) + ways: Сызықтар (%{count}) + relations: Қатынастар (%{count}) changeset_comments: comment: commented_at_by_html: '%{when} %{user} жаңартқан' diff --git a/config/locales/km.yml b/config/locales/km.yml index 88cc6e7b8..0fcf1a91a 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -111,8 +111,6 @@ km: ដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក។ success: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។ browse: - created: បាន​បង្កើត​ - closed: បាន​បិទ version: កំណែ in_changeset: សំណុំបន្លាស់ប្ដូរ anonymous: អនាមិក @@ -122,18 +120,6 @@ km: view_history: មើល​ប្រវត្តិ​ view_details: មើលព័ត៌មានលម្អិត​ location: ទីតាំង​៖​ - changeset: - title: សំណុំបន្លាស់ប្ដូរ៖ %{id} - belongs_to: អ្នក​បង្កើត - node: ខ្នែងចំនួន (%{count}) - node_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) - way: ផ្លូវចំនួន (%{count}) - way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) - relation: ទំនាក់ទំនងចំនួន (%{count}) - relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) - changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML - join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា - discussion: ការពិភាក្សា node: title_html: ខ្នែង៖ %{name} history_title_html: ប្រវត្តិខ្នែង៖ %{name} @@ -206,6 +192,21 @@ km: feed: title: សំណុំបន្លាស់ប្ដូរ​ %{id} title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment} + created: បាន​បង្កើត​ + closed: បាន​បិទ + belongs_to: អ្នក​បង្កើត + show: + title: សំណុំបន្លាស់ប្ដូរ៖ %{id} + discussion: ការពិភាក្សា + join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា + changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML + paging_nav: + nodes: ខ្នែងចំនួន (%{count}) + nodes_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) + ways: ផ្លូវចំនួន (%{count}) + ways_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) + relations: ទំនាក់ទំនងចំនួន (%{count}) + relations_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) dashboards: contact: km away: ចម្ងាយ %{count} គ.ម. diff --git a/config/locales/kn.yml b/config/locales/kn.yml index af159d052..0a6378faf 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -218,8 +218,6 @@ kn: destroy: success: ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ. browse: - created: ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟ - closed: ಮುಚ್ಚಲಾಗಿದೆ version: ಆವೃತ್ತಿ in_changeset: ಬದಲಾವಣೆಗಳು anonymous: ಅನಾಮಧೇಯ @@ -229,17 +227,6 @@ kn: view_history: ಇತಿಹಾಸವನ್ನು ನೋಡಿ view_details: ವಿವರಣೆ ನೋಡಿ location: 'ಸ್ಥಳ:' - changeset: - title: 'ಬದಲಾವಣೆಗಳು: %{id}' - belongs_to: ಕರ್ತೃ - node: ನೋಡ್ಸ್ (%{count}) - node_paginated: ನೋಡ್ಸ್ (%{x}-%{y} ರ %{count}) - way: ರೀತಿಯಲ್ಲಿ (%{count}) - way_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count}) - relation: ಸಂಬಂಧಗಳು (%{count}) - relation_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count}) - join_discussion: ‍ಚರ್ಚೆಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿರಿ - discussion: ಚರ್ಚೆ node: title_html: 'ನೋಡ್: %{name}' history_title_html: 'ನೊಡ್ ನ ಇತಿಹಾಸ: %{name}' @@ -317,6 +304,20 @@ kn: feed: title: ಬದಲಾವಣೆಗಳು %{id} title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment} + created: ಸೃಷ್ಟಿಸಲ್ಪಟ್ಟ + closed: ಮುಚ್ಚಲಾಗಿದೆ + belongs_to: ಕರ್ತೃ + show: + title: 'ಬದಲಾವಣೆಗಳು: %{id}' + discussion: ಚರ್ಚೆ + join_discussion: ‍ಚರ್ಚೆಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿರಿ + paging_nav: + nodes: ನೋಡ್ಸ್ (%{count}) + nodes_paginated: ನೋಡ್ಸ್ (%{x}-%{y} ರ %{count}) + ways: ರೀತಿಯಲ್ಲಿ (%{count}) + ways_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count}) + relations: ಸಂಬಂಧಗಳು (%{count}) + relations_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count}) timeout: sorry: ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಬದಲಾವಣಾ ಪಟ್ಟಿ ಪಡೆಯಲು ದೀರ್ಘ ಸಮಯ ಬೇಕಾಯಿತು. changeset_comments: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 6e1f58c76..54ad2c481 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -323,12 +323,6 @@ ko: destroy: success: 계정이 삭제되었습니다. browse: - created: 만들어짐 - closed: 닫힘 - created_ago_html: '%{time_ago}에 생성됨' - closed_ago_html: '%{time_ago}에 닫힘' - created_ago_by_html: '%{time_ago}에 %{user}님이 생성함' - closed_ago_by_html: '%{time_ago}에 %{user}님이 닫음' deleted_ago_by_html: '%{time_ago}에 %{user}님이 삭제함' edited_ago_by_html: '%{time_ago}에 %{user}님이 편집함' version: 버전 @@ -344,22 +338,6 @@ ko: view_history: 역사 보기 view_details: 자세한 내용 보기 location: '위치:' - changeset: - title: '바뀜집합: %{id}' - belongs_to: 저자 - node: 교점(%{count}) - node_paginated: 교점(%{count}개 중 %{x}-%{y}) - way: 길(%{count}) - way_paginated: 길(%{count}개 중 %{x}-%{y}) - relation: 관계(%{count}) - relation_paginated: 관계(%{count}개 중 %{x}-%{y}) - hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견' - comment_by_html: '%{time_ago} %{user}님의 의견' - changesetxml: 바뀜집합 XML - osmchangexml: osmChange XML - join_discussion: 토론에 참여하려면 로그인하세요 - discussion: 토론 - still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다. node: title_html: '교점: %{name}' history_title_html: '교점 역사: %{name}' @@ -465,6 +443,30 @@ ko: feed: title: 바뀜집합 %{id} title_comment: 바뀜집합 %{id} - %{comment} + created: 만들어짐 + closed: 닫힘 + belongs_to: 저자 + show: + title: '바뀜집합: %{id}' + created: '생성 시기: %{when}' + created_ago_html: '%{time_ago}에 생성됨' + closed_ago_html: '%{time_ago}에 닫힘' + created_ago_by_html: '%{time_ago}에 %{user}님이 생성함' + closed_ago_by_html: '%{time_ago}에 %{user}님이 닫음' + discussion: 토론 + join_discussion: 토론에 참여하려면 로그인하세요 + still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다. + comment_by_html: '%{time_ago} %{user}님의 의견' + hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견' + changesetxml: 바뀜집합 XML + osmchangexml: osmChange XML + paging_nav: + nodes: 교점(%{count}) + nodes_paginated: 교점(%{count}개 중 %{x}-%{y}) + ways: 길(%{count}) + ways_paginated: 길(%{count}개 중 %{x}-%{y}) + relations: 관계(%{count}) + relations_paginated: 관계(%{count}개 중 %{x}-%{y}) timeout: sorry: 죄송합니다, 요청하는 바뀜집합 목록을 가져오는 데 너무 오래 걸렸습니다. changeset_comments: @@ -1714,9 +1716,6 @@ ko: email address: '이메일 주소:' new password button: 비밀번호 재설정 help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다. - create: - notice email on way: 비밀번호를 잊었다니, 안타깝습니다 :-( 비밀번호 재설정을 할 수 있도록 이메일이 발송되었습니다. - notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다. edit: title: 비밀번호 재설정 heading: '%{user}의 비밀번호 재설정' diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 45a4c5007..5eab4650a 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -317,8 +317,6 @@ ku-Latn: destroy: success: Hesab Hate Jêbirin. browse: - created: Hate çêkirin - closed: Hate girtin version: Guherto in_changeset: Qeyda Guhartinan anonymous: anonîm @@ -334,23 +332,6 @@ ku-Latn: view_history: Dîrokê Bibîne view_details: Detayan Bibîne location: 'Cih:' - changeset: - title: Desteya guhertinanː %{id} - belongs_to: Xwedî - node: Nuqte (%{count}) - node_paginated: Nuqte (%{x}-%{y} ji %{count} heban) - way: Rê (%{count}) - way_paginated: Rê (%{x}-%{y} ji %{count}) - relation: Eleqe (%{count}) - relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count}) - hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago} - comment_by_html: Şîroveya ji %{user} %{time_ago} - changesetxml: Desteya guhartinan a XML - osmchangexml: osmChange XML - join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve - discussion: Gotûbêj - still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan - hate girtin vebibe. node: title_html: 'Girêk: %{name}' history_title_html: Dîroka Nuqteyêː %{name} @@ -460,6 +441,26 @@ ku-Latn: feed: title: Desteya guhartinan %{id} title_comment: Desteya guhartinan %{id} - %{comment} + created: Hate çêkirin + closed: Hate girtin + belongs_to: Xwedî + show: + title: Desteya guhertinanː %{id} + discussion: Gotûbêj + join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve + still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan + hate girtin vebibe. + comment_by_html: Şîroveya ji %{user} %{time_ago} + hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago} + changesetxml: Desteya guhartinan a XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nuqte (%{count}) + nodes_paginated: Nuqte (%{x}-%{y} ji %{count} heban) + ways: Rê (%{count}) + ways_paginated: Rê (%{x}-%{y} ji %{count}) + relations: Eleqe (%{count}) + relations_paginated: Eleqe (%{x}-%{y} bi tevahî %{count}) timeout: sorry: Bibore, bidestxistina lîsteya desteyên guhartinan ê ku te xwest demeke dirêj girt. @@ -1793,10 +1794,6 @@ ku-Latn: new password button: Şîfreyê nû bike help_text: E-peyama ku te pê xwe qeydkiribû binivîse, em ê ji te re lînkek bişînin tu yê bi wê lînkê bikaribî şîfreya xwe nû bikî. - create: - notice email on way: Bibore, te wê wenda kir :-( lê belê e-peyamekî nû di rê - de ye. Lewma tu dikarî di nêz de wê nû bikî. - notice email cannot find: Bibore, ev adrêsa e-peyamê nehate dîtin. edit: title: Şîfreyê nû bike heading: Şîfreyê nû bike ji bo %{user} diff --git a/config/locales/lb.yml b/config/locales/lb.yml index a17ce9aab..d81af26d2 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -207,9 +207,6 @@ lb: x_years: one: virun %{count} Joer other: viru(n) %{count} Joer - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Standard (elo %{name}) id: @@ -312,8 +309,6 @@ lb: destroy: success: Benotzerkont geläscht. browse: - created: Ugeluecht - closed: Zou version: Versioun in_changeset: Set vun Ännerungen anonymous: anonym @@ -329,21 +324,6 @@ lb: view_history: Versioune weisen view_details: Detailer weisen location: 'Plaz:' - changeset: - title: 'Set vun Ännerungen: %{id}' - belongs_to: Auteur - node: Kniet (%{count}) - node_paginated: Kniet (%{x}–%{y} vu(n) %{count}) - way: Weeër (%{count}) - way_paginated: Weeër (%{x}–%{y} vu(n) %{count}) - relation: Relatiounen (%{count}) - relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count}) - changesetxml: XML mam Set vun Ännerungen - osmchangexml: osmChange XML - join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen - discussion: Diskussioun - still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal - wéi den Ännerungssaz zou ass. node: title_html: 'Knuet: %{name}' history_title_html: 'Versioune vum Knuet: %{name}' @@ -452,6 +432,24 @@ lb: feed: title: 'Set vun Ännerungen: %{id}' title_comment: Set vun Ännerungen %{id} - %{comment} + created: Ugeluecht + closed: Zou + belongs_to: Auteur + show: + title: 'Set vun Ännerungen: %{id}' + discussion: Diskussioun + join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen + still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal + wéi den Ännerungssaz zou ass. + changesetxml: XML mam Set vun Ännerungen + osmchangexml: osmChange XML + paging_nav: + nodes: Kniet (%{count}) + nodes_paginated: Kniet (%{x}–%{y} vu(n) %{count}) + ways: Weeër (%{count}) + ways_paginated: Weeër (%{x}–%{y} vu(n) %{count}) + relations: Relatiounen (%{count}) + relations_paginated: Relatiounen (%{x}-%{y} vu(n) %{count}) timeout: sorry: Et leider ze laang gedauert, déi ugefuerdert Ännerungssätz ofzeruffen. changeset_comments: @@ -1656,10 +1654,10 @@ lb: details: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt ginn. details_html: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt ginn. - unsubscribe: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, besich - %{url} a klick op „Ofmellen“. - unsubscribe_html: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, - besich %{url} a klick op „Ofmellen“. + unsubscribe: Dir kënnt d'Aktualiséierungen un dësem Ännerungssaz ënner %{url} + ofbestellen. + unsubscribe_html: Dir kënnt d'Aktualiséierungen un dësem Ännerungssaz ënner + %{url} ofbestellen. confirmations: confirm: heading: Iwwerpréift Är E-Mail! @@ -1767,10 +1765,6 @@ lb: help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze kanns. - create: - notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert - gouf un dech versent. - notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon. edit: title: Passwuert zrécksetzen heading: Passwuert fir %{user} zrécksetzen diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 7c569cd16..e9e07104a 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -366,12 +366,6 @@ lt: destroy: success: Paskyra ištrinta. browse: - created: Sukurtas - closed: Uždarytas - created_ago_html: Sukurta %{time_ago} - closed_ago_html: Uždaryta %{time_ago} - created_ago_by_html: Sukurta %{user} %{time_ago} - closed_ago_by_html: Uždaryta %{user} %{time_ago} deleted_ago_by_html: Ištrinta %{user} %{time_ago} edited_ago_by_html: Redaguota %{user} %{time_ago} version: Versija @@ -393,23 +387,6 @@ lt: view_history: Žiūrėti istoriją view_details: Žiūrėti detales location: 'Vieta:' - changeset: - title: 'Pakeitimas: %{id}' - belongs_to: Autorius - node: Taškų (%{count}) - node_paginated: Taškų (%{x}-%{y} iš %{count}) - way: Keliai (%{count}) - way_paginated: Keliai (%{x}-%{y} iš %{count}) - relation: Ryšiai (%{count}) - relation_paginated: Ryšiai (%{x}-%{y} iš %{count}) - hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago} - comment_by_html: Komentaras nuo %{user} %{time_ago} - changesetxml: Pakeitimo XML - osmchangexml: osmChange XML - join_discussion: Prisijunkite norėdami dalyvauti aptarime - discussion: Diskusija - still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius - pakeitimą. node: title_html: 'Taškas: %{name}' history_title_html: 'Taško istorija: %{name}' @@ -525,6 +502,30 @@ lt: feed: title: Pakeitimas %{id} title_comment: Pakeitimas %{id} - %{comment} + created: Sukurtas + closed: Uždarytas + belongs_to: Autorius + show: + title: 'Pakeitimas: %{id}' + created_ago_html: Sukurta %{time_ago} + closed_ago_html: Uždaryta %{time_ago} + created_ago_by_html: Sukurta %{user} %{time_ago} + closed_ago_by_html: Uždaryta %{user} %{time_ago} + discussion: Diskusija + join_discussion: Prisijunkite norėdami dalyvauti aptarime + still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius + pakeitimą. + comment_by_html: Komentaras nuo %{user} %{time_ago} + hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago} + changesetxml: Pakeitimo XML + osmchangexml: osmChange XML + paging_nav: + nodes: Taškų (%{count}) + nodes_paginated: Taškų (%{x}-%{y} iš %{count}) + ways: Keliai (%{count}) + ways_paginated: Keliai (%{x}-%{y} iš %{count}) + relations: Ryšiai (%{count}) + relations_paginated: Ryšiai (%{x}-%{y} iš %{count}) timeout: sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai. changeset_comments: @@ -1832,10 +1833,6 @@ lt: help_text: Įveskite elektroninio pašto adresą, kurį naudojote užsiregistruodami. Mes atsiųsime nuorodą į elektroninį paštą, kurią galėsite naudoti norėdami iš naujo nustatyti slaptažodį. - create: - notice email on way: Apgailestaujame, kad praradote slaptažodį :-( bet elektroninis - laiškas jau išsiųstas, tad greitai slaptažodį atstatysite. - notice email cannot find: Gaila, bet toks e-pašto adresas nerastas. edit: title: Iš naujo nustatyti slaptažodį heading: Iš naujo nustatyti naudotojo %{user} slaptažodį diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 7dfbe95f7..7731a84f5 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -250,10 +250,6 @@ lv: destroy: success: Konts dzēsts. browse: - created: Izveidots - closed: Aizvērts - created_ago_html: Izveidots %{time_ago} - closed_ago_html: Slēgts %{time_ago} version: Versija in_changeset: Izmaiņu kopa anonymous: anonīms @@ -267,19 +263,6 @@ lv: view_history: Skatīt vēsturi view_details: Skatīt detaļas location: 'Atrašanās vieta:' - changeset: - title: 'Izmaiņu kopa: %{id}' - belongs_to: Autors - node: Punkti (%{count}) - node_paginated: Punkti (%{x}-%{y} no %{count}) - way: Ceļi (%{count}) - way_paginated: Ceļi (%{x}-%{y} no %{count}) - relation: Relācijas (%{count}) - relation_paginated: Relācijas (%{x}-%{y} no %{count}) - changesetxml: Izmaiņu kopas XML - osmchangexml: osmChange XML - join_discussion: Ieejiet sistēmā lai pievienotos diskusijai - discussion: Diskusija node: title_html: 'Punkts: %{name}' history_title_html: 'Punkta vēsture: %{name}' @@ -375,6 +358,24 @@ lv: feed: title: Izmaiņu kopa %{id} title_comment: Izmaiņu kopa %{id} - %{comment} + created: Izveidots + closed: Aizvērts + belongs_to: Autors + show: + title: 'Izmaiņu kopa: %{id}' + created_ago_html: Izveidots %{time_ago} + closed_ago_html: Slēgts %{time_ago} + discussion: Diskusija + join_discussion: Ieejiet sistēmā lai pievienotos diskusijai + changesetxml: Izmaiņu kopas XML + osmchangexml: osmChange XML + paging_nav: + nodes: Punkti (%{count}) + nodes_paginated: Punkti (%{x}-%{y} no %{count}) + ways: Ceļi (%{count}) + ways_paginated: Ceļi (%{x}-%{y} no %{count}) + relations: Relācijas (%{count}) + relations_paginated: Relācijas (%{x}-%{y} no %{count}) timeout: sorry: Atvainojiet, jūsu pieprasīto izmaiņu kopu ielāde prasīja pārāk daudz laika. @@ -1413,10 +1414,6 @@ lv: new password button: Atiestatīt paroli help_text: Ievadiet e-pasta adresi, kuru izmantojāt, lai reģistrētos, mēs Jums nosūtīsim saiti uz to, lai Jūs varētu atjaunot savu paroli. - create: - notice email on way: Atvaino, tu to pazaudēji :-( , bet e-pasts jau ir ceļā, - lai tu viņu drīz varētu atjaunot. - notice email cannot find: Atvaino, nevaru atrast šo epasta adresi. edit: title: Atiestatīt paroli heading: Atcelt %{user} paroli diff --git a/config/locales/mk.yml b/config/locales/mk.yml index a846672a5..c189e2297 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -209,9 +209,6 @@ mk: x_years: one: пред %{count} година other: пред %{count} години - printable_name: - version: вер. %{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: По основно (моментално %{name}) id: @@ -323,15 +320,10 @@ mk: destroy: success: Сметката е избришана. browse: - created: Создадено - closed: Затворено - created_ago_html: Создадено %{time_ago} - closed_ago_html: Затворено %{time_ago} - created_ago_by_html: Создадено %{time_ago} од %{user} - closed_ago_by_html: Затворено %{time_ago} од %{user} deleted_ago_by_html: Избришано %{time_ago} од %{user} edited_ago_by_html: Изменето %{time_ago} од %{user} version: Верзија + redacted_version: Исправена верзија in_changeset: Измени anonymous: анонимец no_comment: (нема коментари) @@ -344,25 +336,11 @@ mk: other: '%{count} патишта' download_xml: Преземи XML view_history: Погл. историја + view_unredacted_history: Погл. неизменета историја view_details: Погл. подробности + view_redacted_data: Погл. исправена верзија + view_redaction_message: Погл. порака за измената location: 'Местоположба:' - changeset: - title: 'Измена: %{id}' - belongs_to: Автор - node: Јазли (%{count}) - node_paginated: Јазли (%{x}-%{y} од вкупно %{count}) - way: Патишта (%{count}) - way_paginated: Патишта (%{x}-%{y} од вкупно %{count}) - relation: Односи (%{count}) - relation_paginated: Односи (%{x}-%{y} од вкупно %{count}) - hidden_comment_by_html: Скриен коментар од %{user} %{time_ago} - comment_by_html: Коментар од %{user} %{time_ago} - changesetxml: XML за измените - osmchangexml: osmChange XML - join_discussion: Најавете се за да се приклучите во разговорот - discussion: Разговор - still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се - затворат измените. node: title_html: 'Јазол: %{name}' history_title_html: 'Историја на јазолот: %{name}' @@ -479,6 +457,46 @@ mk: feed: title: Измени %{id} title_comment: Измени %{id} - %{comment} + created: Создадено + closed: Затворено + belongs_to: Автор + subscribe: + heading: Да ве претплатам на слединов разговор за измени? + button: Претплати се на разговорот + unsubscribe: + heading: Да ве отпишам од претплатата на следниов разговор за измени? + button: Отпиши се од разговорот + heading: + title: Измени %{id} + created_by_html: Создадено од %{link_user} на %{created}. + no_such_entry: + title: Нема такви измени + heading: 'Нема ставка со назнаката: %{id}' + body: Жалиме, но не постојат измени со назнаката %{id}. Проверете да не сте + згрешиле во пишувањето, или пак да не сте стиснале на погрешна врска. + show: + title: 'Измена: %{id}' + created: 'Создадено: %{when}' + closed: 'Затворено: %{when}' + created_ago_html: Создадено %{time_ago} + closed_ago_html: Затворено %{time_ago} + created_ago_by_html: Создадено %{time_ago} од %{user} + closed_ago_by_html: Затворено %{time_ago} од %{user} + discussion: Разговор + join_discussion: Најавете се за да се приклучите во разговорот + still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се + затворат измените. + comment_by_html: Коментар од %{user} %{time_ago} + hidden_comment_by_html: Скриен коментар од %{user} %{time_ago} + changesetxml: XML за измените + osmchangexml: osmChange XML + paging_nav: + nodes: Јазли (%{count}) + nodes_paginated: Јазли (%{x}-%{y} од вкупно %{count}) + ways: Патишта (%{count}) + ways_paginated: Патишта (%{x}-%{y} од вкупно %{count}) + relations: Односи (%{count}) + relations_paginated: Односи (%{x}-%{y} од вкупно %{count}) timeout: sorry: За жал, на списокот на промени што го побаравте му требаше предолго за да се добие. @@ -1599,6 +1617,7 @@ mk: more: Повеќе user_mailer: diary_comment_notification: + description: Дневничка ставка бр. %{id} во OpenStreetMap subject: '[OpenStreetMap] %{user} коментираше на дневничка ставка' hi: Здраво %{to_user}, header: '%{from_user} коментираше на дневничката ставка на OpenStreetMap со @@ -1673,6 +1692,7 @@ mk: click_the_link: Ако ова сте вие, стиснете на врската подолу за да си ја смените лозинката. note_comment_notification: + description: Белешка бр. %{id} во OpenStreetMap anonymous: Анонимен корисник greeting: Здраво, commented: @@ -1711,6 +1731,7 @@ mk: details: Поподробно за белешката на %{url}. details_html: Поподробно за белешката на %{url}. changeset_comment_notification: + description: Измени бр. %{id} во OpenStreetMap hi: Здраво %{to_user}, greeting: Здраво, commented: @@ -1729,10 +1750,8 @@ mk: partial_changeset_without_comment: без коментар details: Поподробно за промената на %{url}. details_html: Поподробно за промената на %{url}. - unsubscribe: За да се отпишете од подновите на овие промени, посетете ја страницата - %{url} и стиснете на „Отпиши се“. - unsubscribe_html: За да се отпишете од подновите на овие промени, посетете ја - страницата %{url} и стиснете на „Отпиши се“. + unsubscribe: Можете да се отпишете од подновите за овие измени на %{url}. + unsubscribe_html: Можете да се отпишете од подновите за овие измени на %{url}. confirmations: confirm: heading: Проверете си ја е-поштата @@ -1851,9 +1870,8 @@ mk: help_text: Внесете ја е-поштенската адреса со која се зачленивте, и ќе ви пратиме врска каде ќе наведете нова лозинка. create: - notice email on way: Жалиме, ова истече :-( но ви пративме нова порака на е-пошта, - па наскоро повторно ќе можете да ја смените. - notice email cannot find: Жалам, не можев да ја пронајдам таа адреса + send_paranoid_instructions: Ако вашата е-пошта е веќе заведена во нашата база, + за неколку минути на неа ќе добиете напатствија за лозинката. edit: title: Смени лозинка heading: Смени лозинка за %{user} diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 0588febb3..8fbfe9017 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -93,8 +93,6 @@ mo: go_public: heading: 'Редактаря публикэ:' browse: - created: Креат - closed: Ынкис version: Версиуне anonymous: аноним no_comment: (фэрэ коментариу) @@ -103,16 +101,6 @@ mo: view_history: Екзаминаря историкулуй view_details: Май деталият location: 'Ситуаре:' - changeset: - belongs_to: Аутор - node: Пункте (%{count}) - node_paginated: Пункте (%{x}-%{y} дин %{count}) - way: Кэй (%{count}) - way_paginated: Кэй (%{x}-%{y} дин %{count}) - relation: Релаций (%{count}) - relation_paginated: Релаций (%{x}-%{y} дин %{count}) - join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией - discussion: Дискуцие node: title_html: 'Пункт: %{name}' way: @@ -156,6 +144,21 @@ mo: changesets: user: Утилизатор comment: Коментариу + index: + feed: + created: Креат + closed: Ынкис + belongs_to: Аутор + show: + discussion: Дискуцие + join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией + paging_nav: + nodes: Пункте (%{count}) + nodes_paginated: Пункте (%{x}-%{y} дин %{count}) + ways: Кэй (%{count}) + ways_paginated: Кэй (%{x}-%{y} дин %{count}) + relations: Релаций (%{count}) + relations_paginated: Релаций (%{x}-%{y} дин %{count}) dashboards: show: my friends: Приетений мей diff --git a/config/locales/mr.yml b/config/locales/mr.yml index f5d0fcc0e..b7ef14752 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -194,8 +194,6 @@ mr: link text: हे काय आहे? save changes button: बदल जतन करा browse: - created: बनविले - closed: बंद केले version: आवृत्ती in_changeset: बदलसंच anonymous: अनामिक @@ -211,18 +209,6 @@ mr: view_history: इतिहास पहा view_details: तपशील पहा location: 'ठिकाण:' - changeset: - title: 'बदलसंच: %{id}' - belongs_to: लेखक - node: गाठी (%{count}) - node_paginated: गाठी (%{x}-%{y}, %{count} पैकी) - way: मार्ग (%{count}) - way_paginated: मार्ग (%{x}-%{y}, %{count} पैकी) - relation: संबंध (%{count}) - relation_paginated: संबंध (%{x}-%{y}, %{count} पैकी) - changesetxml: बदलसंच XML - osmchangexml: osmChange XML - join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा node: title_html: 'गाठ: %{name}' history_title_html: 'गाठीचा इतिहास: %{name}' @@ -311,6 +297,21 @@ mr: feed: title: बदलसंच %{id} title_comment: बदलसंच %{id} - %{comment} + created: बनविले + closed: बंद केले + belongs_to: लेखक + show: + title: 'बदलसंच: %{id}' + join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा + changesetxml: बदलसंच XML + osmchangexml: osmChange XML + paging_nav: + nodes: गाठी (%{count}) + nodes_paginated: गाठी (%{x}-%{y}, %{count} पैकी) + ways: मार्ग (%{count}) + ways_paginated: मार्ग (%{x}-%{y}, %{count} पैकी) + relations: संबंध (%{count}) + relations_paginated: संबंध (%{x}-%{y}, %{count} पैकी) timeout: sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला. changeset_comments: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 7f6054720..a512e9ba6 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -270,8 +270,6 @@ ms: destroy: success: Akaun Terhapus. browse: - created: Tercipta - closed: Tertutup version: Versi in_changeset: Set Ubah anonymous: awanama @@ -281,19 +279,6 @@ ms: view_history: Lihat Sejarah view_details: Lihat Butiran location: 'Lokasi:' - changeset: - title: 'Set Ubah: %{id}' - belongs_to: Pengarang - node: Nod (%{count}) - node_paginated: Nod (%{x}-%{y} / %{count}) - way: Jalan (%{count}) - way_paginated: Jalan (%{x}-%{y} / %{count}) - relation: Hubungan (%{count}) - relation_paginated: Hubungan (%{x}-%{y} / %{count}) - changesetxml: XML Set Ubah - osmchangexml: XML osmChange - join_discussion: Daftar masuk untuk perbincangan - discussion: Perbincangan node: title_html: 'Nod: %{name}' history_title_html: 'Sejarah Nod: %{name}' @@ -392,6 +377,22 @@ ms: feed: title: Set Ubah %{id} title_comment: Set Ubah %{id} - %{comment} + created: Tercipta + closed: Tertutup + belongs_to: Pengarang + show: + title: 'Set Ubah: %{id}' + discussion: Perbincangan + join_discussion: Daftar masuk untuk perbincangan + changesetxml: XML Set Ubah + osmchangexml: XML osmChange + paging_nav: + nodes: Nod (%{count}) + nodes_paginated: Nod (%{x}-%{y} / %{count}) + ways: Jalan (%{count}) + ways_paginated: Jalan (%{x}-%{y} / %{count}) + relations: Hubungan (%{count}) + relations_paginated: Hubungan (%{x}-%{y} / %{count}) timeout: sorry: Maaf, senarai set perubahan yang anda minta mengambil masa yang terlalu lama untuk diambil. @@ -1399,11 +1400,6 @@ ms: new password button: Set semula kata laluan help_text: Isikan alamat e-mel yang anda gunakan untuk mendaftar. Kami akan menge-melkan pautan untuk anda mengeset semula kata laluan anda. - create: - notice email on way: Kesiannya anda sudah terlupa kata laluan :-( tetapi kami - akan menghantar satu pesanan e-mel untuk anda mengesetnya semula tidak lama - lagi. - notice email cannot find: Maaf, alamat e-mel itu tidak dapat dijumpai. edit: title: Set semula kata laluan heading: Set Semula Kata Laluan untuk %{user} diff --git a/config/locales/my.yml b/config/locales/my.yml index 3cd4ae52b..1af177af9 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -136,18 +136,12 @@ my: current email address: လက်ရှိ အီးမေးလ်လိပ်စာ save changes button: ပြောင်းလဲမှုများကို သိမ်းရန် browse: - created: ဖန်တီးလိုက်သည် - closed: ပိတ်လိုက်သည် version: ဗားရှင်း anonymous: အမည်မသိ no_comment: (မှတ်ချက် မရှိ) view_history: ရာဇဝင်ကြည့်ရန် view_details: အသေးစိပ် ကြည့်ရန် location: 'တည်နေရာ:' - changeset: - belongs_to: စာရေးသူ - join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ - discussion: ဆွေးနွေးချက် relation: members: အဖွဲ့ဝင်များ not_found: @@ -178,6 +172,13 @@ my: area: ဧရိယာ index: load_more: ပိုမိုခေါ်ယူရန် + feed: + created: ဖန်တီးလိုက်သည် + closed: ပိတ်လိုက်သည် + belongs_to: စာရေးသူ + show: + discussion: ဆွေးနွေးချက် + join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ changeset_comments: comment: commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်' diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 2ddd305c0..3021bf65d 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -317,8 +317,6 @@ nb: destroy: success: Kontoen er slettet. browse: - created: Opprettet - closed: Lukket version: Versjon in_changeset: Endringssett anonymous: anonym @@ -334,21 +332,6 @@ nb: view_history: Vis historikk view_details: Vis detaljer location: 'Posisjon:' - changeset: - title: 'Endringssett: %{id}' - belongs_to: Forfatter - node: Noder (%{count}) - node_paginated: Noder (%{x}-%{y} av %{count}) - way: Strekninger (%{count}) - way_paginated: Strekninger (%{x}-%{y} av %{count}) - relation: Forbindelser (%{count}) - relation_paginated: Forbindelser (%{x}-%{y} av %{count}) - changesetxml: XML for endringssett - osmchangexml: osmChange-XML - join_discussion: Logg inn for å delta i diskusjonen - discussion: Diskusjon - still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet - er lukket. node: title_html: 'Node: %{name}' history_title_html: 'Node-historikk: %{name}' @@ -452,8 +435,26 @@ nb: feed: title: Endringssett %{id} title_comment: 'Endringsforløp: %{id} - %{comment}' + created: Opprettet + closed: Lukket + belongs_to: Forfatter no_such_entry: heading: 'Ingen oppføring med ID-en: %{id}' + show: + title: 'Endringssett: %{id}' + discussion: Diskusjon + join_discussion: Logg inn for å delta i diskusjonen + still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet + er lukket. + changesetxml: XML for endringssett + osmchangexml: osmChange-XML + paging_nav: + nodes: Noder (%{count}) + nodes_paginated: Noder (%{x}-%{y} av %{count}) + ways: Strekninger (%{count}) + ways_paginated: Strekninger (%{x}-%{y} av %{count}) + relations: Forbindelser (%{count}) + relations_paginated: Forbindelser (%{x}-%{y} av %{count}) timeout: sorry: Listen over endringssett du ba om tok for lang tid å hente. changeset_comments: @@ -1608,10 +1609,6 @@ nb: new password button: Nullstill passord help_text: Skriv inn e-postadressen du brukte for å registrere deg, og vi vil sende deg ei lenke som du kan bruke til å nullstille passordet ditt. - create: - notice email on way: Synd at du mistet det, men en e-post er på vei slik at - du kan tilbakestille det snart. - notice email cannot find: Klarte ikke finne den e-postadressen. Beklager. edit: title: Nullstill passord heading: Nullstill passord for %{user} diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 79f9b8674..5f7004ab2 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -150,8 +150,6 @@ ne: Check your email for a note to confirm your new email address. success: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो। browse: - created: सृजना गरिएको - closed: समापन भएको version: संस्करण in_changeset: परिवर्नहरू anonymous: अज्ञात @@ -161,19 +159,6 @@ ne: view_history: इतिहास हेर्नुहोस् view_details: बिस्तृतमा हेर्नुहोस् location: 'स्थान:' - changeset: - title: 'परिवर्तनहरू: %{id}' - belongs_to: रचयिता - node: अंशहरू (%{count}) - node_paginated: अंशहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) - way: बाटोहरू (%{count}) - way_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) - relation: सम्बन्धहरू (%{count}) - relation_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) - changesetxml: चेन्जसेट XML - osmchangexml: osmChange XML - join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस् - discussion: छलफल node: title_html: 'अंश: %{name}' history_title_html: 'अंशको इतिहास: %{name}' @@ -271,6 +256,22 @@ ne: feed: title: 'परिवर्तनहरू: %{id}' title_comment: परिवर्तनहरू %{id} - %{comment} + created: सृजना गरिएको + closed: समापन भएको + belongs_to: रचयिता + show: + title: 'परिवर्तनहरू: %{id}' + discussion: छलफल + join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस् + changesetxml: चेन्जसेट XML + osmchangexml: osmChange XML + paging_nav: + nodes: अंशहरू (%{count}) + nodes_paginated: अंशहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) + ways: बाटोहरू (%{count}) + ways_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) + relations: सम्बन्धहरू (%{count}) + relations_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) timeout: sorry: माफ गर्नुहोला, तपाईंले खोज्नुभएको परिवर्तनहरूको सूची प्राप्त गर्न निकै समय लाग्यो । diff --git a/config/locales/nl.yml b/config/locales/nl.yml index fdfb6a8ef..e9ac68cce 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -379,12 +379,6 @@ nl: destroy: success: Account verwijderd. browse: - created: Aangemaakt - closed: Gesloten - created_ago_html: Gemaakt %{time_ago} - closed_ago_html: Gesloten %{time_ago} - created_ago_by_html: '%{time_ago} gemaakt door %{user}' - closed_ago_by_html: '%{time_ago} gesloten door %{user}' deleted_ago_by_html: '%{time_ago} verwijderd door %{user}' edited_ago_by_html: '%{time_ago} bewerkt door %{user}' version: Versie @@ -402,23 +396,6 @@ nl: view_history: Geschiedenis weergeven view_details: Details weergeven location: 'Locatie:' - changeset: - title: 'Wijzigingenset: %{id}' - belongs_to: Auteur - node: Knooppunten (%{count}) - node_paginated: Knooppunten (%{x}-%{y} van %{count}) - way: Wegen (%{count}) - way_paginated: Wegen (%{x}-%{y} van %{count}) - relation: Relaties (%{count}) - relation_paginated: Relaties (%{x}-%{y} van %{count}) - hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago} - comment_by_html: Reactie van %{user}, %{time_ago} - changesetxml: Wijzigingenset-XML - osmchangexml: osmChange-XML - join_discussion: Meld u aan om mee te praten - discussion: Overleg - still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset - wordt afgesloten. node: title_html: 'Knooppunt: %{name}' history_title_html: 'Knooppuntgeschiedenis: %{name}' @@ -538,6 +515,30 @@ nl: feed: title: Wijzigingenset %{id} title_comment: Wijzigingenset %{id} - %{comment} + created: Aangemaakt + closed: Gesloten + belongs_to: Auteur + show: + title: 'Wijzigingenset: %{id}' + created_ago_html: Gemaakt %{time_ago} + closed_ago_html: Gesloten %{time_ago} + created_ago_by_html: '%{time_ago} gemaakt door %{user}' + closed_ago_by_html: '%{time_ago} gesloten door %{user}' + discussion: Overleg + join_discussion: Meld u aan om mee te praten + still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset + wordt afgesloten. + comment_by_html: Reactie van %{user}, %{time_ago} + hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago} + changesetxml: Wijzigingenset-XML + osmchangexml: osmChange-XML + paging_nav: + nodes: Knooppunten (%{count}) + nodes_paginated: Knooppunten (%{x}-%{y} van %{count}) + ways: Wegen (%{count}) + ways_paginated: Wegen (%{x}-%{y} van %{count}) + relations: Relaties (%{count}) + relations_paginated: Relaties (%{x}-%{y} van %{count}) timeout: sorry: Het oproepen van de lijst met wijzigingensets die u hebt opgevraagd duurde te lang. @@ -1901,10 +1902,6 @@ nl: help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie. We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw in te stellen. - create: - notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is - een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen. - notice email cannot find: Dat e-mailadres kon helaas niet worden gevonden. edit: title: Wachtwoord opnieuw instellen heading: Wachtwoord voor %{user} opnieuw instellen diff --git a/config/locales/nn.yml b/config/locales/nn.yml index ef6732bec..f620fd5e0 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -296,12 +296,6 @@ nn: destroy: success: Kontoen er sletta. browse: - created: Oppretta - closed: Attlaten - created_ago_html: Oppretta %{time_ago} - closed_ago_html: Lukka %{time_ago} - created_ago_by_html: Oppretta %{time_ago} av %{user} - closed_ago_by_html: Lukka %{time_ago} av %{user} deleted_ago_by_html: Sletta %{time_ago} av %{user} edited_ago_by_html: Redigert %{time_ago} av %{user} version: 'Versjon:' @@ -319,23 +313,6 @@ nn: view_history: Vis historikk view_details: Vis detaljar location: 'Plassering:' - changeset: - title: Endringssett %{id} - belongs_to: Skapar - node: Punkt (%{count}) - node_paginated: Punkt (%{x}-%{y} av %{count}) - way: Strekningar (%{count}) - way_paginated: Strekningar (%{x}-%{y} av %{count}) - relation: Samhøve (%{count}) - relation_paginated: Samhøve (%{x}–%{y} av %{count}) - hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago} - comment_by_html: Kommentar frå %{user} %{time_ago} - changesetxml: XML for endringssett - osmchangexml: osmChange XML - join_discussion: Logg inn for å vere med i diskusjonen - discussion: Ordskifte - still_open: Endringssettet er framleis ope – det vert opna for diskusjon når - endringssettet vert lukka. node: title_html: 'Punkt: %{name}' history_title_html: 'Punkthistorikk: %{name}' @@ -442,6 +419,30 @@ nn: feed: title: Endringssett %{id} title_comment: 'Endringssett: %{id} - %{comment}' + created: Oppretta + closed: Attlaten + belongs_to: Skapar + show: + title: Endringssett %{id} + created_ago_html: Oppretta %{time_ago} + closed_ago_html: Lukka %{time_ago} + created_ago_by_html: Oppretta %{time_ago} av %{user} + closed_ago_by_html: Lukka %{time_ago} av %{user} + discussion: Ordskifte + join_discussion: Logg inn for å vere med i diskusjonen + still_open: Endringssettet er framleis ope – det vert opna for diskusjon når + endringssettet vert lukka. + comment_by_html: Kommentar frå %{user} %{time_ago} + hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago} + changesetxml: XML for endringssett + osmchangexml: osmChange XML + paging_nav: + nodes: Punkt (%{count}) + nodes_paginated: Punkt (%{x}-%{y} av %{count}) + ways: Strekningar (%{count}) + ways_paginated: Strekningar (%{x}-%{y} av %{count}) + relations: Samhøve (%{count}) + relations_paginated: Samhøve (%{x}–%{y} av %{count}) timeout: sorry: Lista over endringssett du ba om tok for lang tid å hente. changeset_comments: @@ -1726,10 +1727,6 @@ nn: new password button: Nullstill passord help_text: Skriv inn e-postadressa du brukte for å registrere deg, og me vil sende deg ei lenkje som du kan bruke til å nullstille passordet ditt. - create: - notice email on way: Synd at du mista det, men ein e-post er på veg slik at - du kan tilbakestille det snart. - notice email cannot find: Klarte ikkje finne den e-postadressa. Beklagar. edit: title: Nullstill passord heading: Nullstill passord for %{user} diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index e9ed1945f..b4a863563 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -278,12 +278,6 @@ nqo: destroy: success: ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߖߏ߰ߛߌ߫. browse: - created: ߛߌ߲ߘߌߣߍ߲ - closed: ߘߊߕߎ߲߯ߣߍ߲ - created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} - closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago} - created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫ - closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫ deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫ edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫ version: ߦߌߟߡߊ @@ -295,23 +289,6 @@ nqo: view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫ view_details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫ location: ߘߌ߲߬ߞߌߙߊ - changeset: - title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}' - belongs_to: ߛߓߍߦߟߊ - node: ߥߎߙߋ߲ߛߋ߲ %{count} - node_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count} - way: ߛߌߟߊ (%{count}) - way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count}) - relation: ߕߍߓߊ߯ߦߊ (%{count}) - relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count}) - hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫ - comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬ - changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ - osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML - join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫ - discussion: ߘߊߘߐߖߊߥߏ - still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ - ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫. node: title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}' history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}' @@ -409,6 +386,30 @@ nqo: feed: title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment} + created: ߛߌ߲ߘߌߣߍ߲ + closed: ߘߊߕߎ߲߯ߣߍ߲ + belongs_to: ߛߓߍߦߟߊ + show: + title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}' + created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} + closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago} + created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫ + closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫ + discussion: ߘߊߘߐߖߊߥߏ + join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫ + still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ + ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫. + comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬ + hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫ + changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ + osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML + paging_nav: + nodes: ߥߎߙߋ߲ߛߋ߲ %{count} + nodes_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count} + ways: ߛߌߟߊ (%{count}) + ways_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count}) + relations: ߕߍߓߊ߯ߦߊ (%{count}) + relations_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count}) timeout: sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫. @@ -1296,10 +1297,6 @@ nqo: new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬ help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫. - create: - notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫ - ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫. - notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫. edit: title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬ heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index d1ff013c1..075cd3bcd 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -314,8 +314,6 @@ oc: destroy: success: Còmpte suprimit... browse: - created: Creat - closed: Plegat version: Version in_changeset: Grop de modificacions anonymous: anonim @@ -331,21 +329,6 @@ oc: view_history: Mostrar l’istoric view_details: Mostrar lei detalhs location: 'Emplaçament :' - changeset: - title: 'Grop de modificacions : %{id}' - belongs_to: Autor - node: Nos (%{count}) - node_paginated: Nos (%{x} a %{y} sus %{count}) - way: Linha (%{count}) - way_paginated: Linhas (%{x} a %{y} sus %{count}) - relation: Relacions (%{count}) - relation_paginated: Relacions (%{x} a %{y} sus %{count}) - changesetxml: Grop de modificacions XML - osmchangexml: osmChange XML - join_discussion: Se connectar per rejónher la discussion - discussion: Discussion - still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà - un còp que l’ensemble de modificacions serà plegat. node: title_html: 'Nos : %{name}' history_title_html: 'Istoric dau nos : %{name}' @@ -453,6 +436,24 @@ oc: feed: title: Grop de modificacions %{id} title_comment: Grop de modificacions %{id} – %{comment} + created: Creat + closed: Plegat + belongs_to: Autor + show: + title: 'Grop de modificacions : %{id}' + discussion: Discussion + join_discussion: Se connectar per rejónher la discussion + still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà + un còp que l’ensemble de modificacions serà plegat. + changesetxml: Grop de modificacions XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nos (%{count}) + nodes_paginated: Nos (%{x} a %{y} sus %{count}) + ways: Linha (%{count}) + ways_paginated: Linhas (%{x} a %{y} sus %{count}) + relations: Relacions (%{count}) + relations_paginated: Relacions (%{x} a %{y} sus %{count}) timeout: sorry: O planhèm, la lista deis gropes de modificacions qu'avètz demandada met tròp de temps per èsser recuperada. @@ -1734,10 +1735,6 @@ oc: heading: Avètz perdut vòstre senhal ? email address: 'Adreça de corrièr electronic :' new password button: Mandar un senhal novèl - create: - notice email on way: Un e-mail vos es estat mandat per reïnicializar vòstre - senhal. - notice email cannot find: Adreça email introbabla, o planhèm. edit: title: Reïnicializar lo senhal heading: Reïnicializar lo senhal de %{user} diff --git a/config/locales/pa.yml b/config/locales/pa.yml index de583cce9..2c779fc47 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -157,8 +157,6 @@ pa: go_public: make_edits_public_button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ browse: - created: ਬਣਾਇਆ ਗਿਆ - closed: ਬੰਦ ਹੋਇਆ version: ਵਰਜਨ in_changeset: ਤਬਦੀਲੀਆਂ anonymous: ਬੇਪਛਾਣ @@ -168,11 +166,6 @@ pa: view_history: ਅਤੀਤ ਵੇਖੋ view_details: ਵੇਰਵੇ ਵੇਖੋ location: 'ਸਥਿਤੀ:' - changeset: - title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}' - belongs_to: ਲੇਖਕ - changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML - discussion: ਚਰਚਾ relation: members: ਜੀਅ relation_member: @@ -226,6 +219,13 @@ pa: feed: title: ਤਬਦੀਲੀ ਲੜੀ %{id} title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment} + created: ਬਣਾਇਆ ਗਿਆ + closed: ਬੰਦ ਹੋਇਆ + belongs_to: ਲੇਖਕ + show: + title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}' + discussion: ਚਰਚਾ + changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML dashboards: contact: km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ' diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 9c36ded2e..4033be4f0 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -406,12 +406,6 @@ pl: destroy: success: Konto zostało usunięte. browse: - created: Utworzone - closed: Zamknięte - created_ago_html: Utworzone %{time_ago} - closed_ago_html: Zamknięte %{time_ago} - created_ago_by_html: Utworzone %{time_ago} przez %{user} - closed_ago_by_html: Zamknięte %{time_ago} przez %{user} deleted_ago_by_html: Usunięte %{time_ago} przez %{user} edited_ago_by_html: Edytowane %{time_ago} przez %{user} version: Wersja @@ -433,23 +427,6 @@ pl: view_history: Wyświetl historię view_details: Wyświetl szczegóły location: 'Położenie:' - changeset: - title: 'Zestaw zmian: %{id}' - belongs_to: Autor - node: Węzły (%{count}) - node_paginated: Węzły (%{x}-%{y} z %{count}) - way: Linie (%{count}) - way_paginated: Linie (%{x}-%{y} z %{count}) - relation: Relacje (%{count}) - relation_paginated: Relacje (%{x}-%{y} z %{count}) - hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago} - comment_by_html: Komentarz od %{user} %{time_ago} - changesetxml: XML w formacie zestawu zmian - osmchangexml: XML w formacie osmChange - join_discussion: Zaloguj się, aby dołączyć do dyskusji - discussion: Dyskusja - still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie - on zamknięty. node: title_html: 'Węzeł: %{name}' history_title_html: 'Historia węzła: %{name}' @@ -562,6 +539,32 @@ pl: feed: title: Zestaw zmian %{id} title_comment: Zestaw zmian %{id} - %{comment} + created: Utworzone + closed: Zamknięte + belongs_to: Autor + heading: + title: Zestaw zmian %{id} + show: + title: 'Zestaw zmian: %{id}' + created_ago_html: Utworzone %{time_ago} + closed_ago_html: Zamknięte %{time_ago} + created_ago_by_html: Utworzone %{time_ago} przez %{user} + closed_ago_by_html: Zamknięte %{time_ago} przez %{user} + discussion: Dyskusja + join_discussion: Zaloguj się, aby dołączyć do dyskusji + still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie + on zamknięty. + comment_by_html: Komentarz od %{user} %{time_ago} + hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago} + changesetxml: XML w formacie zestawu zmian + osmchangexml: XML w formacie osmChange + paging_nav: + nodes: Węzły (%{count}) + nodes_paginated: Węzły (%{x}-%{y} z %{count}) + ways: Linie (%{count}) + ways_paginated: Linie (%{x}-%{y} z %{count}) + relations: Relacje (%{count}) + relations_paginated: Relacje (%{x}-%{y} z %{count}) timeout: sorry: Niestety, pobieranie listy żądanych zestawów zmian trwało zbyt długo. changeset_comments: @@ -624,6 +627,7 @@ pl: show: title: Dziennik użytkownika %{user} | %{title} user_title: Dziennik użytkownika %{user} + discussion: Dyskusja leave_a_comment: Zostaw komentarz login_to_leave_a_comment_html: '%{login_link}, aby dodać komentarz' login: Zaloguj się @@ -1905,10 +1909,6 @@ pl: new password button: Wyczyść hasło help_text: Proszę wprowadzić adres e-mail używany do logowania. Zostanie wysłany na niego odnośnik służący do wyczyszczenia hasła. - create: - notice email on way: Przykro nam z powodu utraty hasła. Wiadomość, która umożliwi - jego wyczyszczenie, jest już w drodze. - notice email cannot find: Niestety, nie odnaleziono tego adresu e-mail. edit: title: Wyczyść hasło heading: Czyszczenie hasła użytkownika %{user} diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml index b429a70a1..7e545358a 100644 --- a/config/locales/pnb.yml +++ b/config/locales/pnb.yml @@ -276,8 +276,6 @@ pnb: destroy: success: کھاتہ مٹایا۔ browse: - created: 'بݨاؤݨ:' - closed: 'بند کرن:' version: ورژن in_changeset: تبدیلیاں anonymous: بے پچاݨ @@ -295,19 +293,6 @@ pnb: location: 'ستھتی:' common_details: coordinates_html: '%{latitude}; %{longitude}' - changeset: - title: 'تبدیلیاں: %{id}' - belongs_to: لیکھک - node: نوڈ (⁠%{count}⁠) - node_paginated: نوڈ (⁠%{count} وچ %{x} توں %{y}⁠) - way: راہ (⁠%{count}⁠) - way_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠) - relation: سمبندھ (⁠%{count}⁠) - relation_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠) - changesetxml: تبدیلیاں لئی سروت دی فائل - osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ - join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو - discussion: گل بات node: title_html: 'نوڈ: %{name}' history_title_html: 'نوڈ دا اتیت: %{name}' @@ -409,6 +394,22 @@ pnb: feed: title: 'تبدیلیاں: %{id}' title_comment: تبدیلیاں نمبر %{id} • %{comment} + created: 'بݨاؤݨ:' + closed: 'بند کرن:' + belongs_to: لیکھک + show: + title: 'تبدیلیاں: %{id}' + discussion: گل بات + join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو + changesetxml: تبدیلیاں لئی سروت دی فائل + osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ + paging_nav: + nodes: نوڈ (⁠%{count}⁠) + nodes_paginated: نوڈ (⁠%{count} وچ %{x} توں %{y}⁠) + ways: راہ (⁠%{count}⁠) + ways_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠) + relations: سمبندھ (⁠%{count}⁠) + relations_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠) timeout: sorry: افسوس، تبدیلیاں دیاں لڑیاں نہیں لبھ سکیاں، ٹائم آؤٹ ہوگیا سی۔ changeset_comments: @@ -1394,9 +1395,6 @@ pnb: email address: 'ای‌میل پتہ:' new password button: پاس‌ورڈ فیر بݨایو help_text: تہاڈے ای‌میل دا پتہ جو پاس‌ورڈ فیر بݨاؤݨ دی کڑی بھیج سکاں‌گی اے۔ - create: - notice email on way: اچھا، ای‌میل تے مدد دی کڑی بھیجاں‌گی اے - notice email cannot find: افسوس، اوہ ای‌میل دا پتہ نہیں لبھ سکیا edit: title: پاس‌ورڈ فیر بݨایو reset: پاس‌ورڈ فیر بݨایو diff --git a/config/locales/ps.yml b/config/locales/ps.yml index a118d65ed..279640846 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -94,8 +94,6 @@ ps: link text: دا څه دی؟ save changes button: بدلونونه خوندي کول browse: - created: جوړ شو - closed: تړل شوی relation: members: غړي relation_member: @@ -120,6 +118,10 @@ ps: user: کارن comment: تبصره area: سيمه + index: + feed: + created: جوړ شو + closed: تړل شوی dashboards: popup: friend: ملگری diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index b7c94fe4a..48b3164a1 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -361,12 +361,6 @@ pt-PT: destroy: success: Conta apagada. browse: - created: Criado - closed: Fechado - created_ago_html: Criado há %{time_ago} - closed_ago_html: Fechado há %{time_ago} - created_ago_by_html: Criado há %{time_ago} por %{user} - closed_ago_by_html: Fechado há %{time_ago} por %{user} deleted_ago_by_html: Eliminado há %{time_ago} por %{user} edited_ago_by_html: Editado há %{time_ago} por %{user} version: Versão @@ -384,23 +378,6 @@ pt-PT: view_history: Ver histórico view_details: Ver detalhes location: 'Localização:' - changeset: - title: 'Conjunto de alterações: %{id}' - belongs_to: Autor - node: Nós (%{count}) - node_paginated: Nós (%{x}-%{y} of %{count}) - way: Linhas (%{count}) - way_paginated: Linhas (%{x}-%{y} de %{count}) - relation: Relações (%{count}) - relation_paginated: Relações (%{x}-%{y} of %{count}) - hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} - comment_by_html: Comentário de %{user} há %{time_ago} - changesetxml: XML do conjunto de alterações - osmchangexml: XML no formato osmChange - join_discussion: Inicia sessão para te juntares à discussão - discussion: Discussão - still_open: O conjunto de alterações continua aberto. A discussão será iniciada - assim que o conjunto de alterações for fechado. node: title_html: 'Nó: %{name}' history_title_html: 'Histórico do Nó: %{name}' @@ -511,6 +488,30 @@ pt-PT: feed: title: Conjunto de alterações %{id} title_comment: Conjunto de alterações %{id} - %{comment} + created: Criado + closed: Fechado + belongs_to: Autor + show: + title: 'Conjunto de alterações: %{id}' + created_ago_html: Criado há %{time_ago} + closed_ago_html: Fechado há %{time_ago} + created_ago_by_html: Criado há %{time_ago} por %{user} + closed_ago_by_html: Fechado há %{time_ago} por %{user} + discussion: Discussão + join_discussion: Inicia sessão para te juntares à discussão + still_open: O conjunto de alterações continua aberto. A discussão será iniciada + assim que o conjunto de alterações for fechado. + comment_by_html: Comentário de %{user} há %{time_ago} + hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} + changesetxml: XML do conjunto de alterações + osmchangexml: XML no formato osmChange + paging_nav: + nodes: Nós (%{count}) + nodes_paginated: Nós (%{x}-%{y} of %{count}) + ways: Linhas (%{count}) + ways_paginated: Linhas (%{x}-%{y} de %{count}) + relations: Relações (%{count}) + relations_paginated: Relações (%{x}-%{y} of %{count}) timeout: sorry: Lamentamos, mas a lista de conjuntos de alterações que pediste excedeu o tempo limite de resposta. @@ -1882,11 +1883,6 @@ pt-PT: new password button: Repor palavra-passe help_text: Introduz o endereço de correio eletrónico que usaste para criar a conta. Enviar-te-emos uma ligação que poderás usar para repor a palavra-passe. - create: - notice email on way: Lamentamos que a tenhas perdido :-( mas já te enviámos - um e-mail para que possas repô-la em breve. - notice email cannot find: Lamentamos, mas não foi possível encontrar esse endereço - eletrónico. edit: title: Repor palavra-passe heading: Repor palavra-passe para %{user} diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 252d8f668..839256b19 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -264,9 +264,6 @@ pt: x_years: one: há %{count} ano other: há %{count} anos - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Padrão (atualmente %{name}) id: @@ -383,12 +380,6 @@ pt: destroy: success: Conta eliminada. browse: - created: Criado - closed: Fechado - created_ago_html: Criado há %{time_ago} - closed_ago_html: Fechado %{time_ago} - created_ago_by_html: Criado há %{time_ago} por %{user} - closed_ago_by_html: Fechado %{time_ago} por %{user} deleted_ago_by_html: Excluído há %{time_ago} por %{user} edited_ago_by_html: Editado há %{time_ago} por %{user} version: Versão @@ -406,23 +397,6 @@ pt: view_history: Ver histórico view_details: Ver detalhes location: 'Localização:' - changeset: - title: 'Conjunto de alterações: %{id}' - belongs_to: Autor - node: Pontos (%{count}) - node_paginated: Pontos (%{x}-%{y} de %{count}) - way: Linhas (%{count}) - way_paginated: Linhas (%{x}-%{y} de %{count}) - relation: Relações (%{count}) - relation_paginated: Relações (%{x}-%{y} de %{count}) - hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} - comment_by_html: Comentário de %{user} há %{time_ago} - changesetxml: XML do conjunto de alterações - osmchangexml: XML osmChange - join_discussion: Entrar para participar da discussão - discussion: Discussão - still_open: O conjunto de alterações continua em aberto - A discussão será iniciada - assim que for fechado o conjunto de alterações. node: title_html: 'Ponto: %{name}' history_title_html: 'Histórico do ponto: %{name}' @@ -530,6 +504,30 @@ pt: feed: title: Conjunto de alterações %{id} title_comment: Conjunto de alterações %{id} - %{comment} + created: Criado + closed: Fechado + belongs_to: Autor + show: + title: 'Conjunto de alterações: %{id}' + created_ago_html: Criado há %{time_ago} + closed_ago_html: Fechado %{time_ago} + created_ago_by_html: Criado há %{time_ago} por %{user} + closed_ago_by_html: Fechado %{time_ago} por %{user} + discussion: Discussão + join_discussion: Entrar para participar da discussão + still_open: O conjunto de alterações continua em aberto - A discussão será iniciada + assim que for fechado o conjunto de alterações. + comment_by_html: Comentário de %{user} há %{time_ago} + hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} + changesetxml: XML do conjunto de alterações + osmchangexml: XML osmChange + paging_nav: + nodes: Pontos (%{count}) + nodes_paginated: Pontos (%{x}-%{y} de %{count}) + ways: Linhas (%{count}) + ways_paginated: Linhas (%{x}-%{y} de %{count}) + relations: Relações (%{count}) + relations_paginated: Relações (%{x}-%{y} de %{count}) timeout: sorry: A lista de conjuntos de alterações solicitada está demorando demais para chegar. @@ -1896,10 +1894,6 @@ pt: new password button: Redefinir senha help_text: Digite o endereço de e-mail que você usou para se conectar e enviaremos um link que você poderá usar para redefinir a sua senha. - create: - notice email on way: Um e-mail foi enviado para que você possa escolher outra - senha. - notice email cannot find: Não foi possível encontrar esse endereço de e-mail. edit: title: Redefinir senha heading: Redefinir Senha de %{user} diff --git a/config/locales/ro.yml b/config/locales/ro.yml index a99bce959..5e2d5e548 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -345,12 +345,6 @@ ro: destroy: success: Contul Este Șters. browse: - created: Creat - closed: Închis - created_ago_html: Creat %{time_ago} - closed_ago_html: Închis %{time_ago} - created_ago_by_html: Creat %{time_ago} de %{user} - closed_ago_by_html: Închis %{time_ago} de către %{user} deleted_ago_by_html: Șters %{time_ago} de %{user} edited_ago_by_html: Editat %{time_ago} de %{user} version: Versiune @@ -370,23 +364,6 @@ ro: view_history: Vezi istoric view_details: Vezi detalii location: 'Amplasament:' - changeset: - title: 'Set de modificări: %{id}' - belongs_to: Autor - node: Noduri (%{count}) - node_paginated: Noduri (%{x}-%{y} din %{count}) - way: Căi (%{count}) - way_paginated: Căi (%{x}-%{y} din %{count}) - relation: Comunicații (%{count}) - relation_paginated: Comunicații (%{x}-%{y} din %{count}) - hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago} - comment_by_html: Comentariu de la %{user} %{time_ago} - changesetxml: Set de modificări XML - osmchangexml: XML osmChange - join_discussion: Conectați-vă pentru a vă alătura discuției - discussion: Discuție - still_open: Setul de schimbări este deschis - discuția se va deschide atunci - când setul de schimbări este închis. node: title_html: 'Nod: %{name}' history_title_html: 'Istoricul nodului: %{name}' @@ -498,6 +475,30 @@ ro: feed: title: 'Set de modificări: %{id}' title_comment: Set de modificări %{id} — %{comment} + created: Creat + closed: Închis + belongs_to: Autor + show: + title: 'Set de modificări: %{id}' + created_ago_html: Creat %{time_ago} + closed_ago_html: Închis %{time_ago} + created_ago_by_html: Creat %{time_ago} de %{user} + closed_ago_by_html: Închis %{time_ago} de către %{user} + discussion: Discuție + join_discussion: Conectați-vă pentru a vă alătura discuției + still_open: Setul de schimbări este deschis - discuția se va deschide atunci + când setul de schimbări este închis. + comment_by_html: Comentariu de la %{user} %{time_ago} + hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago} + changesetxml: Set de modificări XML + osmchangexml: XML osmChange + paging_nav: + nodes: Noduri (%{count}) + nodes_paginated: Noduri (%{x}-%{y} din %{count}) + ways: Căi (%{count}) + ways_paginated: Căi (%{x}-%{y} din %{count}) + relations: Comunicații (%{count}) + relations_paginated: Comunicații (%{x}-%{y} din %{count}) timeout: sorry: Ne pare rău, preluarea listei de modificări pe care ați solicitat-o a durat prea mult. @@ -1850,10 +1851,6 @@ ro: new password button: Resetare parolă help_text: Introduceți adresa de e-mail pe care ați utilizat-o pentru a vă înscrie, vom trimite un link la aceasta pe care îl puteți utiliza pentru a reseta parola. - create: - notice email on way: Ne pare rău că ați pierdut-o :-( dar un e-mail este pe - drum, astfel încât să puteți să-l resetați în curând. - notice email cannot find: Nu am putut găsi adresa de e-mail, îmi pare rău. edit: title: Resetare parolă heading: Resetați parola pentru %{user} diff --git a/config/locales/ru.yml b/config/locales/ru.yml index d22c9bbf1..4f8c413ee 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -423,11 +423,6 @@ ru: destroy: success: Учётная запись удалена. browse: - created: Создано - closed: Закрыто - created_ago_html: Создано %{time_ago} - closed_ago_html: Закрыто %{time_ago} - created_ago_by_html: Создал %{time_ago} %{user} edited_ago_by_html: Редактировал %{time_ago} %{user} version: Версия in_changeset: Пакет правок @@ -448,22 +443,6 @@ ru: view_history: Посмотреть историю view_details: Подробнее location: 'Географическое положение:' - changeset: - title: 'Пакет правок: %{id}' - belongs_to: Автор - node: Точки (%{count}) - node_paginated: Точки (%{x}-%{y} из %{count}) - way: Линии (%{count}) - way_paginated: Линии (%{x}-%{y} из %{count}) - relation: Отношения (%{count}) - relation_paginated: Отношения (%{x}-%{y} из %{count}) - comment_by_html: Комментарий от %{user} %{time_ago} - changesetxml: XML пакета правок - osmchangexml: osmChange XML - join_discussion: Войдите в систему, чтобы присоединиться к обсуждению - discussion: Обсуждение - still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет - правок будет закрыт. node: title_html: 'Точка: %{name}' history_title_html: 'История точки: %{name}' @@ -576,6 +555,28 @@ ru: feed: title: Пакет правок %{id} title_comment: Пакет правок %{id} — %{comment} + created: Создано + closed: Закрыто + belongs_to: Автор + show: + title: 'Пакет правок: %{id}' + created_ago_html: Создано %{time_ago} + closed_ago_html: Закрыто %{time_ago} + created_ago_by_html: Создал %{time_ago} %{user} + discussion: Обсуждение + join_discussion: Войдите в систему, чтобы присоединиться к обсуждению + still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет + правок будет закрыт. + comment_by_html: Комментарий от %{user} %{time_ago} + changesetxml: XML пакета правок + osmchangexml: osmChange XML + paging_nav: + nodes: Точки (%{count}) + nodes_paginated: Точки (%{x}-%{y} из %{count}) + ways: Линии (%{count}) + ways_paginated: Линии (%{x}-%{y} из %{count}) + relations: Отношения (%{count}) + relations_paginated: Отношения (%{x}-%{y} из %{count}) timeout: sorry: К сожалению, список пакетов правок, который вы запросили, требует слишком много времени для извлечения. @@ -1894,10 +1895,6 @@ ru: new password button: Вышлите мне новый пароль help_text: Введите адрес вашей электронной почты, который вы использовали для подписки, и мы вышлем инструкции, как можно обновить ваш пароль. - create: - notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт - письмо и вы сможете поменять свой пароль. - notice email cannot find: Такой адрес не зарегистрирован. edit: title: Повторная установка пароля heading: Повторная установка пароля для %{user} diff --git a/config/locales/sat.yml b/config/locales/sat.yml index bc6fff49d..52697ac88 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -140,21 +140,12 @@ sat: link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ? save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ browse: - created: ᱛᱮᱭᱟᱨᱱᱟ - closed: ᱵᱚᱸᱫᱚ anonymous: ᱵᱟᱝ ᱵᱟᱰᱟᱭ no_comment: (ᱚᱠᱛᱚ ᱵᱟᱝ) download_xml: XML ᱰᱟᱩᱱᱞᱚᱰ ᱢᱮ view_history: ᱱᱟᱜᱟᱢ ᱧᱮᱞᱢᱮ view_details: ᱵᱤᱵᱨᱚᱱ ᱧᱮᱞ ᱢᱮ location: 'ᱡᱟᱭᱜᱟ:' - changeset: - belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ - node: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ - way: (%{count}) ᱦᱚᱨᱠᱚ - relation: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count}) - relation_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count}) - discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ node: title_html: ᱜᱟᱸᱴᱷ:%{name} history_title_html: 'ᱜᱟᱸᱴᱷ ᱨᱮᱭᱟᱜ ᱦᱤᱛᱟᱹᱞ: %{name}' @@ -216,6 +207,17 @@ sat: area: ᱡᱟᱭᱜᱟ index: load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ + feed: + created: ᱛᱮᱭᱟᱨᱱᱟ + closed: ᱵᱚᱸᱫᱚ + belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ + show: + discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ + paging_nav: + nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ + ways: (%{count}) ᱦᱚᱨᱠᱚ + relations: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count}) + relations_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count}) dashboards: popup: your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ diff --git a/config/locales/sc.yml b/config/locales/sc.yml index b96c20584..e393cc7b5 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -326,12 +326,6 @@ sc: destroy: success: Contu iscantzelladu. browse: - created: Creadu - closed: Serradu - created_ago_html: Creadu %{time_ago} - closed_ago_html: Tancadu %{time_ago} - created_ago_by_html: Creadu %{time_ago} dae %{user} - closed_ago_by_html: Tancadu %{time_ago} dae %{user} deleted_ago_by_html: Iscantzelladu %{time_ago} dae %{user} edited_ago_by_html: Modificadu %{time_ago} dae %{user} version: Versione @@ -349,23 +343,6 @@ sc: view_history: Càstia sa cronologia view_details: Mustrat sos detàllios location: 'Logu:' - changeset: - title: 'Annantu de modìficas: %{id}' - belongs_to: Autore - node: Nodos (%{count}) - node_paginated: Nodos (%{x}-%{y} de %{count}) - way: Lìnias (%{count}) - way_paginated: Lìnias (%{x}-%{y} de %{count}) - relation: Relatziones (%{count}) - relation_paginated: Relatziones (%{x}-%{y} de %{count}) - hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago} - comment_by_html: Cummentu de %{user} %{time_ago} - changesetxml: XML de s'annantu de modìficas - osmchangexml: XML in formadu osmChange - join_discussion: Intra pro t'aunire a s'arresonu - discussion: Arresonu - still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando - s'annantu de modìficas s'at a serrare. node: title_html: 'Nodu: %{name}' history_title_html: 'Istòria de su nodu: %{name}' @@ -476,6 +453,30 @@ sc: feed: title: Annantu de modìficas %{id} title_comment: Grupu de modìficas %{id} - %{comment} + created: Creadu + closed: Serradu + belongs_to: Autore + show: + title: 'Annantu de modìficas: %{id}' + created_ago_html: Creadu %{time_ago} + closed_ago_html: Tancadu %{time_ago} + created_ago_by_html: Creadu %{time_ago} dae %{user} + closed_ago_by_html: Tancadu %{time_ago} dae %{user} + discussion: Arresonu + join_discussion: Intra pro t'aunire a s'arresonu + still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando + s'annantu de modìficas s'at a serrare. + comment_by_html: Cummentu de %{user} %{time_ago} + hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago} + changesetxml: XML de s'annantu de modìficas + osmchangexml: XML in formadu osmChange + paging_nav: + nodes: Nodos (%{count}) + nodes_paginated: Nodos (%{x}-%{y} de %{count}) + ways: Lìnias (%{count}) + ways_paginated: Lìnias (%{x}-%{y} de %{count}) + relations: Relatziones (%{count}) + relations_paginated: Relatziones (%{x}-%{y} de %{count}) timeout: sorry: S'elencu de annantos de modìficas chi as pedidu at bisongiadu de tropu tempus pro lu recuperare. @@ -1840,11 +1841,6 @@ sc: help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de intrada tua. - create: - notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu - unu messàgiu de posta eletrònica pro chi la potzas ripristinare. - notice email cannot find: A dolu mannu non semus resèssidos a agatare custu - indiritzu de posta eletrònica. edit: title: Riprìstina sa crae de intrada heading: Riprìstina sa crae de intrada pro %{user} diff --git a/config/locales/scn.yml b/config/locales/scn.yml index a5f351844..8c23b8b4f 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -233,8 +233,6 @@ scn: destroy: success: Cuntu cancillatu. browse: - created: Criatu - closed: Chiudutu version: Virsioni in_changeset: Gruppu di canciamenti anonymous: anònimu @@ -244,19 +242,6 @@ scn: view_history: Talìa la crunuluggìa view_details: Talìa li dittagghî location: 'Locu:' - changeset: - title: 'Gruppu di canciamenti: %{id}' - belongs_to: Auturi - node: Gruppa (%{count}) - node_paginated: Gruppa (%{x}-%{y} di %{count}) - way: Camini (%{count}) - way_paginated: Camini (%{x}-%{y} di %{count}) - relation: Rilazzioni (%{count}) - relation_paginated: Rilazzioni (%{x}-%{y} di %{count}) - changesetxml: XML dû gruppu di canciamenti - osmchangexml: XML osmChange - join_discussion: Pi participari ntâ discussioni trasi - discussion: Discussioni node: title_html: 'Gruppu: %{name}' history_title_html: 'Crunuluggìa dû gruppu: %{name}' @@ -361,6 +346,22 @@ scn: feed: title: Gruppu di canciamenti %{id} title_comment: Gruppu di canciamenti %{id} - %{comment} + created: Criatu + closed: Chiudutu + belongs_to: Auturi + show: + title: 'Gruppu di canciamenti: %{id}' + discussion: Discussioni + join_discussion: Pi participari ntâ discussioni trasi + changesetxml: XML dû gruppu di canciamenti + osmchangexml: XML osmChange + paging_nav: + nodes: Gruppa (%{count}) + nodes_paginated: Gruppa (%{x}-%{y} di %{count}) + ways: Camini (%{count}) + ways_paginated: Camini (%{x}-%{y} di %{count}) + relations: Rilazzioni (%{count}) + relations_paginated: Rilazzioni (%{x}-%{y} di %{count}) timeout: sorry: Purtroppu, ci vosi troppu tempu pi pigghiari la lista dî gruppi di canciamenti c'addumannasti. @@ -1239,10 +1240,6 @@ scn: new password button: Azzera la palora d'òrdini help_text: Scrivi lu nnirizzu di posta elittrònica c'adupirasti quannu ti scrivisti, e ci mannamu nu culligamentu chi poi adupirari p'azzirari la tò palora d'òrdini. - create: - notice email on way: Ni dispiaci chi la pirdisti :-( pirò ti sta arrivannu nu - missaggiu di posta elittrònica pi menzu dû quali prestu la poi azzirari. - notice email cannot find: Putroppu nun s'attrova stu nnirizzu di posta elittrònica. edit: title: Azzera la palora d'òrdini heading: Azziramentu dâ palora d'òrdini di %{user} diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 53982031b..474d1f4c7 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -104,8 +104,6 @@ sco: edit: title: Eedit accoont browse: - created: Creatit - closed: Closed version: Version in_changeset: Chyngeset anonymous: anonymous @@ -115,19 +113,6 @@ sco: view_history: View History view_details: View Details location: 'Location:' - changeset: - title: 'Chyngeset: %{id}' - belongs_to: Author - node: Nodes (%{count}) - node_paginated: Nodes (%{x}-%{y} of %{count}) - way: Ways (%{count}) - way_paginated: Ways (%{x}-%{y} of %{count}) - relation: Relations (%{count}) - relation_paginated: Relations (%{x}-%{y} of %{count}) - changesetxml: Chyngeset XML - osmchangexml: osmChange XML - join_discussion: Log in tae jyn the discussion - discussion: Discussion node: title_html: 'Node: %{name}' history_title_html: 'Node History: %{name}' @@ -216,6 +201,22 @@ sco: feed: title: Chyngeset %{id} title_comment: Chyngeset %{id} - %{comment} + created: Creatit + closed: Closed + belongs_to: Author + show: + title: 'Chyngeset: %{id}' + discussion: Discussion + join_discussion: Log in tae jyn the discussion + changesetxml: Chyngeset XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nodes (%{count}) + nodes_paginated: Nodes (%{x}-%{y} of %{count}) + ways: Ways (%{count}) + ways_paginated: Ways (%{x}-%{y} of %{count}) + relations: Relations (%{count}) + relations_paginated: Relations (%{x}-%{y} of %{count}) timeout: sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve. changeset_comments: diff --git a/config/locales/sh.yml b/config/locales/sh.yml index 2644b50e0..ae047e325 100644 --- a/config/locales/sh.yml +++ b/config/locales/sh.yml @@ -249,9 +249,6 @@ sh: imejl za porukom za potvrdu nove adrese. success: Korisničke informacije su uspješno osvježene. browse: - changeset: - join_discussion: Prijavite se za uključivanje u raspravu - discussion: Razgovor tag_details: wikidata_link: '%{page} stavka na Wikidata' wikipedia_link: Članak o %{page} na Wikipediji @@ -276,6 +273,9 @@ sh: title_user_link_html: Setovi promjena od %{user_link} title_friend: Promjene mojih prijatelja title_nearby: Promjene obližnjih korisnika + show: + discussion: Razgovor + join_discussion: Prijavite se za uključivanje u raspravu diary_entries: new: title: Novi zapis u dnevnik diff --git a/config/locales/sk.yml b/config/locales/sk.yml index be2e6014a..c59b5bc86 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -345,12 +345,6 @@ sk: destroy: success: Účet bol odstránený. browse: - created: Vytvorené - closed: Uzavreté - created_ago_html: Vytvorené %{time_ago} - closed_ago_html: Zatvorené %{time_ago} - created_ago_by_html: Vytvorené %{time_ago} používateľom %{user} - closed_ago_by_html: Zatvorené %{time_ago} používateľom %{user} deleted_ago_by_html: Odstránené %{time_ago} používateľom %{user} edited_ago_by_html: Upravené %{time_ago} používateľom %{user} version: Verzia @@ -372,23 +366,6 @@ sk: view_history: Zobraziť históriu view_details: Zobraziť detaily location: 'Poloha:' - changeset: - title: 'Sada zmien: %{id}' - belongs_to: Autor - node: Uzly (%{count}) - node_paginated: Uzly (%{x}–%{y} z %{count}) - way: Cesty (%{count}) - way_paginated: Cesty (%{x}–%{y} z %{count}) - relation: Relácie (%{count}) - relation_paginated: Relácie (%{x}–%{y} z %{count}) - hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago} - comment_by_html: Komentár od používateľa %{user} %{time_ago} - changesetxml: XML sady zmien - osmchangexml: osmChange XML - join_discussion: Zapojte sa do diskusie - discussion: Diskusia - still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada - zmien uzatvorená. node: title_html: 'Uzol: %{name}' history_title_html: 'História uzla: %{name}' @@ -501,6 +478,30 @@ sk: feed: title: Sada zmien %{id} title_comment: Sada zmien %{id} - %{comment} + created: Vytvorené + closed: Uzavreté + belongs_to: Autor + show: + title: 'Sada zmien: %{id}' + created_ago_html: Vytvorené %{time_ago} + closed_ago_html: Zatvorené %{time_ago} + created_ago_by_html: Vytvorené %{time_ago} používateľom %{user} + closed_ago_by_html: Zatvorené %{time_ago} používateľom %{user} + discussion: Diskusia + join_discussion: Zapojte sa do diskusie + still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada + zmien uzatvorená. + comment_by_html: Komentár od používateľa %{user} %{time_ago} + hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago} + changesetxml: XML sady zmien + osmchangexml: osmChange XML + paging_nav: + nodes: Uzly (%{count}) + nodes_paginated: Uzly (%{x}–%{y} z %{count}) + ways: Cesty (%{count}) + ways_paginated: Cesty (%{x}–%{y} z %{count}) + relations: Relácie (%{count}) + relations_paginated: Relácie (%{x}–%{y} z %{count}) timeout: sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliš dlho. changeset_comments: @@ -1728,10 +1729,6 @@ sk: new password button: Resetnúť heslo help_text: Vložte emailovú adresu, ktorú ste uviedli pri registrácii, pošleme vám odkaz, pomocou ktorého si budete môcť nastaviť nové heslo. - create: - notice email on way: Škoda zabudnutého hesla :-( ale e-mail je už na ceste, - takže si čoskoro budete môcť zvoliť nové. - notice email cannot find: Ľutujeme, túto e-mailovú adresu nie je možné nájsť. edit: title: Resetnúť heslo heading: Resetnúť heslo pre %{user} diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index ef823dfc9..1dee6c57a 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -189,10 +189,6 @@ skr-arab: destroy: success: کھاتہ مٹ ڳیا۔ browse: - created: بݨ ڳیا - closed: بند تھیا - created_ago_html: '%{time_ago} خلقیا' - closed_ago_html: '%{time_ago} بند تھیا' version: ورژن in_changeset: تبدیلیاں anonymous: گمنام @@ -202,12 +198,6 @@ skr-arab: view_history: تاریخچہ ݙیکھو view_details: تفصیل ݙکھاؤ location: 'محل وقوع:' - changeset: - title: تبدیلیاں:%{id} - belongs_to: مصنف - node: نوݙاں(%{count}) - way: رستے(%{count}) - discussion: بحث مباحثہ node: title_html: 'نوڈ: %{name}' history_title_html: نوݙ تاریخچہ:%{name} @@ -268,6 +258,18 @@ skr-arab: title: تبدیلیاں empty: تبدیلیاں کائنی لبھیاں۔ load_more: ٻئے لوݙ کرو + feed: + created: بݨ ڳیا + closed: بند تھیا + belongs_to: مصنف + show: + title: تبدیلیاں:%{id} + created_ago_html: '%{time_ago} خلقیا' + closed_ago_html: '%{time_ago} بند تھیا' + discussion: بحث مباحثہ + paging_nav: + nodes: نوݙاں(%{count}) + ways: رستے(%{count}) dashboards: contact: km away: '%{count} کلومیٹر دور' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 0cc6349ad..9a675aeef 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -359,15 +359,10 @@ sl: destroy: success: Račun izbrisan. browse: - created: Ustvarjeno - closed: Zaprto - created_ago_html: Ustvaril_a %{time_ago} - closed_ago_html: Zaprto %{time_ago} - created_ago_by_html: Ustvaril %{user} %{time_ago} - closed_ago_by_html: Zaprl_a %{time_ago} %{user} deleted_ago_by_html: Izbrisal %{user} %{time_ago} edited_ago_by_html: Uredil_a %{user} %{time_ago} version: Različica + redacted_version: Skrita različica in_changeset: Nabor sprememb anonymous: anonimni no_comment: (brez komentarja) @@ -384,25 +379,11 @@ sl: other: '%{count} poti' download_xml: Prenesi XML view_history: Ogled zgodovine + view_unredacted_history: Ogled neskrite zgodovine view_details: Prikaz podrobnosti + view_redacted_data: Ogled skritih podatkov + view_redaction_message: Ogled sporočila o redigiranju location: 'Lokacija:' - changeset: - title: 'Nabor sprememb: %{id}' - belongs_to: Avtor - node: Vozlišč (%{count}) - node_paginated: Vozlišča (%{x}-%{y} od %{count}) - way: Poti (%{count}) - way_paginated: Poti (%{x}-%{y} od %{count}) - relation: Relacije (%{count}) - relation_paginated: Zveze (%{x}-%{y} od %{count}) - hidden_comment_by_html: Skrit komentar %{user} %{time_ago} - comment_by_html: Komentar %{user} %{time_ago} - changesetxml: Nabor sprememb XML - osmchangexml: osmChange XML - join_discussion: Prijavite se za pridružitev pogovoru - discussion: Pogovor - still_open: Nabor sprememb je še vedno odprt – pogovor se bo začel, ko bo nabor - sprememb zaprt. node: title_html: 'Vozlišče: %{name}' history_title_html: 'Zgodovina vozlišča: %{name}' @@ -523,6 +504,44 @@ sl: feed: title: Nabor sprememb %{id} title_comment: Nabor sprememb %{id} – %{comment} + created: Ustvarjeno + closed: Zaprto + belongs_to: Avtor + subscribe: + heading: Se želite prijaviti na naslednjo razprave o naboru sprememb? + button: Prijava na razpravo + unsubscribe: + heading: Se želite odjaviti od naslednje razprave o naboru sprememb? + button: Odjava od razprave + heading: + title: Nabor sprememb %{id} + created_by_html: Ustvaril %{link_user} dne %{created}. + no_such_entry: + title: Ni takega nabora sprememb + heading: Zapisa z id-jem %{id} ni + body: Oprostite, nabora sprememb z oznako %{id} ni. Prosimo, preverite črkovanje + in povezavo, ki ste jo kliknili. + show: + title: 'Nabor sprememb: %{id}' + created_ago_html: Ustvaril_a %{time_ago} + closed_ago_html: Zaprto %{time_ago} + created_ago_by_html: Ustvaril %{user} %{time_ago} + closed_ago_by_html: Zaprl_a %{time_ago} %{user} + discussion: Pogovor + join_discussion: Prijavite se za pridružitev pogovoru + still_open: Nabor sprememb je še vedno odprt – pogovor se bo začel, ko bo nabor + sprememb zaprt. + comment_by_html: Komentar %{user} %{time_ago} + hidden_comment_by_html: Skrit komentar %{user} %{time_ago} + changesetxml: Nabor sprememb XML + osmchangexml: osmChange XML + paging_nav: + nodes: Vozlišč (%{count}) + nodes_paginated: Vozlišča (%{x}-%{y} od %{count}) + ways: Poti (%{count}) + ways_paginated: Poti (%{x}-%{y} od %{count}) + relations: Relacije (%{count}) + relations_paginated: Zveze (%{x}-%{y} od %{count}) timeout: sorry: Žal je trajalo pridobivanje zahtevanega nabora sprememb predolgo. changeset_comments: @@ -668,7 +687,7 @@ sl: scopes: address: Ogled vašega fizičnega naslova email: Ogled vašega e-poštnega naslova - openid: Preverite pristnost svojega računa + openid: Avtenticirajte svoj račun phone: Ogled vaše telefonske številke profile: Ogled vaših profilnih podatkov errors: @@ -1639,6 +1658,7 @@ sl: more: Več user_mailer: diary_comment_notification: + description: Dnevniški vnos OpenStreetMap št. %{id} subject: '[OpenStreetMap] %{user} je komentiral dnevniški zapis' hi: Pozdravljeni, %{to_user}! header: '%{from_user} je komentiral zapis v dnevniku OpenStreetMap s temo %{subject}:' @@ -1719,6 +1739,7 @@ sl: click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla. note_comment_notification: + description: Opomba OpenStreetMap št. %{id} anonymous: Anonimni uporabnik greeting: Živijo, commented: @@ -1761,6 +1782,7 @@ sl: details: Več podatkov o opombi lahko najdete na %{url}. details_html: Več podatkov o opombi lahko najdete na %{url}. changeset_comment_notification: + description: Nabor sprememb OpenStreetMap št. %{id} hi: Pozdravljeni, %{to_user}, greeting: Pozdravljeni, commented: @@ -1781,10 +1803,9 @@ sl: partial_changeset_without_comment: brez komentarja details: Več podrobnosti o tem naboru sprememb lahko najdete na %{url}. details_html: Več podrobnosti o tem naboru sprememb lahko najdete na %{url}. - unsubscribe: Če se želite odnaročiti od obveščanja o tem naboru sprememb, obiščite - %{url} in kliknite »Odnaroči«. - unsubscribe_html: Če se želite odnaročiti od obveščanja o tem naboru sprememb, - obiščite %{url} in kliknite »Odnaroči«. + unsubscribe: Od obveščanja o tem naboru sprememb se lahko odnaročite na %{url}. + unsubscribe_html: Od obveščanja o tem naboru sprememb se lahko odnaročite na + %{url}. confirmations: confirm: heading: Preverite svojo e-pošto! @@ -1907,11 +1928,6 @@ sl: new password button: Pošlji mi novo geslo help_text: Vpišite e-poštni naslov, s katerim ste se registrirali. Poslali vam bomo povezavo za ponastavitev gesla. - create: - notice email on way: E-pismo z vsemi potrebnimi podatki za nastavitev novega - gesla je že na poti. - notice email cannot find: Oprostite, toda vnesenega e-poštnega naslova ni bilo - mogoče najti. edit: title: Ponastavitev gesla heading: Ponastavi geslo za %{user} @@ -2699,7 +2715,7 @@ sl: permissions: missing: Aplikaciji niste dovolili dostopa do te funkcije scopes: - openid: Vstop z uporabo OpenStreetMap + openid: Prijava z uporabo OpenStreetMap read_prefs: Branje uporabniških prilagoditev write_prefs: Spreminjanje uporabniških nastavitev write_diary: Ustvarjajte dnevniške zapise, komentarje in sklepajte prijateljstva @@ -2943,8 +2959,7 @@ sl: title: Račun zaklenjen heading: Račun zaklenjen support: podpora - automatically_suspended: Oprostite, vaš račun je bil blokiran zaradi sumljive - dejavnosti. + automatically_suspended: Vaš račun je bil žal blokiran zaradi sumljive dejavnosti. contact_support_html: To odločitev bo kmalu pregledal administrator, lahko pa se obrnete na %{support_link}, če se želite o tem pogovoriti. auth_failure: @@ -2955,7 +2970,7 @@ sl: invalid_scope: Neveljaven obseg unknown_error: Avtentikacija ni uspela auth_association: - heading: Vaš ID še ni povezan z računom OpenStreetMap. + heading: Vaš ID še ni povezan z OpenStreetMap računom. option_1: Če ste novi v OpenStreetMapu, prosimo, ustvarite nov račun z uporabo spodnjega obrazca. option_2: Če že imate račun, se lahko prijavite s svojim uporabniškim imenom diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 604314a0d..bb3a57ab6 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -156,8 +156,6 @@ sq: emailin tuaj për një shënim për të konfirmuar adresën e re të emailit tuaj. success: Informacioni i përdoruesit u përditësua me sukses. browse: - created: Krijuar - closed: Mbyllur version: Versioni in_changeset: Grupi i Ndryshimeve anonymous: Anonim @@ -167,19 +165,6 @@ sq: view_history: Shiko Historikun view_details: Shiko Detajet location: 'Vendndodhja:' - changeset: - title: 'Grupi i Ndryshimeve: %{id}' - belongs_to: Autori - node: Nyjet (%{count}) - node_paginated: Nyjet (%{x}-%{y} nga %{count}) - way: Mënyrat (%{count}) - way_paginated: Mënyrat (%{x}-%{y} nga %{count}) - relation: Marrëdhëniet (%{count}) - relation_paginated: Marrëdhëniet (%{x}-%{y} nga %{count}) - changesetxml: Grupi i ndryshimeve në XML - osmchangexml: osmNdrsyhimi XML - join_discussion: Identifikohuni për t'iu bashkuar diskutimit - discussion: Diskutim node: title_html: 'Nyja: %{name}' history_title_html: 'Historiku i nyjës: %{name}' @@ -277,6 +262,22 @@ sq: feed: title: 'Grupi i ndryshimeve: %{id}' title_comment: Grupi i ndryshimeve %{id} - %{comment} + created: Krijuar + closed: Mbyllur + belongs_to: Autori + show: + title: 'Grupi i Ndryshimeve: %{id}' + discussion: Diskutim + join_discussion: Identifikohuni për t'iu bashkuar diskutimit + changesetxml: Grupi i ndryshimeve në XML + osmchangexml: osmNdrsyhimi XML + paging_nav: + nodes: Nyjet (%{count}) + nodes_paginated: Nyjet (%{x}-%{y} nga %{count}) + ways: Mënyrat (%{count}) + ways_paginated: Mënyrat (%{x}-%{y} nga %{count}) + relations: Marrëdhëniet (%{count}) + relations_paginated: Marrëdhëniet (%{x}-%{y} nga %{count}) timeout: sorry: Na vjen keq, lista e ndryshimeve që ju kërkuat zgjati shumë për t'u rikuperuar. changeset_comments: @@ -1010,11 +1011,6 @@ sq: help_text: Shkruani adresën e emailit që keni përdorur për tu regjistruar, ne do të dërgojmë një lidhje të cilën mund të përdorni për të rivendosur fjalëkalimin tuaj. - create: - notice email on way: Na vjen keq e keni humbur atë :-( por një email është në - rrugëtim kështu që ju mund të rivendosni atë së shpejti. - notice email cannot find: Na vjen keq, ne nuk arritë ta gjejmë adresën e emailit - të dhënë. edit: title: Rivendos fjalëkalimin heading: Rivendos fjalëkalimin për %{user} diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 5ec3fd879..4e3932237 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -151,10 +151,6 @@ sr-Latn: da biste potvrdili svoju novu e-adresu. success: Podaci o korisniku su uspešno ažurirani. browse: - changeset: - title: Skup izmena - changesetxml: XML skup izmena - osmchangexml: osmChange XML relation_member: entry_role_html: '%{type} %{name} kao %{role}' type: @@ -218,6 +214,10 @@ sr-Latn: feed: title: Skup izmena %{id} title_comment: Skup izmena %{id} – %{comment} + show: + title: Skup izmena + changesetxml: XML skup izmena + osmchangexml: osmChange XML timeout: sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak. dashboards: @@ -894,9 +894,6 @@ sr-Latn: new password button: Poništi lozinku help_text: Unesite e-adresu koju ste uneli pri upisu, a mi ćemo vam poslati vezu pomoću koje možete da poništite lozinku. - create: - notice email on way: Poruka za poništavanje lozinke je poslata. - notice email cannot find: E-adresa nije pronađena. edit: title: Poništi lozinku heading: Poništavanje lozinke za %{user} diff --git a/config/locales/sr.yml b/config/locales/sr.yml index d091f1e86..d76c8f927 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -236,8 +236,9 @@ sr: auth: providers: none: Ниједан - google: Google + google: Гугл facebook: Фејсбук + microsoft: Мајкрософт github: GitHub wikipedia: Википедија api: @@ -309,11 +310,6 @@ sr: destroy: success: Налог је обрисан. browse: - created: Направљено - closed: Затворено - created_ago_html: Направљено %{time_ago} - closed_ago_html: Затворено %{time_ago} - created_ago_by_html: Направљено %{time_ago} од %{user} edited_ago_by_html: Уређено %{time_ago} од %{user} version: Верзија in_changeset: Скуп промена @@ -324,21 +320,6 @@ sr: view_history: Погледај историју view_details: Детаљније location: 'Локација:' - changeset: - title: 'Скуп промена: %{id}' - belongs_to: Аутор - node: Тачке (%{count}) - node_paginated: Тачке (%{x}-%{y} од %{count}) - way: Линије (%{count}) - way_paginated: Линије (%{x}-%{y} од %{count}) - relation: Односи (%{count}) - relation_paginated: Односи (%{x}-%{y} од %{count}) - hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago} - comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}' - changesetxml: XML скуп промена - osmchangexml: osmChange XML - join_discussion: Пријавите се да бисте се придружили дискусији - discussion: Дискусија node: title_html: 'Тачка: %{name}' history_title_html: 'Историја тачака: %{name}' @@ -436,6 +417,27 @@ sr: feed: title: Скуп промена %{id} title_comment: Скуп промена %{id} – %{comment} + created: Направљено + closed: Затворено + belongs_to: Аутор + show: + title: 'Скуп промена: %{id}' + created_ago_html: Направљено %{time_ago} + closed_ago_html: Затворено %{time_ago} + created_ago_by_html: Направљено %{time_ago} од %{user} + discussion: Дискусија + join_discussion: Пријавите се да бисте се придружили дискусији + comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}' + hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago} + changesetxml: XML скуп промена + osmchangexml: osmChange XML + paging_nav: + nodes: Тачке (%{count}) + nodes_paginated: Тачке (%{x}-%{y} од %{count}) + ways: Линије (%{count}) + ways_paginated: Линије (%{x}-%{y} од %{count}) + relations: Односи (%{count}) + relations_paginated: Односи (%{x}-%{y} од %{count}) timeout: sorry: Преузимање захтеваних скупова промена је трајало предуго. changeset_comments: @@ -1155,6 +1157,7 @@ sr: mobile_phone: Продавница мобилних телефона motorcycle: Продавница мотоцикала music: Музичка продавница + musical_instrument: Музички инструменти newsagent: Новинарница optician: Оптичар organic: Продавница здраве хране @@ -1531,6 +1534,7 @@ sr: heading: my_inbox: Примљене my_outbox: Послате + muted_messages: Пригушене поруке mark: as_read: Порука је означена као прочитана as_unread: Порука је означена као непрочитана @@ -1544,9 +1548,6 @@ sr: new password button: Поништи лозинку help_text: Унесите е-адресу коју сте унели при упису, а ми ћемо вам послати везу помоћу које можете да поништите лозинку. - create: - notice email on way: Порука за поништавање лозинке је послата. - notice email cannot find: Имејл адреса није пронађена, жао нам је. edit: title: Поништи лозинку heading: Поништавање лозинке за %{user} @@ -2383,6 +2384,7 @@ sr: previous: « Претходно user_mutes: index: + title: Пригушени корисници table: thead: actions: Радње diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 2f18d5892..734a6f454 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -367,12 +367,6 @@ sv: destroy: success: Kontot har raderats. browse: - created: Skapad - closed: Stängd - created_ago_html: Skapades %{time_ago} - closed_ago_html: Stängdes %{time_ago} - created_ago_by_html: Skapades %{time_ago} av %{user} - closed_ago_by_html: Stängdes %{time_ago} av %{user} deleted_ago_by_html: Raderades %{time_ago} av %{user} edited_ago_by_html: Redigerades %{time_ago} av %{user} version: Version @@ -390,23 +384,6 @@ sv: view_history: Visa historik view_details: Visa detaljer location: 'Plats:' - changeset: - title: 'Ändringsuppsättning: %{id}' - belongs_to: Författare - node: Noder (%{count}) - node_paginated: Noder (%{x}-%{y} av %{count}) - way: Sträckor (%{count}) - way_paginated: Sträckor (%{x}-%{y} av %{count}) - relation: Förbindelser (%{count}) - relation_paginated: Förbindelser (%{x}-%{y} av %{count}) - hidden_comment_by_html: Dold kommentar från %{user} %{time_ago} - comment_by_html: Kommenterades från %{user} %{time_ago} - changesetxml: XML för ändringsuppsättning - osmchangexml: osmChange XML - join_discussion: Logga in för att delta i diskussionen - discussion: Diskussion - still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer - att öppnas när ändringsuppsättning har stängts. node: title_html: 'Nod: %{name}' history_title_html: 'Nodhistorik: %{name}' @@ -524,6 +501,30 @@ sv: feed: title: Ändringsuppsättning %{id} title_comment: Ändringsset %{id} - %{comment} + created: Skapad + closed: Stängd + belongs_to: Författare + show: + title: 'Ändringsuppsättning: %{id}' + created_ago_html: Skapades %{time_ago} + closed_ago_html: Stängdes %{time_ago} + created_ago_by_html: Skapades %{time_ago} av %{user} + closed_ago_by_html: Stängdes %{time_ago} av %{user} + discussion: Diskussion + join_discussion: Logga in för att delta i diskussionen + still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer + att öppnas när ändringsuppsättning har stängts. + comment_by_html: Kommenterades från %{user} %{time_ago} + hidden_comment_by_html: Dold kommentar från %{user} %{time_ago} + changesetxml: XML för ändringsuppsättning + osmchangexml: osmChange XML + paging_nav: + nodes: Noder (%{count}) + nodes_paginated: Noder (%{x}-%{y} av %{count}) + ways: Sträckor (%{count}) + ways_paginated: Sträckor (%{x}-%{y} av %{count}) + relations: Förbindelser (%{count}) + relations_paginated: Förbindelser (%{x}-%{y} av %{count}) timeout: sorry: Kunde tyvärr inte lista begärda ändringsuppsättningar. Begäran tog för lång tid att hämta. @@ -1880,10 +1881,6 @@ sv: new password button: Återställ lösenord help_text: Ange e-postadressen du använde för att registrera dig så skickar vi en länk till den som du kan använda för att återställa ditt lösenord. - create: - notice email on way: Ledsen att du tappade bort det :-( men ett mejl är på väg - så du kan återställa det snart. - notice email cannot find: Kunde inte hitta den e-postadressen, tyvärr. edit: title: Återställ lösenord heading: Återställ lösenord för %{user} diff --git a/config/locales/ta.yml b/config/locales/ta.yml index e34397786..c9b510dc0 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -12,6 +12,7 @@ # Author: Rakeshonwiki # Author: Sank # Author: Shanmugamp7 +# Author: Sriveenkat # Author: Surya Prakash.S.A. # Author: TRYPPN # Author: தமிழ்க்குரிசில் @@ -168,6 +169,26 @@ ta: remote: name: தொலைவுக் கட்டுப்பாடு description: தொலைவு கட்டுப்பாடு (JOSM அல்லது Merkaartor) + auth: + providers: + google: கூகுள் + facebook: முகநூல் + github: கிட்ஹப் + wikipedia: விக்கிப்பீடியா + api: + notes: + comment: + opened_at_html: '%{when} உருவாக்கப்பட்டது' + opened_at_by_html: '%{when} %{user} பயனரால் உருவாக்கப்பட்டது' + account: + deletions: + show: + title: எமது கணக்கை நீக்கு + warning: எச்சரிக்கை! கணக்கு நீக்குதல் செயல்முறை இறுதியானது, அதை மாற்ற முடியாது. + delete_account: கணக்கை நீக்குக + delete_introduction: 'கீழே உள்ள பொத்தானைப் பயன்படுத்தி உங்கள் ஓபன்ஸ்ட்ரீட்மேப் + கணக்கை நீக்கலாம். பின்வரும் விவரங்களைக் கவனியுங்கள்:' + cancel: கைவிடுக accounts: edit: title: கணக்கை திருத்து @@ -175,23 +196,28 @@ ta: current email address: 'தற்பொழுதுள்ள மின்னஞ்சல் முகவரி:' openid: link text: இது என்ன? + public editing: + enabled link text: இது என்ன? contributor terms: link text: இது என்ன? save changes button: மாற்றங்களைச் சேமி + go_public: + email_not_revealed: உங்கள் மின்னஞ்சல் முகவரி பொதுவில் வெளியிடப்படாது. + not_reversible: இந்தச் செயலை மாற்றியமைக்க முடியாது, அனைத்து புதிய பயனர்களும் + இயல்பாகவே பொதுவில் உள்ளனர். + update: + success: பயனர் தகவல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது. + destroy: + success: பயனர் கணக்கு நீக்கப்பட்டது. browse: - created: உருவாக்கப்பட்டது - closed: மூடப்பட்டது + deleted_ago_by_html: '%{user} பயனரால் %{time_ago} நீக்கப்பட்டது' + edited_ago_by_html: '%{user} ஆல் %{time_ago} திருத்தப்பட்டது' version: பதிப்பு in_changeset: மாற்றங்கள் anonymous: அடையாளமற்றவர் + view_history: வரலாற்றைக் காண்க view_details: விவரங்களைக் காட்டு location: 'இடம்:' - changeset: - title: 'மாற்றங்கள்: %{id}' - belongs_to: ஆசிரியர் - changesetxml: மாற்றத்தொடுப்பு XML - osmchangexml: osmChange XML - discussion: உரையாடல் relation: members: உறுப்பினர்கள் relation_member: @@ -204,6 +230,7 @@ ta: entry_html: தொடர்பு %{relation_name} entry_role_html: தொடர்பு %{relation_name} (%{relation_role} ஆக) not_found: + title: காணப்படவில்லை sorry: மன்னிக்கவும், %{id} என்ற அடையாளம் கொண்ட %{type} கிடைக்கவில்லை. type: node: முனையம் @@ -251,6 +278,14 @@ ta: feed: title: 'மாற்றங்கள்: %{id}' title_comment: மாற்றங்கள் %{id}-%{comment} + created: உருவாக்கப்பட்டது + closed: மூடப்பட்டது + belongs_to: ஆசிரியர் + show: + title: 'மாற்றங்கள்: %{id}' + discussion: உரையாடல் + changesetxml: மாற்றத்தொடுப்பு XML + osmchangexml: osmChange XML dashboards: contact: km away: '%{count}கிமீ தாண்டி' diff --git a/config/locales/te.yml b/config/locales/te.yml index e440515d6..57aceabab 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -305,8 +305,6 @@ te: destroy: success: ఖాతాను తొలగించాం. browse: - created: 'సృష్టించబడినది:' - closed: ముగించబడింది version: సంచిక in_changeset: మార్పులసమితి anonymous: అజ్ఞాత @@ -322,20 +320,6 @@ te: view_history: చరిత్రను చూడండి view_details: వివరాలను చూడండి location: 'ప్రాంతం:' - changeset: - title: 'మార్పులసమితి: %{id}' - belongs_to: రచయిత - node: బుడిపెలు (%{count}) - node_paginated: బుడిపెలు (%{count} లో %{x}-%{y}) - way: మార్గాలు (%{count}) - way_paginated: దారులు (%{count} లో %{x}-%{y}) - relation: సంబంధాలు (%{count}) - relation_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు' - changesetxml: మార్పులసమితి XML - osmchangexml: osmChange XML - join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి - discussion: చర్చ - still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది. node: title_html: 'బిందువు: %{name}' history_title_html: 'బుడిపె చరిత్ర: %{name}' @@ -438,6 +422,23 @@ te: feed: title: మార్పులసమితి %{id} title_comment: మార్పులసమితి %{id} - %{comment} + created: 'సృష్టించబడినది:' + closed: ముగించబడింది + belongs_to: రచయిత + show: + title: 'మార్పులసమితి: %{id}' + discussion: చర్చ + join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి + still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది. + changesetxml: మార్పులసమితి XML + osmchangexml: osmChange XML + paging_nav: + nodes: బుడిపెలు (%{count}) + nodes_paginated: బుడిపెలు (%{count} లో %{x}-%{y}) + ways: మార్గాలు (%{count}) + ways_paginated: దారులు (%{count} లో %{x}-%{y}) + relations: సంబంధాలు (%{count}) + relations_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు' timeout: sorry: సారీ, మీరడిగిన మార్పులసమితుల జాబితాను తేవడంలో చాలా సమయం పట్టింది. changeset_comments: @@ -1709,10 +1710,6 @@ te: new password button: సంకేతపదాన్ని మార్చు help_text: నమోదైనపుడు మీరిచ్చిన ఈమెయిలు చిరునామాను ఇవ్వండి. సంకేతపదాన్ని మార్చుకునే లింకును ఆ చిరునామాకు పంపిస్తాం. - create: - notice email on way: అయ్యో.. పోయిందా :-( పోన్లెండి, దాన్ని మార్చుకునేందుకు ఒక - ఈమెయిలు వచ్చేస్తోంది. - notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు. edit: title: సంకేతపదం మార్పు heading: '%{user} సంకేతపదాన్ని మార్చు' diff --git a/config/locales/th.yml b/config/locales/th.yml index e2e19e3a6..4cb4befd4 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -274,12 +274,6 @@ th: destroy: success: ลบบัญชีแล้ว browse: - created: สร้างเมื่อ - closed: ปิดเมื่อ - created_ago_html: สร้างเมื่อ %{time_ago} - closed_ago_html: ปิดเมื่อ %{time_ago} - created_ago_by_html: สร้างเมื่อ %{time_ago} โดย %{user} - closed_ago_by_html: ปิดเมื่อ %{time_ago} โดย %{user} deleted_ago_by_html: ลบเมื่อ %{time_ago} โดย %{user} edited_ago_by_html: แก้ไขเมื่อ %{time_ago} โดย %{user} version: รุ่นที่ @@ -295,22 +289,6 @@ th: view_history: ดูประวัติ view_details: ดูรายละเอียด location: 'ที่ตั้ง:' - changeset: - title: 'ชุดการเปลี่ยนแปลง: %{id}' - belongs_to: ผู้สร้างสรรค์ - node: หมุด (%{count}) - node_paginated: หมุดที่ (%{x}-%{y} จากทั้งหมด %{count}) - way: เส้นทาง (%{count}) - way_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count}) - relation: ความสัมพันธ์ (%{count}) - relation_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count}) - hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago} - comment_by_html: ความคิดเห็นจาก %{user} %{time_ago} - changesetxml: ชุดการเปลี่ยนแปลง XML - osmchangexml: เอ็กซ์เอ็มแอลของ osmChange - join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย - discussion: การอภิปราย - still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว node: title_html: 'หมุด: %{name}' history_title_html: 'ประวัติหมุด: %{name}' @@ -412,6 +390,29 @@ th: feed: title: ชุดการเปลี่ยนแปลง %{id} title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment} + created: สร้างเมื่อ + closed: ปิดเมื่อ + belongs_to: ผู้สร้างสรรค์ + show: + title: 'ชุดการเปลี่ยนแปลง: %{id}' + created_ago_html: สร้างเมื่อ %{time_ago} + closed_ago_html: ปิดเมื่อ %{time_ago} + created_ago_by_html: สร้างเมื่อ %{time_ago} โดย %{user} + closed_ago_by_html: ปิดเมื่อ %{time_ago} โดย %{user} + discussion: การอภิปราย + join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย + still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว + comment_by_html: ความคิดเห็นจาก %{user} %{time_ago} + hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago} + changesetxml: ชุดการเปลี่ยนแปลง XML + osmchangexml: เอ็กซ์เอ็มแอลของ osmChange + paging_nav: + nodes: หมุด (%{count}) + nodes_paginated: หมุดที่ (%{x}-%{y} จากทั้งหมด %{count}) + ways: เส้นทาง (%{count}) + ways_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count}) + relations: ความสัมพันธ์ (%{count}) + relations_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count}) timeout: sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น changeset_comments: @@ -1420,8 +1421,6 @@ th: heading: ลืมรหัสผ่านหรือ? email address: 'ที่อยู่อีเมล:' new password button: ตั้งรหัสผ่านใหม่ - create: - notice email cannot find: ขออภัย, ไม่พบที่อยู่อีเมลที่ระบุ edit: title: ตั้งรหัสผ่านใหม่ heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}' diff --git a/config/locales/tl.yml b/config/locales/tl.yml index c1d1f810d..5298b5e36 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -268,8 +268,6 @@ tl: ng e-liham. success: Matagumpay na naisapanahon ang kabatiran sa tagagamit. browse: - created: Nilikha - closed: Isinara version: Bersyon in_changeset: Pangkat ng pagbabago anonymous: Hindi nagpapakilala (anonimo) @@ -285,21 +283,6 @@ tl: view_history: Tingnan ang kasaysayan view_details: Tingnan ang mga detalye location: Pook (lokasyon) - changeset: - title: 'Pangkat ng pagbabago: %{id}' - belongs_to: May-akda - node: Mga buko (%{count}) - node_paginated: Mga buko (%{x}-%{y} ng %{count}) - way: Mga daan (%{count}) - way_paginated: Mga daan (%{x}-%{y} ng %{count}) - relation: Mga kaugnayan (%{count}) - relation_paginated: Mga kaugnayan (%{x}-%{y} ng %{count}) - changesetxml: XML ng pangkat ng pagbabago - osmchangexml: XML ng osmChange - join_discussion: Lumagda para sumali sa talakayan - discussion: Talakayan - still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan - pag naisara na ang pangkat ng pagbabago. node: title_html: 'Buko: %{name}' history_title_html: 'Kasaysayan ng Buko: %{name}' @@ -403,6 +386,24 @@ tl: feed: title: '%{id} ng pangkat ng pagbabago' title_comment: '%{id} ng angkat ng pagbabago - %{comment}' + created: Nilikha + closed: Isinara + belongs_to: May-akda + show: + title: 'Pangkat ng pagbabago: %{id}' + discussion: Talakayan + join_discussion: Lumagda para sumali sa talakayan + still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan + pag naisara na ang pangkat ng pagbabago. + changesetxml: XML ng pangkat ng pagbabago + osmchangexml: XML ng osmChange + paging_nav: + nodes: Mga buko (%{count}) + nodes_paginated: Mga buko (%{x}-%{y} ng %{count}) + ways: Mga daan (%{count}) + ways_paginated: Mga daan (%{x}-%{y} ng %{count}) + relations: Mga kaugnayan (%{count}) + relations_paginated: Mga kaugnayan (%{x}-%{y} ng %{count}) timeout: sorry: Paumanhin, ang talaan ng mga pangkat ng pagbabagong hiniling mo ay naging napakatagal bago nakuhang muli. @@ -1432,10 +1433,6 @@ tl: help_text: Ipasok ang tirahan ng e-liham na ginamit mo upang magpatala, ipapadala namin ang isang kawing papunta rito na magagamit mo upang muling maitakda mo ang iyong password. - create: - notice email on way: Ikinalulungkot na naiwala mo iyan :-( ngunit darating na - ang isang e-liham upang maitakda mong muli iyan kaagad. - notice email cannot find: Hindi matagpuan ang ganyang tirahan ng e-liham, paumanhin. edit: title: Muling itakda ang password heading: Muling itakda ang Hudyat para kay %{user} diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 31b5d7853..1096e8619 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -254,9 +254,6 @@ tr: x_years: one: '%{count} yıl önce' other: '%{count} yıl önce' - printable_name: - version: v%{version} - current_and_old_links_html: '%{current_link}, %{old_link}' editor: default: Varsayılan (şu anda %{name}) id: @@ -370,15 +367,10 @@ tr: destroy: success: Hesap Silindi. browse: - created: Oluşturulma - closed: Kapandı - created_ago_html: '%{time_ago} oluşturuldu' - closed_ago_html: '%{time_ago} kapatıldı' - created_ago_by_html: '%{user} tarafından %{time_ago} oluşturuldu' - closed_ago_by_html: '%{user} tarafından %{time_ago} kapatıldı' deleted_ago_by_html: '%{user} tarafından %{time_ago} silindi' edited_ago_by_html: '%{user} tarafından %{time_ago} düzenlendi' version: Sürüm + redacted_version: Düzenlenmiş Sürüm in_changeset: Değişiklik Kaydı anonymous: anonim no_comment: (yorum yok) @@ -391,25 +383,11 @@ tr: other: '%{count} yol' download_xml: XML İndir view_history: Geçmişi Görüntüle + view_unredacted_history: Düzenlenmemiş Geçmişi Görüntüle view_details: Ayrıntıları Görüntüle + view_redacted_data: Düzenlenmiş Veriyi Görüntüle + view_redaction_message: Düzenlenmiş Mesajı Görüntüle location: 'Konum:' - changeset: - title: 'Değişiklik kaydı: %{id}' - belongs_to: Yazar - node: Noktalar (%{count}) - node_paginated: Nokta (%{x}-%{y} - toplam %{count}) - way: Yollar (%{count}) - way_paginated: Yol (%{x}-%{y} - toplam %{count}) - relation: İlişkiler (%{count}) - relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count}) - hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum' - comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum' - changesetxml: ' XML değişiklik kaydı' - osmchangexml: osmChange XML - join_discussion: Tartışmaya katılmak için lütfen giriş yapın - discussion: Tartışma - still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında - açılacaktır. node: title_html: 'Nokta: %{name}' history_title_html: 'Nokta Geçmişi: %{name}' @@ -527,6 +505,46 @@ tr: feed: title: Değişiklik kaydı %{id} title_comment: Değişiklik takımı %{id} - %{comment} + created: Oluşturulma + closed: Kapandı + belongs_to: Yazar + subscribe: + heading: Aşağıdaki değişiklik kaydı tartışmasına abone olmak ister misiniz? + button: Tartışmaya abone ol + unsubscribe: + heading: Aşağıdaki değişiklik kaydı tartışmasının aboneliği iptal edilsin mi? + button: Tartışma aboneliğinden çık + heading: + title: Değişiklik Kaydı %{id} + created_by_html: '%{link_user} tarafından %{created} tarihinde oluşturuldu.' + no_such_entry: + title: Böyle bir değişiklik kaydı yok + heading: 'Şu kimliğe sahip girdi yok: %{id}' + body: Üzgünüz, %{id} kimliğine sahip herhangi bir değişiklik kaydı yok. Lütfen + yazımınızı kontrol edin ya da tıkladığınız bağlantı yanlış olabilir. + show: + title: 'Değişiklik kaydı: %{id}' + created: 'Oluşturma: %{when}' + closed: 'Kapanma: %{when}' + created_ago_html: '%{time_ago} oluşturuldu' + closed_ago_html: '%{time_ago} kapatıldı' + created_ago_by_html: '%{user} tarafından %{time_ago} oluşturuldu' + closed_ago_by_html: '%{user} tarafından %{time_ago} kapatıldı' + discussion: Tartışma + join_discussion: Tartışmaya katılmak için lütfen giriş yapın + still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında + açılacaktır. + comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum' + hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum' + changesetxml: ' XML değişiklik kaydı' + osmchangexml: osmChange XML + paging_nav: + nodes: Noktalar (%{count}) + nodes_paginated: Nokta (%{x}-%{y} - toplam %{count}) + ways: Yollar (%{count}) + ways_paginated: Yol (%{x}-%{y} - toplam %{count}) + relations: İlişkiler (%{count}) + relations_paginated: İlişkiler (%{x}-%{y} - toplam %{count}) timeout: sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü. changeset_comments: @@ -601,7 +619,7 @@ tr: kontrol edin ya da tıkladığınız bağlantı hatalı olabilir. diary_entry: posted_by_html: '%{link_user} tarafından %{created} tarihinde %{language_link} - dilinde gönderildi.' + olarak gönderildi.' updated_at_html: En son %{updated} tarihinde güncellendi. comment_link: Bu girdiyi yorumla reply_link: Yazara mesaj gönder @@ -615,7 +633,7 @@ tr: confirm: Onayla report: Bu girdiyi bildir diary_comment: - comment_from_html: '%{comment_created_at} tarihinde %{link_user} tarafından + comment_from_html: '%{link_user} tarafından %{comment_created_at} tarihinde yapılan yorum' hide_link: Bu yorumu gizle unhide_link: Bu yorumu göster @@ -630,9 +648,9 @@ tr: title: '%{user} için OpenStreetMap günlük girdileri' description: '%{user} kullanıcısının en yeni OpenStreetMap günlük girdileri' language: - title: '%{language_name} dillindeki OpenStreetMap günlük girdileri' - description: OpenStreetMap kullanıcılarının %{language_name} dillindeki en - son günlük girdileri + title: '%{language_name} OpenStreetMap günlük girdileri' + description: OpenStreetMap kullanıcılarının en son %{language_name} günlük + girdileri all: title: OpenStreetMap günlük girdileri description: OpenStreetMap kullanıcıların en son günlük girdileri @@ -1650,6 +1668,7 @@ tr: more: Daha fazla user_mailer: diary_comment_notification: + description: 'OpenStreetMap Günlük Girdisi #%{id}' subject: '[OpenStreetMap] %{user}, bir günlük girdisi hakkında yorum yaptı.' hi: Merhaba %{to_user}, header: '%{from_user}, %{subject} konulu OpenStreetMap günlük girdisi hakkında @@ -1725,6 +1744,7 @@ tr: click_the_link: Bu sizseniz, lütfen parolanızı sıfırlamak için aşağıdaki bağlantıya tıklayın. note_comment_notification: + description: 'OpenStreetMap Notu #%{id}' anonymous: Anonim kullanıcı greeting: Merhaba, commented: @@ -1767,6 +1787,7 @@ tr: details: Not hakkındaki ayrıntılı bilgiler %{url} bağlantısında görülebilir. details_html: Notla ilgili daha fazla ayrıntı %{url} adresinde bulunabilir. changeset_comment_notification: + description: 'OpenStreetMap Değişiklik Kaydı #%{id}' hi: Merhaba %{to_user}, greeting: Merhaba, commented: @@ -1788,10 +1809,10 @@ tr: details: Değişiklik kaydıyla ilgili daha fazla bilgi %{url} sayfasından edinebilirsiniz. details_html: Değişiklik kümesiyle ilgili daha fazla ayrıntı %{url} adresinde bulunabilir. - unsubscribe: Bu değişiklik kaydının güncellemelerini aboneliğinizden çıkarmak - için %{url} sayfasını ziyaret edin ve "Aboneliği iptal et"i tıklayın. - unsubscribe_html: Bu değişiklik kümesiyle ilgili güncellemelerden çıkmak için - %{url} adresini ziyaret edin ve "Abonelikten çık" seçeneğine tıklayın. + unsubscribe: Bu değişiklik kaydındaki güncellemelere ilişkin aboneliğinizi %{url} + adresinden iptal edebilirsiniz. + unsubscribe_html: Bu değişiklik kaydındaki güncellemelere ilişkin aboneliğinizi + %{url} adresinden iptal edebilirsiniz. confirmations: confirm: heading: E-postalarını kontrol et! @@ -1909,9 +1930,8 @@ tr: help_text: Kaydolmak için kullandığınız e-posta adresini girin, şifrenizi sıfırlamak için kullanabileceğiniz bir bağlantı yollayacağız. create: - notice email on way: Maalesef şifrenizi kaybettiniz :-( Ancak yeni bir e-posta - yolda böylece şifreniziyakında sıfırlayabilirsiniz. - notice email cannot find: 'Üzgünüz: bu e-posta adresi bulunamadı.' + send_paranoid_instructions: E-posta adresiniz veritabanımızda mevcutsa birkaç + dakika içinde e-posta adresinize bir şifre kurtarma bağlantısı gönderilecektir. edit: title: Parolayı sıfırla heading: '%{user} İçin Parolayı Sıfırlayın' diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 074631aa5..1830a614a 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -313,12 +313,6 @@ tt: destroy: success: Хисапъязма бетерелде. browse: - created: Төзелгән - closed: Ябык - created_ago_html: 'Күпме вакыт элек ясалды: %{time_ago}' - closed_ago_html: 'Күпме вакыт элек ябылды: %{time_ago}' - created_ago_by_html: 'Күпме вакыт элек ясалды: %{time_ago}, кем тарафыннан: %{user}' - closed_ago_by_html: 'Күпме вакыт элек ябылды: %{time_ago}, кем тарафыннан: %{user}' deleted_ago_by_html: 'Күпме вакыт элек бетерелде: %{time_ago}, кем тарафыннан: %{user}' edited_ago_by_html: 'Күпме вакыт элек үзгәртелде: %{time_ago}, кем тарафыннан: @@ -338,23 +332,6 @@ tt: view_history: Тарихын карау view_details: Тулырак мәгълүмат location: 'Урын:' - changeset: - title: 'Үзгәртүләр өеме: %{id}' - belongs_to: Автор - node: Нокталар (%{count}) - node_paginated: Нокталар (%{count} ноктадан %{x}-%{y}) - way: Сызыклар (%{count}) - way_paginated: Сызыклар (%{count} сызыктан %{x}-%{y}) - relation: Мөнәсәбәтләр (%{count}) - relation_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y}) - hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}' - comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}' - changesetxml: Үзгәртүләр өеменең XMLы - osmchangexml: osmChange XML - join_discussion: Бәхәстә катнашу өчен хисапъязмагызга керегез - discussion: Фикер алышу - still_open: Үзгәртүләр өеме әлегә ачык. Ул ябылгач бәхәскә шунда ук керергә - мөмкин булыр. node: title_html: 'Нокта: %{name}' history_title_html: 'Нокта тарихы: %{name}' @@ -427,6 +404,31 @@ tt: feed: title: '%{id} үзгәртүләр өеме' title_comment: '%{id} үзгәртүләр өеме - %{comment}' + created: Төзелгән + closed: Ябык + belongs_to: Автор + show: + title: 'Үзгәртүләр өеме: %{id}' + created_ago_html: 'Күпме вакыт элек ясалды: %{time_ago}' + closed_ago_html: 'Күпме вакыт элек ябылды: %{time_ago}' + created_ago_by_html: 'Күпме вакыт элек ясалды: %{time_ago}, кем тарафыннан: + %{user}' + closed_ago_by_html: 'Күпме вакыт элек ябылды: %{time_ago}, кем тарафыннан: %{user}' + discussion: Фикер алышу + join_discussion: Бәхәстә катнашу өчен хисапъязмагызга керегез + still_open: Үзгәртүләр өеме әлегә ачык. Ул ябылгач бәхәскә шунда ук керергә + мөмкин булыр. + comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}' + hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}' + changesetxml: Үзгәртүләр өеменең XMLы + osmchangexml: osmChange XML + paging_nav: + nodes: Нокталар (%{count}) + nodes_paginated: Нокталар (%{count} ноктадан %{x}-%{y}) + ways: Сызыклар (%{count}) + ways_paginated: Сызыклар (%{count} сызыктан %{x}-%{y}) + relations: Мөнәсәбәтләр (%{count}) + relations_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y}) dashboards: contact: latest_edit_html: 'Соңгы төзәтмә (%{ago}):' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 4fe97ebea..2fef0aeb3 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -392,12 +392,6 @@ uk: destroy: success: Обліковий запис видалено. browse: - created: Створено - closed: Закрито - created_ago_html: Створено %{time_ago} - closed_ago_html: Закрито %{time_ago} - created_ago_by_html: Створив(ла) %{user} %{time_ago} - closed_ago_by_html: Закрив(ла) %{time_ago} %{user} deleted_ago_by_html: Вилучив(ла) %{time_ago} %{user} edited_ago_by_html: Змінено %{user} %{time_ago} version: Версія @@ -419,23 +413,6 @@ uk: view_history: Перегляд історії view_details: Поточна інформація location: 'Координати:' - changeset: - title: 'Набір змін: %{id}' - belongs_to: Автор - node: Точки (%{count}) - node_paginated: Точки (%{x}-%{y} із %{count}) - way: Лінії (%{count}) - way_paginated: Лінії (%{x}-%{y} із %{count}) - relation: Зв’язки (%{count}) - relation_paginated: Зв’язки (%{x}-%{y} із %{count}) - hidden_comment_by_html: Прихований коментар від %{user} %{time_ago} - comment_by_html: Коментар від %{user} %{time_ago} - changesetxml: XML опис набору змін - osmchangexml: osmChange XML - join_discussion: Увійдіть в систему, щоб приєднатися до обговорення - discussion: Обговорення - still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки - він стане закритим. node: title_html: 'Точка: %{name}' history_title_html: 'Історія точки: %{name}' @@ -550,6 +527,30 @@ uk: feed: title: Набір змін %{id} title_comment: Набір змін %{id} — %{comment} + created: Створено + closed: Закрито + belongs_to: Автор + show: + title: 'Набір змін: %{id}' + created_ago_html: Створено %{time_ago} + closed_ago_html: Закрито %{time_ago} + created_ago_by_html: Створив(ла) %{user} %{time_ago} + closed_ago_by_html: Закрив(ла) %{time_ago} %{user} + discussion: Обговорення + join_discussion: Увійдіть в систему, щоб приєднатися до обговорення + still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки + він стане закритим. + comment_by_html: Коментар від %{user} %{time_ago} + hidden_comment_by_html: Прихований коментар від %{user} %{time_ago} + changesetxml: XML опис набору змін + osmchangexml: osmChange XML + paging_nav: + nodes: Точки (%{count}) + nodes_paginated: Точки (%{x}-%{y} із %{count}) + ways: Лінії (%{count}) + ways_paginated: Лінії (%{x}-%{y} із %{count}) + relations: Зв’язки (%{count}) + relations_paginated: Зв’язки (%{x}-%{y} із %{count}) timeout: sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу для завантаження. @@ -1925,10 +1926,6 @@ uk: new password button: Вишліть мені новий пароль help_text: Введіть адресу вашої електронної пошти, яку ви використовували для реєстрації, і ми надішлемо інструкції, як можна відновити ваш пароль. - create: - notice email on way: Шкода, що ви втратили пароль :-( але нічого, скоро прийде - лист і ви зможете перевстановити свій пароль. - notice email cannot find: На жаль, така адреса не зареєстрована. edit: title: Скидання пароля heading: Скидання пароля для %{user} diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 82df5b4fe..be8c2f827 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -312,12 +312,6 @@ vi: destroy: success: Đã Xóa Tài khoản browse: - created: Tạo - closed: Đóng - created_ago_html: Tạo %{time_ago} - closed_ago_html: Đóng %{time_ago} - created_ago_by_html: Tạo %{time_ago} bởi %{user} - closed_ago_by_html: Đóng %{time_ago} bởi %{user} deleted_ago_by_html: Xóa %{time_ago} bởi %{user} edited_ago_by_html: Sửa đổi %{time_ago} bởi %{user} version: Phiên bản @@ -333,23 +327,6 @@ vi: view_history: Xem Lịch sử view_details: Xem Chi tiết location: 'Vị trí:' - changeset: - title: 'Bộ thay đổi: %{id}' - belongs_to: Tác giả - node: Các nốt (%{count}) - node_paginated: Các nốt (%{x}–%{y} trên %{count}) - way: Các lối (%{count}) - way_paginated: Các lối (%{x}–%{y} trên %{count}) - relation: Các quan hệ (%{count}) - relation_paginated: Các quan hệ (%{x}–%{y} trên %{count}) - hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago} - comment_by_html: Nhận xét của %{user} từ %{time_ago} - changesetxml: Bộ thay đổi XML - osmchangexml: osmChange XML - join_discussion: Đăng nhập để tham gia thảo luận - discussion: Thảo luận - still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được - đóng. node: title_html: 'Nốt: %{name}' history_title_html: 'Lịch sử Nốt: %{name}' @@ -456,6 +433,30 @@ vi: feed: title: Bộ thay đổi %{id} title_comment: Bộ thay đổi %{id} – %{comment} + created: Tạo + closed: Đóng + belongs_to: Tác giả + show: + title: 'Bộ thay đổi: %{id}' + created_ago_html: Tạo %{time_ago} + closed_ago_html: Đóng %{time_ago} + created_ago_by_html: Tạo %{time_ago} bởi %{user} + closed_ago_by_html: Đóng %{time_ago} bởi %{user} + discussion: Thảo luận + join_discussion: Đăng nhập để tham gia thảo luận + still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được + đóng. + comment_by_html: Nhận xét của %{user} từ %{time_ago} + hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago} + changesetxml: Bộ thay đổi XML + osmchangexml: osmChange XML + paging_nav: + nodes: Các nốt (%{count}) + nodes_paginated: Các nốt (%{x}–%{y} trên %{count}) + ways: Các lối (%{count}) + ways_paginated: Các lối (%{x}–%{y} trên %{count}) + relations: Các quan hệ (%{count}) + relations_paginated: Các quan hệ (%{x}–%{y} trên %{count}) timeout: sorry: Rất tiếc, việc lấy danh sách bộ thay đổi tốn quá nhiều thì giờ. changeset_comments: @@ -1667,10 +1668,6 @@ vi: new password button: Đặt lại mật khẩu help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu. - create: - notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới - để bạn đặt nó lại. - notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử. edit: title: Đặt lại mật khẩu heading: Đặt lại Mật khẩu của %{user} diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml index 47efe981f..5dfe084d5 100644 --- a/config/locales/xmf.yml +++ b/config/locales/xmf.yml @@ -273,10 +273,6 @@ xmf: destroy: success: ანგარიშიქ დილასჷ. browse: - created: აკიქიმინუ - closed: კილერი - created_ago_html: გიჭყჷ %{time_ago} - closed_ago_html: გიჭყჷ %{time_ago} version: ვერსია in_changeset: თირაფეფიშ პაკეტი anonymous: ანონიმი @@ -292,21 +288,6 @@ xmf: view_history: ისტორიაშ ძირაფა view_details: დეტალეფიშ ძირაფა location: ორენიː - changeset: - title: 'თირაფეფიშ პაკეტი: %{id}' - belongs_to: ავტორი - node: ჭურჭულეფი (%{count}) - node_paginated: ჭურჭულეფი (%{x}-%{y} %{count}-შე) - way: ღოზეფი (%{count}) - way_paginated: ღოზეფი (%{x}-%{y} %{count}-შე) - relation: ურთიართობეფი (%{count}) - relation_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე) - changesetxml: თირუეფიშ პაკეტიშ XML - osmchangexml: osmChange XML - join_discussion: გემშართით სისტემაშა, თიშენ ნამჷ-და, სხუნუას ქაკათათინ - discussion: სხუნუა - still_open: თირუეფიშ პაკეტი დიო ღილე რე. სხუნუა ხემიოჭირინაფუ იჸი, მუჭო თირუეფიშ - პაკეტი დიკილუნ. node: title_html: 'ჭურჭული: %{name}' history_title_html: 'ჭურჭულიშ ისტორია: %{name}' @@ -412,6 +393,26 @@ xmf: feed: title: თირუეფიშ პაკეტი %{id} title_comment: თირუეფიშ პაკეტი %{id} - %{comment} + created: აკიქიმინუ + closed: კილერი + belongs_to: ავტორი + show: + title: 'თირაფეფიშ პაკეტი: %{id}' + created_ago_html: გიჭყჷ %{time_ago} + closed_ago_html: გიჭყჷ %{time_ago} + discussion: სხუნუა + join_discussion: გემშართით სისტემაშა, თიშენ ნამჷ-და, სხუნუას ქაკათათინ + still_open: თირუეფიშ პაკეტი დიო ღილე რე. სხუნუა ხემიოჭირინაფუ იჸი, მუჭო თირუეფიშ + პაკეტი დიკილუნ. + changesetxml: თირუეფიშ პაკეტიშ XML + osmchangexml: osmChange XML + paging_nav: + nodes: ჭურჭულეფი (%{count}) + nodes_paginated: ჭურჭულეფი (%{x}-%{y} %{count}-შე) + ways: ღოზეფი (%{count}) + ways_paginated: ღოზეფი (%{x}-%{y} %{count}-შე) + relations: ურთიართობეფი (%{count}) + relations_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე) timeout: sorry: სანარღოთ, თირუეფიშ პაკეტეფიშ ერკებული, ნამუთ თქვა მითხითჷნ, ძალამ დიდი ბორჯი ოკო გიშაღალარო. diff --git a/config/locales/yi.yml b/config/locales/yi.yml index d93073817..7a548b85b 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -65,8 +65,6 @@ yi: show: cancel: אַנולירן browse: - created: געשאַפֿן - closed: געשלאסן version: ווערסיע anonymous: אַנאנים no_comment: (קיין הערות) @@ -78,6 +76,10 @@ yi: changesets: changeset_paging_nav: showing_page: בלאַט %{page} + index: + feed: + created: געשאַפֿן + closed: געשלאסן geocoder: search_osm_nominatim: prefix: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 2fe9875a2..43ae11f07 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -378,12 +378,6 @@ zh-CN: destroy: success: 账户已删除。 browse: - created: 创建于 - closed: 关闭于 - created_ago_html: 创建于 %{time_ago} - closed_ago_html: 关闭于 %{time_ago} - created_ago_by_html: 由 %{user} 创建于 %{time_ago} - closed_ago_by_html: 由 %{user} 关闭于 %{time_ago} deleted_ago_by_html: 由 %{user} 删除于 %{time_ago} edited_ago_by_html: 由%{user} 编辑于 %{time_ago} version: 版本 @@ -401,22 +395,6 @@ zh-CN: view_history: 查看历史 view_details: 查看详情 location: 位置： - changeset: - title: 变更集：%{id} - belongs_to: 作者 - node: 节点 (%{count}) - node_paginated: 节点 (%{x}-%{y}，共 %{count}) - way: 路径 (%{count}) - way_paginated: 路径 (%{x}-%{y}，共 %{count}) - relation: 关系 (%{count}) - relation_paginated: 关系 (%{x}-%{y}，共 %{count}) - hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论' - comment_by_html: '%{user} 于 %{time_ago} 的评论' - changesetxml: 变更集 XML - osmchangexml: osmChange XML - join_discussion: 登录以加入讨论 - discussion: 讨论 - still_open: 变更集依然开放——一旦变更集关闭讨论将开放。 node: title_html: 节点：%{name} history_title_html: 节点历史：%{name} @@ -529,6 +507,42 @@ zh-CN: feed: title: 变更集 %{id} title_comment: 变更集 %{id} - %{comment} + created: 创建于 + closed: 关闭于 + belongs_to: 作者 + subscribe: + heading: 订阅以下变更集讨论吗？ + button: 订阅讨论 + unsubscribe: + heading: 退订以下变更集讨论吗？ + button: 退订讨论 + heading: + title: 变更集 %{id} + created_by_html: 由 %{link_user} 在 %{created} 创建。 + no_such_entry: + title: 无此变更集 + heading: 找不到ID为%{id}的文章 + body: 对不起，没有ID为 %{id} 的变更集。请检查您的拼写，或者可能是点击了错误的链接。 + show: + title: 变更集：%{id} + created_ago_html: 创建于 %{time_ago} + closed_ago_html: 关闭于 %{time_ago} + created_ago_by_html: 由 %{user} 创建于 %{time_ago} + closed_ago_by_html: 由 %{user} 关闭于 %{time_ago} + discussion: 讨论 + join_discussion: 登录以加入讨论 + still_open: 变更集依然开放——一旦变更集关闭讨论将开放。 + comment_by_html: '%{user} 于 %{time_ago} 的评论' + hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论' + changesetxml: 变更集 XML + osmchangexml: osmChange XML + paging_nav: + nodes: 节点 (%{count}) + nodes_paginated: 节点 (%{x}-%{y}，共 %{count}) + ways: 路径 (%{count}) + ways_paginated: 路径 (%{x}-%{y}，共 %{count}) + relations: 关系 (%{count}) + relations_paginated: 关系 (%{x}-%{y}，共 %{count}) timeout: sorry: 抱歉，您所请求的变更集列表检索时间过长。 changeset_comments: @@ -640,6 +654,12 @@ zh-CN: comment: 评论 newer_comments: 较新评论 older_comments: 较旧评论 + subscribe: + heading: 订阅以下日记讨论吗？ + button: 订阅讨论 + unsubscribe: + heading: 退订以下日记讨论吗？ + button: 退订讨论 doorkeeper: errors: messages: @@ -1623,12 +1643,15 @@ zh-CN: more: 更多 user_mailer: diary_comment_notification: + description: 'OpenStreetMap 日记 #%{id}' subject: '[OpenStreetMap] %{user} 在日记篇目留下了评论' hi: 您好，%{to_user}： header: '%{from_user} 评论了主题为 %{subject} 的 OpenStreetMap 日记文章：' header_html: '%{from_user} 评论了主题为 %{subject} 的 OpenStreetMap 日记文章：' footer: 您也可以通过%{readurl}来读取评论，并且在%{commenturl}来撰写评论或者通过%{replyurl}向作者发送消息 footer_html: 您也可以通过%{readurl}查看评论，并在%{commenturl}撰写评论或通过%{replyurl}向作者发送消息 + footer_unsubscribe: 您可访问%{unsubscribeurl}以从该讨论中退订。 + footer_unsubscribe_html: 您可访问%{unsubscribeurl}以从该讨论中退订。 message_notification: subject: '[OpenStreetMap] %{message_title}' hi: 您好，%{to_user}： @@ -1675,6 +1698,7 @@ zh-CN: hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 帐户密码。 click_the_link: 如果这是您，请点击下面的链接重置您的密码。 note_comment_notification: + description: 'OpenStreetMap 注记 #%{id}' anonymous: 匿名用户 greeting: 您好， commented: @@ -1701,6 +1725,7 @@ zh-CN: details: 更多关于笔记的详细信息可以在%{url}找到。 details_html: 更多关于笔记的详细信息可以在%{url}找到。 changeset_comment_notification: + description: 'OpenStreetMap 变更集 #%{id}' hi: 您好，%{to_user}： greeting: 您好， commented: @@ -1715,8 +1740,8 @@ zh-CN: partial_changeset_without_comment: 没有评论 details: 更多关于变更集的详细信息可以在 %{url} 找到。 details_html: 更多有关变更集的详细信息，请参见 %{url}。 - unsubscribe: 要从该变更集中退订，请访问%{url}，并点击“退订”。 - unsubscribe_html: 要从该变更集中退订，请访问%{url}，并点击“退订”。 + unsubscribe: 您可访问%{url}以从该变更集中退订。 + unsubscribe_html: 您可访问%{url}以从该变更集中退订。 confirmations: confirm: heading: 检查您的电子邮件！ @@ -1815,9 +1840,6 @@ zh-CN: email address: 电子邮件地址 new password button: 重置密码 help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，这样您就可以用它来重置密码。 - create: - notice email on way: 很遗憾您遗失了密码:-(不过一封电子邮件已经发往您的邮箱，您很快就可以重置密码了。 - notice email cannot find: 对不起，无法找到邮箱。 edit: title: 重置密码 heading: 重置%{user}的密码 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index e7bcfe949..0f5b241bf 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -285,11 +285,6 @@ zh-HK: view_history: 檢視歷史 view_details: 檢視詳細資料 location: 位置： - changeset: - title: 變更集：%{id} - belongs_to: 製作者 - changesetxml: 變更集XML - osmchangexml: osmChange格式XML relation_member: type: node: 節點 @@ -341,6 +336,11 @@ zh-HK: load_more: 載入更多 feed: title: 變更集 %{id} + belongs_to: 製作者 + show: + title: 變更集：%{id} + changesetxml: 變更集XML + osmchangexml: osmChange格式XML dashboards: show: nearby users: 其他附近的用戶 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index f109d7a80..ed1617944 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -245,7 +245,6 @@ zh-TW: one: '%{count} 年前' other: '%{count} 年前' printable_name: - version: v%{version} current_and_old_links_html: '%{current_link}，%{old_link}' editor: default: 預設 (目前為 %{name}) @@ -343,12 +342,6 @@ zh-TW: destroy: success: 帳號已刪除。 browse: - created: 建立於 - closed: 關閉於 - created_ago_html: '%{time_ago}建立' - closed_ago_html: '%{time_ago}關閉' - created_ago_by_html: 由%{user}%{time_ago}建立 - closed_ago_by_html: 由%{user}%{time_ago}關閉 deleted_ago_by_html: 由%{user}%{time_ago}刪除 edited_ago_by_html: 由%{user}%{time_ago}編輯 version: 版本 @@ -366,22 +359,6 @@ zh-TW: view_history: 檢視歷史 view_details: 檢視詳細資料 location: 位置： - changeset: - title: 變更集：%{id} - belongs_to: 作者 - node: 節點 (共 %{count} 項) - node_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項) - way: 路徑 (共 %{count} 項) - way_paginated: 路線 (%{count} 的 %{x}-%{y}) - relation: 關聯 (%{count}) - relation_paginated: 關聯 (%{count} 的 %{x}-%{y}) - hidden_comment_by_html: '%{user}%{time_ago}隱藏評論' - comment_by_html: 來自%{user}%{time_ago}的評論 - changesetxml: 變更集 XML - osmchangexml: osmChange 格式 XML - join_discussion: 登入以參加討論 - discussion: 討論 - still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。 node: title_html: 節點：%{name} history_title_html: 節點歷史：%{name} @@ -496,6 +473,42 @@ zh-TW: feed: title: 變更集 %{id} title_comment: 變更集 %{id} - %{comment} + created: 建立於 + closed: 關閉於 + belongs_to: 作者 + subscribe: + heading: 訂閱以下變更集討論？ + button: 訂閱討論 + unsubscribe: + heading: 取消訂閱以下變更集討論？ + button: 取消訂閱討論 + heading: + title: 變更集 %{id} + created_by_html: 由 %{link_user} 在 %{created} 建立。 + no_such_entry: + title: 沒有這樣的變更集 + heading: 沒有 id 為 %{id} 的項目 + body: 抱歉，沒有 id 為 %{id} 的變更集。請檢查您的拼字，或者可能是您按到錯誤的連結。 + show: + title: 變更集：%{id} + created_ago_html: '%{time_ago}建立' + closed_ago_html: '%{time_ago}關閉' + created_ago_by_html: 由%{user}%{time_ago}建立 + closed_ago_by_html: 由%{user}%{time_ago}關閉 + discussion: 討論 + join_discussion: 登入以參加討論 + still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。 + comment_by_html: 來自%{user}%{time_ago}的評論 + hidden_comment_by_html: '%{user}%{time_ago}隱藏評論' + changesetxml: 變更集 XML + osmchangexml: osmChange 格式 XML + paging_nav: + nodes: 節點 (共 %{count} 項) + nodes_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項) + ways: 路徑 (共 %{count} 項) + ways_paginated: 路線 (%{count} 的 %{x}-%{y}) + relations: 關聯 (%{count}) + relations_paginated: 關聯 (%{count} 的 %{x}-%{y}) timeout: sorry: 很抱歉，您請求的變更集清單過長無法讀取。 changeset_comments: @@ -1599,6 +1612,7 @@ zh-TW: more: 更多 user_mailer: diary_comment_notification: + description: 'OpenStreetMap 日記項目 #%{id}' subject: '[OpenStreetMap] %{user} 已評論日記項目' hi: '%{to_user} 您好，' header: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：' @@ -1654,6 +1668,7 @@ zh-TW: hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的 openstreetmap.org 帳號，重設密碼。 click_the_link: 如果這是您，請按下列連結重設您的密碼。 note_comment_notification: + description: 'OpenStreetMap 註記 #%{id}' anonymous: 匿名使用者 greeting: 您好， commented: @@ -1680,6 +1695,7 @@ zh-TW: details: 關於註記的更多詳細資料可在 %{url} 找到。 details_html: 關於註記的更多詳細資料可在 %{url} 找到。 changeset_comment_notification: + description: 'OpenStreetMap 變更集 #%{id}' hi: 嗨 %{to_user}， greeting: 您好， commented: @@ -1694,8 +1710,8 @@ zh-TW: partial_changeset_without_comment: 沒有評論 details: 關於變更集的詳情可在 %{url} 找到。 details_html: 關於變更集的詳情可在 %{url} 找到。 - unsubscribe: 要取消訂閱此變更集的更新內容，請訪問%{url}並點擊「取消訂閱」。 - unsubscribe_html: 要取消訂閱此變更集的更新內容，請訪問%{url}並點擊「取消訂閱」。 + unsubscribe: 您可以在 %{url} 取消訂閱此變更集的更新內容。 + unsubscribe_html: 您可以在 %{url} 取消訂閱此變更集的更新內容。 confirmations: confirm: heading: 請檢查您的電子郵件！ @@ -1798,9 +1814,6 @@ zh-TW: email address: 電子郵件地址 new password button: 重設密碼 help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。 - create: - notice email on way: 很遺憾您忘了它 :-( 不過讓您可以重設它的電子郵件已經寄出，您待會便可重設。 - notice email cannot find: 很抱歉，找不到該電子郵件地址。 edit: title: 重設密碼 heading: 重設 %{user} 的密碼 diff --git a/config/routes.rb b/config/routes.rb index af5730d21..98184e0e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -118,7 +118,7 @@ OpenStreetMap::Application.routes.draw do get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation get "/relation/:id/history" => "browse#relation_history", :id => /\d+/, :as => :relation_history resources :old_relations, :path => "/relation/:id/history", :id => /\d+/, :version => /\d+/, :param => :version, :only => :show - get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/ + resources :changesets, :path => "changeset", :id => /\d+/, :only => :show get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } resources :notes, :path => "note", :only => [:show, :new] diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb index 131292f41..18ad34f66 100644 --- a/test/controllers/accounts_controller_test.rb +++ b/test/controllers/accounts_controller_test.rb @@ -25,7 +25,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Make sure that you are redirected to the login page when # you are not logged in get edit_account_path - assert_response :redirect assert_redirected_to login_path(:referer => "/account/edit") # Make sure we get the page when we are logged in as the right user @@ -49,10 +48,8 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Adding external authentication should redirect to the auth provider patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/account") follow_redirect! - assert_response :redirect assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*} # Changing name to one that exists should fail @@ -74,7 +71,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Changing name to one that doesn't exist should work new_attributes = user.attributes.dup.merge(:display_name => "new tester") patch account_path, :params => { :user => new_attributes } - assert_response :redirect assert_redirected_to edit_account_url get edit_account_path assert_response :success @@ -116,7 +112,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest patch account_path, :params => { :user => user.attributes } end end - assert_response :redirect assert_redirected_to edit_account_url get edit_account_path assert_response :success @@ -135,7 +130,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Make sure that you are redirected to the login page when # you are not logged in get edit_account_path - assert_response :redirect assert_redirected_to login_path(:referer => "/account/edit") # Make sure we get the page when we are logged in as the right user diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 2bb743636..fcdd7c752 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -28,10 +28,6 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest { :path => "/relation/1/history", :method => :get }, { :controller => "browse", :action => "relation_history", :id => "1" } ) - assert_routing( - { :path => "/changeset/1", :method => :get }, - { :controller => "browse", :action => "changeset", :id => "1" } - ) assert_routing( { :path => "/query", :method => :get }, { :controller => "browse", :action => "query" } @@ -40,7 +36,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_relation relation = create(:relation) - browse_check :relation_path, relation.id, "browse/feature" + sidebar_browse_check :relation_path, relation.id, "browse/feature" assert_select "h4", /^Version/ do assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1 end @@ -51,7 +47,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_multiple_version_relation_links relation = create(:relation, :with_history, :version => 2) - browse_check :relation_path, relation.id, "browse/feature" + sidebar_browse_check :relation_path, relation.id, "browse/feature" assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1 @@ -59,7 +55,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_relation_history relation = create(:relation, :with_history) - browse_check :relation_history_path, relation.id, "browse/history" + sidebar_browse_check :relation_history_path, relation.id, "browse/history" assert_select "h4", /^Version/ do assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1 end @@ -67,7 +63,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_way way = create(:way) - browse_check :way_path, way.id, "browse/feature" + sidebar_browse_check :way_path, way.id, "browse/feature" assert_select "h4", /^Version/ do assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1 end @@ -78,7 +74,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_multiple_version_way_links way = create(:way, :with_history, :version => 2) - browse_check :way_path, way.id, "browse/feature" + sidebar_browse_check :way_path, way.id, "browse/feature" assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1 @@ -86,7 +82,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_way_history way = create(:way, :with_history) - browse_check :way_history_path, way.id, "browse/history" + sidebar_browse_check :way_history_path, way.id, "browse/history" assert_select "h4", /^Version/ do assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1 end @@ -94,7 +90,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_node node = create(:node) - browse_check :node_path, node.id, "browse/feature" + sidebar_browse_check :node_path, node.id, "browse/feature" assert_select "h4", /^Version/ do assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 end @@ -105,7 +101,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_multiple_version_node_links node = create(:node, :with_history, :version => 2) - browse_check :node_path, node.id, "browse/feature" + sidebar_browse_check :node_path, node.id, "browse/feature" assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1 assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1 @@ -113,7 +109,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_deleted_node node = create(:node, :visible => false) - browse_check :node_path, node.id, "browse/feature" + sidebar_browse_check :node_path, node.id, "browse/feature" assert_select "h4", /^Version/ do assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 end @@ -122,35 +118,12 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_node_history node = create(:node, :with_history) - browse_check :node_history_path, node.id, "browse/history" + sidebar_browse_check :node_history_path, node.id, "browse/history" assert_select "h4", /^Version/ do assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 end end - def test_read_changeset - user = create(:user) - changeset = create(:changeset, :user => user) - create(:changeset, :user => user) - browse_check :changeset_path, changeset.id, "browse/changeset" - end - - def test_read_private_changeset - user = create(:user) - changeset = create(:changeset, :user => create(:user, :data_public => false)) - create(:changeset, :user => user) - browse_check :changeset_path, changeset.id, "browse/changeset" - end - - def test_read_changeset_element_links - changeset = create(:changeset) - node = create(:node, :with_history, :changeset => changeset) - - browse_check :changeset_path, changeset.id, "browse/changeset" - assert_dom "a[href='#{node_path node}']", :count => 1 - assert_dom "a[href='#{old_node_path node, 1}']", :count => 1 - end - ## # Methods to check redaction. # @@ -193,6 +166,21 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest assert_select ".browse-section.browse-node .longitude", 0 end + def test_redacted_node_unredacted_history + session_for(create(:moderator_user)) + node = create(:node, :with_history, :deleted, :version => 2) + node_v1 = node.old_nodes.find_by(:version => 1) + node_v1.redact!(create(:redaction)) + + get node_history_path(:id => node, :params => { :show_redactions => true }) + assert_response :success + assert_template "browse/history" + + assert_select ".browse-section", 2 + assert_select ".browse-section.browse-redacted", 0 + assert_select ".browse-section.browse-node", 2 + end + def test_redacted_way_history way = create(:way, :with_history, :version => 4) way_v1 = way.old_ways.find_by(:version => 1) @@ -211,6 +199,23 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest assert_select ".browse-section.browse-way", 2 end + def test_redacted_way_unredacted_history + session_for(create(:moderator_user)) + way = create(:way, :with_history, :version => 4) + way_v1 = way.old_ways.find_by(:version => 1) + way_v1.redact!(create(:redaction)) + way_v3 = way.old_ways.find_by(:version => 3) + way_v3.redact!(create(:redaction)) + + get way_history_path(:id => way, :params => { :show_redactions => true }) + assert_response :success + assert_template "browse/history" + + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 0 + assert_select ".browse-section.browse-way", 4 + end + def test_redacted_relation_history relation = create(:relation, :with_history, :version => 4) relation_v1 = relation.old_relations.find_by(:version => 1) @@ -229,47 +234,107 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest assert_select ".browse-section.browse-relation", 2 end + def test_redacted_relation_unredacted_history + session_for(create(:moderator_user)) + relation = create(:relation, :with_history, :version => 4) + relation_v1 = relation.old_relations.find_by(:version => 1) + relation_v1.redact!(create(:redaction)) + relation_v3 = relation.old_relations.find_by(:version => 3) + relation_v3.redact!(create(:redaction)) + + get relation_history_path(:id => relation, :params => { :show_redactions => true }) + assert_response :success + assert_template "browse/history" + + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 0 + assert_select ".browse-section.browse-relation", 4 + end + def test_query get query_path assert_response :success assert_template "browse/query" end - private - - # This is a convenience method for most of the above checks - # First we check that when we don't have an id, it will correctly return a 404 - # then we check that we get the correct 404 when a non-existant id is passed - # then we check that it will get a successful response, when we do pass an id - def browse_check(path, id, template) - path_method = method(path) + def test_anonymous_user_feature_page_secondary_actions + node = create(:node, :with_history) + get node_path(:id => node) + assert_response :success + assert_select ".secondary-actions a", :text => "View Details", :count => 0 + assert_select ".secondary-actions a", :text => "View History", :count => 1 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0 + end - assert_raise ActionController::UrlGenerationError do - get path_method.call - end + def test_regular_user_feature_page_secondary_actions + session_for(create(:user)) + node = create(:node, :with_history) + get node_path(:id => node) + assert_response :success + assert_select ".secondary-actions a", :text => "View Details", :count => 0 + assert_select ".secondary-actions a", :text => "View History", :count => 1 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0 + end - assert_raise ActionController::UrlGenerationError do - get path_method.call(:id => -10) # we won't have an id that's negative - end + def test_moderator_user_feature_page_secondary_actions + session_for(create(:moderator_user)) + node = create(:node, :with_history) + get node_path(:id => node) + assert_response :success + assert_select ".secondary-actions a", :text => "View Details", :count => 0 + assert_select ".secondary-actions a", :text => "View History", :count => 1 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1 + end - get path_method.call(:id => 0) - assert_response :not_found - assert_template "browse/not_found" - assert_template :layout => "map" + def test_anonymous_user_history_page_secondary_actions + node = create(:node, :with_history) + get node_history_path(:id => node) + assert_response :success + assert_select ".secondary-actions a", :text => "View Details", :count => 1 + assert_select ".secondary-actions a", :text => "View History", :count => 0 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0 + end - get path_method.call(:id => 0), :xhr => true - assert_response :not_found - assert_template "browse/not_found" - assert_template :layout => "xhr" + def test_regular_user_history_page_secondary_actions + session_for(create(:user)) + node = create(:node, :with_history) + get node_history_path(:id => node) + assert_response :success + assert_select ".secondary-actions a", :text => "View Details", :count => 1 + assert_select ".secondary-actions a", :text => "View History", :count => 0 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0 + end - get path_method.call(:id => id) + def test_moderator_user_history_page_secondary_actions + session_for(create(:moderator_user)) + node = create(:node, :with_history) + get node_history_path(:id => node) assert_response :success - assert_template template - assert_template :layout => "map" + assert_select ".secondary-actions a", :text => "View Details", :count => 1 + assert_select ".secondary-actions a", :text => "View History", :count => 0 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1 + end + + def test_anonymous_user_unredacted_history_page_secondary_actions + node = create(:node, :with_history) + get node_history_path(:id => node, :params => { :show_redactions => true }) + assert_response :redirect + end - get path_method.call(:id => id), :xhr => true + def test_regular_user_unredacted_history_page_secondary_actions + session_for(create(:user)) + node = create(:node, :with_history) + get node_history_path(:id => node, :params => { :show_redactions => true }) + assert_response :redirect + end + + def test_moderator_user_unredacted_history_page_secondary_actions + session_for(create(:moderator_user)) + node = create(:node, :with_history) + get node_history_path(:id => node, :params => { :show_redactions => true }) assert_response :success - assert_template template - assert_template :layout => "xhr" + assert_select ".secondary-actions a", :text => "View Details", :count => 1 + assert_select ".secondary-actions a", :text => "View History", :count => 1 + assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0 end end diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index a0747a0cd..0b2616525 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -4,6 +4,10 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes + assert_routing( + { :path => "/changeset/1", :method => :get }, + { :controller => "changesets", :action => "show", :id => "1" } + ) assert_routing( { :path => "/user/name/history", :method => :get }, { :controller => "changesets", :action => "index", :display_name => "name" } @@ -121,8 +125,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Checks the display of the user changesets listing def test_index_user user = create(:user) - create(:changeset, :user => user) - create(:changeset, :closed, :user => user) + create(:changeset, :user => user, :num_changes => 1) + create(:changeset, :closed, :user => user, :num_changes => 1) + user.reload get history_path(:format => "html", :display_name => user.display_name) assert_response :success @@ -179,7 +184,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1) get friend_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => friend_changesets_path) session_for(private_user) @@ -205,7 +209,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1) get nearby_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => nearby_changesets_path) session_for(private_user) @@ -252,6 +255,67 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_response :success end + def test_show + changeset = create(:changeset) + create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "tested-changeset-comment") + commenting_user = create(:user) + changeset_comment = create(:changeset_comment, :changeset => changeset, :author => commenting_user, :body => "Unwanted comment") + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + assert_dom "h2", :text => "Changeset: #{changeset.id}" + assert_dom "p", :text => "tested-changeset-comment" + assert_dom "li#c#{changeset_comment.id}" do + assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/ + end + end + + def test_show_closed_changeset + changeset = create(:changeset, :closed) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + end + + def test_show_private_changeset + user = create(:user) + changeset = create(:changeset, :user => create(:user, :data_public => false)) + create(:changeset, :user => user) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + end + + def test_show_element_links + changeset = create(:changeset) + node = create(:node, :with_history, :changeset => changeset) + way = create(:way, :with_history, :changeset => changeset) + relation = create(:relation, :with_history, :changeset => changeset) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + assert_dom "a[href='#{node_path node}']", :count => 1 + assert_dom "a[href='#{old_node_path node, 1}']", :count => 1 + assert_dom "a[href='#{way_path way}']", :count => 1 + assert_dom "a[href='#{old_way_path way, 1}']", :count => 1 + assert_dom "a[href='#{relation_path relation}']", :count => 1 + assert_dom "a[href='#{old_relation_path relation, 1}']", :count => 1 + end + + def test_show_paginated_element_links + page_size = 20 + changeset = create(:changeset) + nodes = create_list(:node, page_size + 1, :with_history, :changeset => changeset) + ways = create_list(:way, page_size + 1, :with_history, :changeset => changeset) + relations = create_list(:relation, page_size + 1, :with_history, :changeset => changeset) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + page_size.times do |i| + assert_dom "a[href='#{node_path nodes[i]}']", :count => 1 + assert_dom "a[href='#{old_node_path nodes[i], 1}']", :count => 1 + assert_dom "a[href='#{way_path ways[i]}']", :count => 1 + assert_dom "a[href='#{old_way_path ways[i], 1}']", :count => 1 + assert_dom "a[href='#{relation_path relations[i]}']", :count => 1 + assert_dom "a[href='#{old_relation_path relations[i], 1}']", :count => 1 + end + end + ## # This should display the last 20 non-empty changesets def test_feed @@ -331,7 +395,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Check that we can't request later pages of the changesets feed def test_feed_max_id get history_feed_path(:format => "atom", :max_id => 100) - assert_response :redirect assert_redirected_to :action => :feed end @@ -342,7 +405,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest path = changeset_subscribe_path(changeset) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) @@ -363,7 +425,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_difference "changeset.subscribers.count", 1 do post changeset_subscribe_path(changeset) end - assert_response :redirect assert_redirected_to changeset_path(changeset) assert changeset.reload.subscribed?(other_user) end @@ -400,7 +461,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest path = changeset_unsubscribe_path(changeset) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) @@ -423,7 +483,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_difference "changeset.subscribers.count", -1 do post changeset_unsubscribe_path(changeset) end - assert_response :redirect assert_redirected_to changeset_path(changeset) assert_not changeset.reload.subscribed?(other_user) end diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index 82580dc68..0f4315e4f 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -64,7 +64,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # Now try to get the confirmation page again get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to root_path end @@ -191,7 +190,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # Get the confirmation page get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to root_path # Confirm the user @@ -211,7 +209,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest end end - assert_response :redirect assert_redirected_to login_path assert_equal("confirmations/resend_success_flash", flash[:notice][:partial]) assert_equal({ :email => user.email, :sender => Settings.email_from }, flash[:notice][:locals]) @@ -234,7 +231,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest end end - assert_response :redirect assert_redirected_to login_path assert_match "User #{user.display_name} not found.", flash[:error] end @@ -252,7 +248,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest end end - assert_response :redirect assert_redirected_to login_path assert_match "User #{user.display_name} not found.", flash[:error] end @@ -264,7 +259,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest end end - assert_response :redirect assert_redirected_to login_path assert_match "User No Such User not found.", flash[:error] end @@ -284,7 +278,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest confirm_string = user.generate_token_for(:new_email) post user_confirm_email_path, :params => { :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) end @@ -294,14 +287,12 @@ class UsersControllerTest < ActionDispatch::IntegrationTest confirm_string = user.generate_token_for(:new_email) post user_confirm_email_path, :params => { :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to edit_account_path assert_match(/already been confirmed/, flash[:error]) end def test_confirm_email_bad_token post user_confirm_email_path, :params => { :confirm_string => "XXXXX" } - assert_response :redirect assert_redirected_to edit_account_path assert_match(/confirmation code has expired or does not exist/, flash[:error]) end @@ -318,7 +309,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # precondition gravatar should be turned off assert_not user.image_use_gravatar post user_confirm_email_path, :params => { :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) # gravatar use should now be enabled @@ -333,7 +323,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # precondition gravatar should be turned on assert user.image_use_gravatar post user_confirm_email_path, :params => { :confirm_string => confirm_string } - assert_response :redirect assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) # gravatar use should now be disabled diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb index e7d812b3e..e2300e27b 100644 --- a/test/controllers/diary_entries_controller_test.rb +++ b/test/controllers/diary_entries_controller_test.rb @@ -120,7 +120,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Make sure that you are redirected to the login page when you # are not logged in get new_diary_entry_path - assert_response :redirect assert_redirected_to login_path(:referer => "/diary/new") end @@ -184,7 +183,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", :longitude => "2.2", :language_code => "en" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name entry = DiaryEntry.order(:id).last assert_equal user.id, entry.user_id @@ -211,7 +209,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1", :longitude => "2.2", :language_code => "de" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name entry = DiaryEntry.order(:id).last assert_equal user.id, entry.user_id @@ -240,7 +237,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest post diary_entries_path(:commit => "save", :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" }) end - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name entry = DiaryEntry.order(:id).last assert_equal user.id, entry.user_id @@ -251,7 +247,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Follow the redirect get diary_entries_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to :controller => :users, :action => :suspended end @@ -264,7 +259,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Make sure that you are redirected to the login page when you are # not logged in, without and with the id of the entry you want to edit get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry) - assert_response :redirect assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit") session_for(other_user) @@ -272,7 +266,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Verify that you get redirected to show if you are not the user # that created the entry get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry) - assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id session_for(entry.user) @@ -315,7 +308,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest put diary_entry_path(:display_name => entry.user.display_name, :id => entry, :commit => "save", :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude, :longitude => new_longitude, :language_code => new_language_code }) - assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id # Now check that the new data is rendered, when logged in @@ -407,7 +399,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest end end end - assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id email = ActionMailer::Base.deliveries.first assert_equal [user.email], email.to @@ -450,7 +441,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest end end end - assert_response :redirect assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id email = ActionMailer::Base.deliveries.first assert_equal [user.email], email.to @@ -466,7 +456,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Follow the redirect get diary_entries_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to :controller => :users, :action => :suspended # Now show the diary entry, and check the new comment is not present @@ -512,7 +501,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Try a list of diary entries for your friends when not logged in get friends_diary_entries_path - assert_response :redirect assert_redirected_to login_path(:referer => "/diary/friends") # Try a list of diary entries for your friends when logged in @@ -532,7 +520,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Try a list of diary entries for nearby users when not logged in get nearby_diary_entries_path - assert_response :redirect assert_redirected_to login_path(:referer => "/diary/nearby") # Try a list of diary entries for nearby users when logged in @@ -767,14 +754,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert DiaryEntry.find(diary_entry.id).visible # Now try as a moderator session_for(create(:moderator_user)) post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name assert_not DiaryEntry.find(diary_entry.id).visible @@ -784,7 +769,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Finally try as an administrator session_for(create(:administrator_user)) post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name assert_not DiaryEntry.find(diary_entry.id).visible end @@ -801,14 +785,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_not DiaryEntry.find(diary_entry.id).visible # Now try as a moderator session_for(create(:moderator_user)) post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name assert DiaryEntry.find(diary_entry.id).visible @@ -818,7 +800,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Finally try as an administrator session_for(create(:administrator_user)) post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry) - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name assert DiaryEntry.find(diary_entry.id).visible end @@ -836,14 +817,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert DiaryComment.find(diary_comment.id).visible # Try as a moderator session_for(create(:moderator_user)) post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id assert_not DiaryComment.find(diary_comment.id).visible @@ -853,7 +832,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Finally try as an administrator session_for(create(:administrator_user)) post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id assert_not DiaryComment.find(diary_comment.id).visible end @@ -871,14 +849,12 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_not DiaryComment.find(diary_comment.id).visible # Now try as a moderator session_for(create(:moderator_user)) post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id assert DiaryComment.find(diary_comment.id).visible @@ -888,7 +864,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest # Finally try as an administrator session_for(create(:administrator_user)) post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment) - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id assert DiaryComment.find(diary_comment.id).visible end @@ -931,7 +906,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest path = diary_entry_subscribe_path(:id => diary_entry, :display_name => user.display_name) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) @@ -987,7 +961,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest path = diary_entry_unsubscribe_path(:id => diary_entry, :display_name => user.display_name) get path - assert_response :redirect assert_redirected_to login_path(:referer => path) session_for(other_user) diff --git a/test/controllers/export_controller_test.rb b/test/controllers/export_controller_test.rb index a66d54481..e7539b41e 100644 --- a/test/controllers/export_controller_test.rb +++ b/test/controllers/export_controller_test.rb @@ -18,7 +18,6 @@ class ExportControllerTest < ActionDispatch::IntegrationTest # test the finish action for raw OSM data def test_finish_osm post export_finish_path(:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "osm") - assert_response :redirect assert_redirected_to "controller" => "api/map", "action" => "index", "bbox" => "0.0,50.0,1.0,51.0" end @@ -26,7 +25,6 @@ class ExportControllerTest < ActionDispatch::IntegrationTest # test the finish action for mapnik images def test_finish_mapnik post export_finish_path(:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "mapnik", :mapnik_format => "test", :mapnik_scale => "12") - assert_response :redirect assert_redirected_to "https://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test" end diff --git a/test/controllers/issue_comments_controller_test.rb b/test/controllers/issue_comments_controller_test.rb index 99d244ff1..823d07776 100644 --- a/test/controllers/issue_comments_controller_test.rb +++ b/test/controllers/issue_comments_controller_test.rb @@ -8,7 +8,6 @@ class IssueCommentsControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) post issue_comments_path(:issue_id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_equal 0, issue.comments.length end @@ -20,7 +19,6 @@ class IssueCommentsControllerTest < ActionDispatch::IntegrationTest session_for(create(:administrator_user)) post issue_comments_path(:issue_id => issue, :issue_comment => { :body => "test comment" }) - assert_response :redirect assert_redirected_to issue assert_equal 1, issue.comments.length end diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb index f9f29afbb..a988fc909 100644 --- a/test/controllers/issues_controller_test.rb +++ b/test/controllers/issues_controller_test.rb @@ -4,13 +4,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest def test_index # Access issues list without login get issues_path - assert_response :redirect assert_redirected_to login_path(:referer => issues_path) # Access issues list as normal user session_for(create(:user)) get issues_path - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Access issues list as administrator @@ -30,13 +28,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Access issue without login get issue_path(:id => issue) - assert_response :redirect assert_redirected_to login_path(:referer => issue_path(issue)) # Access issue as normal user session_for(create(:user)) get issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Access issue as administrator @@ -56,13 +52,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Access issue without login get issue_path(:id => issue) - assert_response :redirect assert_redirected_to login_path(:referer => issue_path(issue)) # Access issue as normal user session_for(create(:user)) get issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Access issue as moderator @@ -87,7 +81,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Resolve issue as normal user session_for(create(:user)) post resolve_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Resolve issue as administrator @@ -114,7 +107,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Resolve issue as normal user session_for(create(:user)) post resolve_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Resolve issue as moderator @@ -141,7 +133,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Ignore issue as normal user session_for(create(:user)) post ignore_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Ignore issue as administrator @@ -168,7 +159,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Ignore issue as normal user session_for(create(:user)) post ignore_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Ignore issue as moderator @@ -197,7 +187,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Reopen issue as normal user session_for(create(:user)) post reopen_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Reopen issue as administrator @@ -226,7 +215,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Reopen issue as normal user session_for(create(:user)) post reopen_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Reopen issue as moderator diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index fcfc8da5e..4897e52bb 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -413,7 +413,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest # Asking to mark a message with no ID should fail post message_mark_path - assert_response :redirect assert_redirected_to inbox_messages_path # Asking to mark a message with a bogus ID should fail @@ -464,7 +463,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest # Asking to destroy a message with no ID should fail delete message_path - assert_response :redirect assert_redirected_to inbox_messages_path # Asking to destroy a message with a bogus ID should fail diff --git a/test/controllers/oauth2_applications_controller_test.rb b/test/controllers/oauth2_applications_controller_test.rb index 1b6eaabfe..a5c37d808 100644 --- a/test/controllers/oauth2_applications_controller_test.rb +++ b/test/controllers/oauth2_applications_controller_test.rb @@ -43,7 +43,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest create_list(:oauth_application, 2, :owner => user) get oauth_applications_path - assert_response :redirect assert_redirected_to login_path(:referer => oauth_applications_path) session_for(user) @@ -58,7 +57,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest user = create(:user) get new_oauth_application_path - assert_response :redirect assert_redirected_to login_path(:referer => new_oauth_application_path) session_for(user) @@ -111,7 +109,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest :scopes => ["read_prefs"] }) end - assert_response :redirect assert_redirected_to oauth_application_path(:id => Doorkeeper::Application.find_by(:name => "Test Application").id) end @@ -137,7 +134,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest :scopes => ["read_email"] }) end - assert_response :redirect assert_redirected_to oauth_application_path(:id => Doorkeeper::Application.find_by(:name => "Test Application").id) end @@ -147,7 +143,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest other_client = create(:oauth_application) get oauth_application_path(:id => client) - assert_response :redirect assert_redirected_to login_path(:referer => oauth_application_path(:id => client.id)) session_for(user) @@ -167,7 +162,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest other_client = create(:oauth_application) get edit_oauth_application_path(:id => client) - assert_response :redirect assert_redirected_to login_path(:referer => edit_oauth_application_path(:id => client.id)) session_for(user) @@ -216,7 +210,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest :name => "New Name", :redirect_uri => "https://new.example.com/url" }) - assert_response :redirect assert_redirected_to oauth_application_path(:id => client.id) end @@ -241,7 +234,6 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest assert_difference "Doorkeeper::Application.count", -1 do delete oauth_application_path(:id => client) end - assert_response :redirect assert_redirected_to oauth_applications_path end end diff --git a/test/controllers/oauth2_authorizations_controller_test.rb b/test/controllers/oauth2_authorizations_controller_test.rb index 43fbe4df4..854f7cde5 100644 --- a/test/controllers/oauth2_authorizations_controller_test.rb +++ b/test/controllers/oauth2_authorizations_controller_test.rb @@ -29,7 +29,6 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "write_api") - assert_response :redirect assert_redirected_to login_path(:referer => oauth_authorization_path(:client_id => application.uid, :redirect_uri => application.redirect_uri, :response_type => "code", @@ -52,7 +51,6 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "write_api") - assert_response :redirect assert_redirected_to login_path(:referer => oauth_authorization_path(:client_id => application.uid, :redirect_uri => application.redirect_uri, :response_type => "code", @@ -119,7 +117,6 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "write_api") - assert_response :redirect assert_redirected_to(/^#{Regexp.escape(application.redirect_uri)}\?code=/) end @@ -160,7 +157,6 @@ class Oauth2AuthorizationsControllerTest < ActionDispatch::IntegrationTest :redirect_uri => application.redirect_uri, :response_type => "code", :scope => "write_api") - assert_response :redirect assert_redirected_to(/^#{Regexp.escape(application.redirect_uri)}\?error=access_denied/) end diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb index c01f7d6f3..3a9088401 100644 --- a/test/controllers/oauth2_authorized_applications_controller_test.rb +++ b/test/controllers/oauth2_authorized_applications_controller_test.rb @@ -25,7 +25,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe create(:oauth_application) get oauth_authorized_applications_path - assert_response :redirect assert_redirected_to login_path(:referer => oauth_authorized_applications_path) session_for(user) @@ -45,7 +44,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe create(:oauth_access_token, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary]) get oauth_authorized_applications_path - assert_response :redirect assert_redirected_to login_path(:referer => oauth_authorized_applications_path) session_for(user) @@ -78,7 +76,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe session_for(user) delete oauth_authorized_application_path(:id => application1.id) - assert_response :redirect assert_redirected_to oauth_authorized_applications_path get oauth_authorized_applications_path diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb index f106b4af6..e448e0954 100644 --- a/test/controllers/oauth_clients_controller_test.rb +++ b/test/controllers/oauth_clients_controller_test.rb @@ -40,7 +40,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest create_list(:access_token, 2, :user => user) get oauth_clients_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to login_path(:referer => oauth_clients_path(:display_name => user.display_name)) session_for(user) @@ -55,7 +54,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest user = create(:user) get new_oauth_client_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name)) session_for(user) @@ -79,13 +77,11 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest with_settings(:oauth_10_registration => false) do get new_oauth_client_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name)) session_for(user) get new_oauth_client_path(:display_name => user.display_name) - assert_response :redirect assert_redirected_to oauth_clients_path(:display_name => user.display_name) end end @@ -112,7 +108,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest :client_application => { :name => "Test Application", :url => "http://test.example.com/" }) end - assert_response :redirect assert_redirected_to oauth_client_path(:id => ClientApplication.find_by(:name => "Test Application").id) end @@ -122,7 +117,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest other_client = create(:client_application) get oauth_client_path(:display_name => user.display_name, :id => client) - assert_response :redirect assert_redirected_to login_path(:referer => oauth_client_path(:display_name => user.display_name, :id => client.id)) session_for(user) @@ -142,7 +136,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest other_client = create(:client_application) get edit_oauth_client_path(:display_name => user.display_name, :id => client) - assert_response :redirect assert_redirected_to login_path(:referer => edit_oauth_client_path(:display_name => user.display_name, :id => client.id)) session_for(user) @@ -186,7 +179,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest put oauth_client_path(:display_name => user.display_name, :id => client, :client_application => { :name => "New Name", :url => "http://new.example.com/url" }) - assert_response :redirect assert_redirected_to oauth_client_path(:id => client.id) end @@ -211,7 +203,6 @@ class OauthClientsControllerTest < ActionDispatch::IntegrationTest assert_difference "ClientApplication.count", -1 do delete oauth_client_path(:display_name => user.display_name, :id => client) end - assert_response :redirect assert_redirected_to oauth_clients_path(:display_name => user.display_name) end end diff --git a/test/controllers/old_nodes_controller_test.rb b/test/controllers/old_nodes_controller_test.rb index 3f2958bd3..a1232be76 100644 --- a/test/controllers/old_nodes_controller_test.rb +++ b/test/controllers/old_nodes_controller_test.rb @@ -19,6 +19,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest end assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1 end @@ -49,19 +50,69 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 end - def test_redacted - node = create(:node, :with_history, :deleted, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + test "show unrevealed redacted versions to anonymous users" do + node = create_redacted_node get old_node_path(node, 1) assert_response :success assert_template "old_nodes/show" assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 end + test "show unrevealed redacted versions to regular users" do + session_for(create(:user)) + node = create_redacted_node + get old_node_path(node, 1) + assert_response :success + assert_template "old_nodes/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to moderators" do + session_for(create(:moderator_user)) + node = create_redacted_node + get old_node_path(node, 1) + assert_response :success + assert_template "old_nodes/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 + end + + test "don't reveal redacted versions to anonymous users" do + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "don't reveal redacted versions to regular users" do + session_for(create(:user)) + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "reveal redacted versions to moderators" do + session_for(create(:moderator_user)) + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :success + assert_select "td", :text => "TOP SECRET", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 + end + def test_not_found get old_node_path(0, 0) assert_response :not_found @@ -69,4 +120,14 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" assert_select "#sidebar_content", /node #0 version 0 could not be found/ end + + private + + def create_redacted_node + create(:node, :with_history, :version => 2) do |node| + node_v1 = node.old_nodes.find_by(:version => 1) + create(:old_node_tag, :old_node => node_v1, :k => "name", :v => "TOP SECRET") + node_v1.redact!(create(:redaction)) + end + end end diff --git a/test/controllers/old_relations_controller_test.rb b/test/controllers/old_relations_controller_test.rb index 311e5958a..6eb6db9dd 100644 --- a/test/controllers/old_relations_controller_test.rb +++ b/test/controllers/old_relations_controller_test.rb @@ -19,6 +19,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest end assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 end @@ -58,19 +59,69 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" end - def test_redacted - relation = create(:relation, :with_history, :deleted, :version => 2) - relation_v1 = relation.old_relations.find_by(:version => 1) - relation_v1.redact!(create(:redaction)) + test "show unrevealed redacted versions to anonymous users" do + relation = create_redacted_relation get old_relation_path(relation, 1) assert_response :success assert_template "old_relations/show" assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0 end + test "show unrevealed redacted versions to regular users" do + session_for(create(:user)) + relation = create_redacted_relation + get old_relation_path(relation, 1) + assert_response :success + assert_template "old_relations/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to moderators" do + session_for(create(:moderator_user)) + relation = create_redacted_relation + get old_relation_path(relation, 1) + assert_response :success + assert_template "old_relations/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0 + end + + test "don't reveal redacted versions to anonymous users" do + relation = create_redacted_relation + get old_relation_path(relation, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "don't reveal redacted versions to regular users" do + session_for(create(:user)) + relation = create_redacted_relation + get old_relation_path(relation, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "reveal redacted versions to moderators" do + session_for(create(:moderator_user)) + relation = create_redacted_relation + get old_relation_path(relation, 1, :params => { :show_redactions => true }) + assert_response :success + assert_select "td", :text => "TOP SECRET", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1 + end + def test_not_found get old_relation_path(0, 0) assert_response :not_found @@ -78,4 +129,14 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" assert_select "#sidebar_content", /relation #0 version 0 could not be found/ end + + private + + def create_redacted_relation + create(:relation, :with_history, :version => 2) do |relation| + relation_v1 = relation.old_relations.find_by(:version => 1) + create(:old_relation_tag, :old_relation => relation_v1, :k => "name", :v => "TOP SECRET") + relation_v1.redact!(create(:redaction)) + end + end end diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb index d428605c5..d28a23ef5 100644 --- a/test/controllers/old_ways_controller_test.rb +++ b/test/controllers/old_ways_controller_test.rb @@ -19,6 +19,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest end assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 end @@ -63,19 +64,69 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" end - def test_redacted - way = create(:way, :with_history, :deleted, :version => 2) - way_v1 = way.old_ways.find_by(:version => 1) - way_v1.redact!(create(:redaction)) + test "show unrevealed redacted versions to anonymous users" do + way = create_redacted_way get old_way_path(way, 1) assert_response :success assert_template "old_ways/show" assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0 end + test "show unrevealed redacted versions to regular users" do + session_for(create(:user)) + way = create_redacted_way + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to moderators" do + session_for(create(:moderator_user)) + way = create_redacted_way + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0 + end + + test "don't reveal redacted versions to anonymous users" do + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "don't reveal redacted versions to regular users" do + session_for(create(:user)) + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "reveal redacted versions to moderators" do + session_for(create(:moderator_user)) + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :success + assert_select "td", :text => "TOP SECRET", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 + end + def test_not_found get old_way_path(0, 0) assert_response :not_found @@ -83,4 +134,14 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" assert_select "#sidebar_content", /way #0 version 0 could not be found/ end + + private + + def create_redacted_way + create(:way, :with_history, :version => 2) do |way| + way_v1 = way.old_ways.find_by(:version => 1) + create(:old_way_tag, :old_way => way_v1, :k => "name", :v => "TOP SECRET") + way_v1.redact!(create(:redaction)) + end + end end diff --git a/test/controllers/passwords_controller_test.rb b/test/controllers/passwords_controller_test.rb index 25cfdd4e5..9ceadfefb 100644 --- a/test/controllers/passwords_controller_test.rb +++ b/test/controllers/passwords_controller_test.rb @@ -49,14 +49,23 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest post user_forgot_password_path, :params => { :email => user.email } end end - assert_response :redirect assert_redirected_to login_path - assert_match(/^Sorry you lost it/, flash[:notice]) + assert_match(/^If your email address exists/, flash[:notice]) email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal user.email, email.to.first ActionMailer::Base.deliveries.clear + # Test resetting using an address that does not exist + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post user_forgot_password_path, :params => { :email => "nobody@example.com" } + end + end + # Be paranoid about revealing there was no match + assert_redirected_to login_path + assert_match(/^If your email address exists/, flash[:notice]) + # Test resetting using an address that matches a different user # that has the same address in a different case assert_difference "ActionMailer::Base.deliveries.size", 1 do @@ -64,9 +73,8 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest post user_forgot_password_path, :params => { :email => user.email.upcase } end end - assert_response :redirect assert_redirected_to login_path - assert_match(/^Sorry you lost it/, flash[:notice]) + assert_match(/^If your email address exists/, flash[:notice]) email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal uppercase_user.email, email.to.first @@ -79,9 +87,9 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest post user_forgot_password_path, :params => { :email => user.email.titlecase } end end - assert_response :success - assert_template :new - assert_select ".alert.alert-danger", /^Could not find that email address/ + # Be paranoid about revealing there was no match + assert_redirected_to login_path + assert_match(/^If your email address exists/, flash[:notice]) # Test resetting using the address as recorded for a user that has an # address which is case insensitively unique @@ -91,9 +99,8 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest post user_forgot_password_path, :params => { :email => third_user.email } end end - assert_response :redirect assert_redirected_to login_path - assert_match(/^Sorry you lost it/, flash[:notice]) + assert_match(/^If your email address exists/, flash[:notice]) email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal third_user.email, email.to.first @@ -106,9 +113,8 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest post user_forgot_password_path, :params => { :email => third_user.email.upcase } end end - assert_response :redirect assert_redirected_to login_path - assert_match(/^Sorry you lost it/, flash[:notice]) + assert_match(/^If your email address exists/, flash[:notice]) email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal third_user.email, email.to.first @@ -123,7 +129,6 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest # Test a request with a bogus token get user_reset_password_path, :params => { :token => "made_up_token" } - assert_response :redirect assert_redirected_to :action => :new # Create a valid token for a user @@ -142,7 +147,6 @@ class PasswordsControllerTest < ActionDispatch::IntegrationTest # Test setting a new password post user_reset_password_path, :params => { :token => token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } } - assert_response :redirect assert_redirected_to root_path assert_equal user.id, session[:user] user.reload diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb index 46d761ca4..81760fe5d 100644 --- a/test/controllers/preferences_controller_test.rb +++ b/test/controllers/preferences_controller_test.rb @@ -36,7 +36,6 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest # Changing to a valid editor should work user.preferred_editor = "id" put preferences_path, :params => { :user => user.attributes } - assert_response :redirect assert_redirected_to preferences_path follow_redirect! assert_template :show @@ -46,7 +45,6 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest # Changing to the default editor should work user.preferred_editor = "default" put preferences_path, :params => { :user => user.attributes } - assert_response :redirect assert_redirected_to preferences_path follow_redirect! assert_template :show diff --git a/test/controllers/profiles_controller_test.rb b/test/controllers/profiles_controller_test.rb index 5b11127c7..f388349ab 100644 --- a/test/controllers/profiles_controller_test.rb +++ b/test/controllers/profiles_controller_test.rb @@ -21,7 +21,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest # Updating the description should work put profile_path, :params => { :user => { :description => "new description" } } - assert_response :redirect assert_redirected_to user_path(user) follow_redirect! assert_response :success @@ -32,7 +31,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest # Changing to an uploaded image should work image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif") put profile_path, :params => { :avatar_action => "new", :user => { :avatar => image, :description => user.description } } - assert_response :redirect assert_redirected_to user_path(user) follow_redirect! assert_response :success @@ -43,7 +41,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest # Changing to a gravatar image should work put profile_path, :params => { :avatar_action => "gravatar", :user => { :description => user.description } } - assert_response :redirect assert_redirected_to user_path(user) follow_redirect! assert_response :success @@ -54,7 +51,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest # Removing the image should work put profile_path, :params => { :avatar_action => "delete", :user => { :description => user.description } } - assert_response :redirect assert_redirected_to user_path(user) follow_redirect! assert_response :success diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb index be5a88fdc..002e483fe 100644 --- a/test/controllers/redactions_controller_test.rb +++ b/test/controllers/redactions_controller_test.rb @@ -47,7 +47,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest def test_new get new_redaction_path - assert_response :redirect assert_redirected_to login_path(:referer => new_redaction_path) end @@ -63,7 +62,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) get new_redaction_path - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" end @@ -71,7 +69,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post redactions_path(:redaction => { :title => "Foo", :description => "Description here." }) - assert_response :redirect assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo"))) end @@ -87,7 +84,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) post redactions_path(:redaction => { :title => "Foo", :description => "Description here." }) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" end @@ -98,7 +94,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest redaction = create(:redaction) delete redaction_path(:id => redaction) - assert_response :redirect assert_redirected_to(redactions_path) end @@ -110,7 +105,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest create(:old_node, :redaction => redaction) delete redaction_path(:id => redaction) - assert_response :redirect assert_redirected_to(redaction_path(redaction)) assert_match(/^Redaction is not empty/, flash[:error]) end @@ -119,7 +113,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) delete redaction_path(:id => create(:redaction)) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" end @@ -127,7 +120,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest redaction = create(:redaction) get edit_redaction_path(:id => redaction) - assert_response :redirect assert_redirected_to login_path(:referer => edit_redaction_path(redaction)) end @@ -142,7 +134,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) get edit_redaction_path(:id => create(:redaction)) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" end @@ -152,7 +143,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest redaction = create(:redaction) put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." }) - assert_response :redirect assert_redirected_to(redaction_path(redaction)) end @@ -172,7 +162,6 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest redaction = create(:redaction) put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." }) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" end end diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb index 8374e76d9..25b80e8f4 100644 --- a/test/controllers/reports_controller_test.rb +++ b/test/controllers/reports_controller_test.rb @@ -4,7 +4,6 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest def test_new_report_without_login target_user = create(:user) get new_report_path(:reportable_id => target_user.id, :reportable_type => "User") - assert_response :redirect assert_redirected_to login_path(:referer => new_report_path(:reportable_id => target_user.id, :reportable_type => "User")) end @@ -25,7 +24,6 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest :issue => { :reportable_id => target_user.id, :reportable_type => "User" } }) end - assert_response :redirect assert_redirected_to user_path(target_user) end @@ -48,7 +46,6 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest :issue => { :reportable_id => target_user.id, :reportable_type => "User" } }) end - assert_response :redirect assert_redirected_to user_path(target_user) issue = Issue.last @@ -92,7 +89,6 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest :issue => { :reportable_id => target_user.id, :reportable_type => "User" } }) end - assert_response :redirect assert_redirected_to user_path(target_user) issue = Issue.last diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 71d6de184..914a4ab56 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -35,7 +35,6 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest user = create(:user) get login_path - assert_response :redirect assert_redirected_to login_path(:cookie_test => true) follow_redirect! assert_response :success @@ -46,27 +45,22 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest assert_template "sessions/new" post login_path, :params => { :username => user.display_name, :password => "test" } - assert_response :redirect assert_redirected_to root_path post login_path, :params => { :username => " #{user.display_name}", :password => "test" } - assert_response :redirect assert_redirected_to root_path post login_path, :params => { :username => "#{user.display_name} ", :password => "test" } - assert_response :redirect assert_redirected_to root_path end def test_logout_without_referer post logout_path - assert_response :redirect assert_redirected_to root_path end def test_logout_with_referer post logout_path, :params => { :referer => "/test" } - assert_response :redirect assert_redirected_to "/test" end @@ -89,7 +83,6 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest post user_new_path, :params => { :user => user.attributes } post user_save_path, :params => { :read_ct => 1, :read_tou => 1 } post logout_path - assert_response :redirect assert_redirected_to root_path end end diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index cc155155f..f5ff74064 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -122,32 +122,25 @@ class SiteControllerTest < ActionDispatch::IntegrationTest # Test the permalink redirect def test_permalink get permalink_path(:code => "wBz3--") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :m => "") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :mlat => "4.8779296875", :mlon => "3.955078125", :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :layers => "T") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T" get permalink_path(:code => "wBz3--", :node => 1) - assert_response :redirect assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :way => 2) - assert_response :redirect assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :relation => 3) - assert_response :redirect assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :changeset => 4) - assert_response :redirect - assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => "map=3/4.8779296875/3.955078125" + assert_redirected_to changeset_path(:id => 4, :anchor => "map=3/4.8779296875/3.955078125") end # Test the key page @@ -163,7 +156,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest def test_edit get edit_path - assert_response :redirect assert_redirected_to login_path(:referer => "/edit") end @@ -437,7 +429,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest # Test the welcome page def test_welcome get welcome_path - assert_response :redirect assert_redirected_to login_path(:referer => "/welcome") session_for(create(:user)) @@ -530,7 +521,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest def test_id_without_login get id_path - assert_response :redirect assert_redirected_to login_path(:referer => "/id") end end diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index 595284bb6..e6f3af4f1 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -394,13 +394,11 @@ class TracesControllerTest < ActionDispatch::IntegrationTest # First with no auth get show_trace_path(:display_name => anon_trace_file.user.display_name, :id => anon_trace_file) - assert_response :redirect assert_redirected_to :action => :index # Now with some other user, which should not work since the trace is anon session_for(create(:user)) get show_trace_path(:display_name => anon_trace_file.user.display_name, :id => anon_trace_file) - assert_response :redirect assert_redirected_to :action => :index # And finally we should be able to do it with the owner of the trace @@ -415,13 +413,11 @@ class TracesControllerTest < ActionDispatch::IntegrationTest # First with a trace that has never existed get show_trace_path(:display_name => create(:user).display_name, :id => 0) - assert_response :redirect assert_redirected_to :action => :index # Now with a trace that has been deleted session_for(deleted_trace_file.user) get show_trace_path(:display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file) - assert_response :redirect assert_redirected_to :action => :index end @@ -612,7 +608,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest def test_new_get # First with no auth get new_trace_path - assert_response :redirect assert_redirected_to login_path(:referer => new_trace_path) # Now authenticated as a user with gps.trace.visibility set @@ -661,7 +656,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest assert_not_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v session_for(user) post traces_path, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } } - assert_response :redirect assert_redirected_to :action => :index, :display_name => user.display_name assert_match(/file has been uploaded/, flash[:notice]) trace = Trace.order(:id => :desc).first @@ -698,7 +692,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest # First with no auth get edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file) - assert_response :redirect assert_redirected_to login_path(:referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)) # Now with some other user, which should fail @@ -752,7 +745,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest # Finally with a trace that we are allowed to edit session_for(public_trace_file.user) put trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file, :trace => new_details) - assert_response :redirect assert_redirected_to :action => :show, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) assert_equal new_details[:description], trace.description @@ -787,7 +779,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest # Now with a trace that we are allowed to delete session_for(public_trace_file.user) delete trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file) - assert_response :redirect assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) assert_not trace.visible @@ -797,7 +788,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest admin = create(:administrator_user) session_for(admin) delete trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file) - assert_response :redirect assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) assert_not trace.visible diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 0877fa39e..9aafa3001 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -148,7 +148,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't load the block creation page get new_user_block_path(:display_name => target_user.display_name) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator @@ -186,7 +185,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't load the block edit page get edit_user_block_path(:id => active_block) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator @@ -224,7 +222,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't create blocks post user_blocks_path - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator @@ -300,7 +297,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't update blocks put user_block_path(:id => active_block) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as the wrong moderator @@ -359,7 +355,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't load the block revoke page get revoke_user_block_path(:id => active_block) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator @@ -413,7 +408,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't load the revoke all blocks page get revoke_all_user_blocks_path(blocked_user) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator @@ -443,7 +437,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that normal users can't load the block revoke page get revoke_all_user_blocks_path(:blocked_user) - assert_response :redirect assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index a530a6f85..2db0f43b3 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -69,7 +69,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # The user creation page loads def test_new_view get user_new_path - assert_response :redirect assert_redirected_to user_new_path(:cookie_test => "true") get user_new_path, :params => { :cookie_test => "true" } @@ -98,11 +97,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest session_for(create(:user)) get user_new_path - assert_response :redirect assert_redirected_to root_path get user_new_path, :params => { :referer => "/test" } - assert_response :redirect assert_redirected_to "/test" end @@ -346,7 +343,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest session_for(user) get user_terms_path - assert_response :redirect assert_redirected_to edit_account_path end @@ -360,7 +356,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_template :terms post user_save_path, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to edit_account_path assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] @@ -381,7 +376,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_template :terms post user_save_path, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to "/test" assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] @@ -399,7 +393,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest session_for(user) get edit_account_path - assert_response :redirect assert_redirected_to :controller => :users, :action => :terms, :referer => "/account/edit" end @@ -415,7 +408,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest post user_go_public_path - assert_response :redirect assert_redirected_to edit_account_path assert User.find(user.id).data_public end @@ -552,13 +544,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) post set_status_user_path(user), :params => { :event => "confirm" } - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Finally try as an administrator session_for(create(:administrator_user)) post set_status_user_path(user), :params => { :event => "confirm" } - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name assert_equal "confirmed", User.find(user.id).status end @@ -573,13 +563,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # Now try as a normal user session_for(user) delete user_path(user) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Finally try as an administrator session_for(create(:administrator_user)) delete user_path(user) - assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name # Check that the user was deleted properly @@ -609,21 +597,18 @@ class UsersControllerTest < ActionDispatch::IntegrationTest # Shouldn't work when not logged in get users_path - assert_response :redirect assert_redirected_to login_path(:referer => users_path) session_for(user) # Shouldn't work when logged in as a normal user get users_path - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden session_for(moderator_user) # Shouldn't work when logged in as a moderator get users_path - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden session_for(administrator_user) @@ -695,7 +680,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_no_difference "User.active.count" do post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_equal "pending", inactive_user.reload.status assert_equal "suspended", suspended_user.reload.status @@ -706,7 +690,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_no_difference "User.active.count" do post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_equal "pending", inactive_user.reload.status assert_equal "suspended", suspended_user.reload.status @@ -717,7 +700,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_difference "User.active.count", 2 do post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end - assert_response :redirect assert_redirected_to :action => :index assert_equal "confirmed", inactive_user.reload.status assert_equal "confirmed", suspended_user.reload.status @@ -742,7 +724,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_no_difference "User.active.count" do post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_equal "active", normal_user.reload.status assert_equal "confirmed", confirmed_user.reload.status @@ -753,7 +734,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_no_difference "User.active.count" do post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden assert_equal "active", normal_user.reload.status assert_equal "confirmed", confirmed_user.reload.status @@ -764,7 +744,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_difference "User.active.count", -2 do post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end - assert_response :redirect assert_redirected_to :action => :index assert_equal "deleted", normal_user.reload.status assert_equal "deleted", confirmed_user.reload.status @@ -772,15 +751,12 @@ class UsersControllerTest < ActionDispatch::IntegrationTest def test_auth_failure_callback get auth_failure_path - assert_response :redirect assert_redirected_to login_path get auth_failure_path, :params => { :origin => "/" } - assert_response :redirect assert_redirected_to root_path get auth_failure_path, :params => { :origin => "http://www.google.com" } - assert_response :redirect assert_redirected_to login_path end end diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb index ee6d277bb..e7e5b7575 100644 --- a/test/integration/client_applications_test.rb +++ b/test/integration/client_applications_test.rb @@ -8,7 +8,6 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest user = create(:user) get "/login" - assert_response :redirect assert_redirected_to login_path(:cookie_test => "true") follow_redirect! assert_response :success diff --git a/test/integration/oauth2_test.rb b/test/integration/oauth2_test.rb index fd6b42fec..3fe59cbdd 100644 --- a/test/integration/oauth2_test.rb +++ b/test/integration/oauth2_test.rb @@ -157,7 +157,6 @@ class OAuth2Test < ActionDispatch::IntegrationTest }.merge(options) get oauth_authorization_path(options) - assert_response :redirect assert_redirected_to login_path(:referer => request.fullpath) post login_path(:username => user.email, :password => "test") diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 70f161fc9..dfe2552bb 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -58,7 +58,6 @@ class OAuthTest < ActionDispatch::IntegrationTest :params => { :oauth_token => token.token, :allow_read_prefs => "1", :allow_write_prefs => "1" } if client.callback_url - assert_response :redirect assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}" else assert_response :success @@ -156,7 +155,6 @@ class OAuthTest < ActionDispatch::IntegrationTest post "/oauth/authorize", :params => { :oauth_token => token.token, :oauth_callback => callback_url, :allow_write_api => "1", :allow_read_gpx => "1" } - assert_response :redirect assert_redirected_to "#{callback_url}?oauth_token=#{token.token}" token.reload assert_not_nil token.created_at diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb index 71640b67d..79939f4bc 100644 --- a/test/integration/redirect_test.rb +++ b/test/integration/redirect_test.rb @@ -3,105 +3,82 @@ require "test_helper" class RedirectTest < ActionDispatch::IntegrationTest def test_legacy_redirects get "/index.html" - assert_response :redirect assert_redirected_to "/" get "/create-account.html" - assert_response :redirect assert_redirected_to "/user/new" get "/forgot-password.html" - assert_response :redirect assert_redirected_to "/user/forgot-password" end def test_search_redirects get "/?query=test" - assert_response :redirect assert_redirected_to "/search?query=test" end def test_history_redirects get "/browse" - assert_response :redirect assert_redirected_to "/history" get "/browse/changesets" - assert_response :redirect assert_redirected_to "/history" get "/browse/changesets?bbox=-80.54%2C40.358%2C-79.526%2C40.779" - assert_response :redirect assert_redirected_to "/history?bbox=-80.54%2C40.358%2C-79.526%2C40.779" get "/browse/friends" - assert_response :redirect assert_redirected_to "/history/friends" get "/browse/nearby" - assert_response :redirect assert_redirected_to "/history/nearby" get "/user/name/edits" - assert_response :redirect assert_redirected_to "/user/name/history" get "/user/name%20with%20spaces/edits" - assert_response :redirect assert_redirected_to "/user/name%20with%20spaces/history" end def test_history_feed_redirects get "/browse/changesets/feed" - assert_response :redirect assert_redirected_to "/history/feed" get "/browse/changesets/feed?bbox=-80.54%2C40.358%2C-79.526%2C40.779" - assert_response :redirect assert_redirected_to "/history/feed?bbox=-80.54%2C40.358%2C-79.526%2C40.779" get "/user/name/edits/feed" - assert_response :redirect assert_redirected_to "/user/name/history/feed" get "/user/name%20with%20spaces/edits/feed" - assert_response :redirect assert_redirected_to "/user/name%20with%20spaces/history/feed" end def test_browse_redirects get "/browse/node/1" - assert_response :redirect assert_redirected_to "/node/1" get "/browse/way/1" - assert_response :redirect assert_redirected_to "/way/1" get "/browse/relation/1" - assert_response :redirect assert_redirected_to "/relation/1" get "/browse/changeset/1" - assert_response :redirect assert_redirected_to "/changeset/1" get "/browse/note/1" - assert_response :redirect assert_redirected_to "/note/1" end def test_browse_history_redirects get "/browse/node/1/history" - assert_response :redirect assert_redirected_to "/node/1/history" get "/browse/way/1/history" - assert_response :redirect assert_redirected_to "/way/1/history" get "/browse/relation/1/history" - assert_response :redirect assert_redirected_to "/relation/1/history" end end diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 59efeaabb..1f749f957 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -130,7 +130,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest post confirmation_url - assert_response :redirect assert_redirected_to welcome_path user.reload @@ -250,13 +249,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -296,13 +292,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -335,13 +328,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -403,13 +393,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -420,7 +407,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -449,13 +435,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -489,13 +472,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -557,13 +537,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -574,7 +551,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -603,13 +579,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -641,13 +614,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -709,13 +679,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "microsoft", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -726,7 +693,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -755,13 +721,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "microsoft", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -793,13 +756,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -861,13 +821,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -879,7 +836,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -908,13 +864,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -946,13 +899,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -1015,13 +965,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -1033,7 +980,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -1062,13 +1008,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect @@ -1100,13 +1043,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index a9c64bea4..a7301233d 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -354,13 +354,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -375,13 +373,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -395,13 +391,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -420,13 +414,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -441,16 +433,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:openid] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -466,16 +455,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:openid] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "openid", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -490,13 +476,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/fred.bloggs") get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path(:cookie_test => true, :referer => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -513,13 +497,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -536,13 +518,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -558,13 +538,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -585,13 +563,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -605,16 +581,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:google] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -629,16 +602,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:google] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "google", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -655,13 +625,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -678,13 +646,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest }) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! assert_response :redirect @@ -703,13 +669,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect @@ -724,13 +688,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect @@ -744,13 +706,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect @@ -769,13 +729,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect @@ -789,16 +747,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:facebook] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -813,16 +768,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:facebook] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -837,13 +789,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:facebook, :uid => "987654321") get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! assert_response :redirect @@ -858,13 +808,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect @@ -879,13 +827,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect @@ -899,13 +845,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect @@ -924,13 +868,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:microsoft, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect @@ -944,16 +886,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:microsoft] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -968,16 +907,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:microsoft] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -992,13 +928,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:microsoft, :uid => "987654321") get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "microsoft", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect @@ -1013,13 +947,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect @@ -1034,13 +966,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect @@ -1054,13 +984,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect @@ -1079,13 +1007,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect @@ -1099,16 +1025,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:github] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -1123,16 +1046,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:github] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "github", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -1147,13 +1067,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:github, :uid => "987654321") get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! assert_response :redirect @@ -1168,13 +1086,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -1189,13 +1105,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -1209,13 +1123,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -1234,13 +1146,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => user.auth_uid) get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -1254,16 +1164,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:wikipedia] = :connection_failed get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -1278,16 +1185,13 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:wikipedia] = :invalid_credentials get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory") follow_redirect! assert_response :redirect @@ -1302,13 +1206,11 @@ class UserLoginTest < ActionDispatch::IntegrationTest OmniAuth.config.add_mock(:wikipedia, :uid => "987654321") get "/login", :params => { :referer => "/history" } - assert_response :redirect assert_redirected_to login_path("cookie_test" => "true", "referer" => "/history") follow_redirect! assert_response :success assert_template "sessions/new" post auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") follow_redirect! assert_response :redirect @@ -1322,7 +1224,6 @@ class UserLoginTest < ActionDispatch::IntegrationTest def try_password_login(username, password, remember_me = nil) get "/login" - assert_response :redirect assert_redirected_to login_path(:cookie_test => true) follow_redirect! assert_response :success diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index f7d3f2e54..46db48388 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -24,7 +24,6 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success assert_template "sessions/new" post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } - assert_response :redirect # but now we need to look at the terms assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" follow_redirect! @@ -49,7 +48,6 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success assert_template "sessions/new" post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } - assert_response :redirect # but now we need to look at the terms assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" diff --git a/test/test_helper.rb b/test/test_helper.rb index 60edf6e0c..1d04f57da 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -383,5 +383,41 @@ module ActiveSupport ensure unfreeze_time end + + # This is a convenience method for checks of resources rendered in a map view sidebar + # First we check that when we don't have an id, it will correctly return a 404 + # then we check that we get the correct 404 when a non-existant id is passed + # then we check that it will get a successful response, when we do pass an id + def sidebar_browse_check(path, id, template) + path_method = method(path) + + assert_raise ActionController::UrlGenerationError do + get path_method.call + end + + assert_raise ActionController::UrlGenerationError do + get path_method.call(:id => -10) # we won't have an id that's negative + end + + get path_method.call(:id => 0) + assert_response :not_found + assert_template "browse/not_found" + assert_template :layout => "map" + + get path_method.call(:id => 0), :xhr => true + assert_response :not_found + assert_template "browse/not_found" + assert_template :layout => "xhr" + + get path_method.call(:id => id) + assert_response :success + assert_template template + assert_template :layout => "map" + + get path_method.call(:id => id), :xhr => true + assert_response :success + assert_template template + assert_template :layout => "xhr" + end end end diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js index b2d625139..0c6f719a4 100644 --- a/vendor/assets/iD/iD.js +++ b/vendor/assets/iD/iD.js @@ -22289,7 +22289,7 @@ // package.json var package_default = { name: "iD", - version: "2.28.0", + version: "2.28.1", description: "A friendly editor for OpenStreetMap", main: "dist/iD.min.js", repository: "github:openstreetmap/iD", @@ -30102,8 +30102,6 @@ if (_this.tags[k2] || !tags[k2]) { tags[k2] = "yes"; } - } else if (addTags[k2] === "") { - delete tags[k2]; } else { tags[k2] = addTags[k2]; } @@ -78303,13 +78301,13 @@ Object.values(vals[0].presets).forEach((preset) => preset.suggestion = true); Object.values(vals[0].presets).forEach((preset) => { if (preset.tags["brand:wikidata"]) { - preset.addTags["brand:wikipedia"] = ""; + preset.removeTags = { "brand:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } if (preset.tags["operator:wikidata"]) { - preset.addTags["operator:wikipedia"] = ""; + preset.removeTags = { "operator:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } if (preset.tags["network:wikidata"]) { - preset.addTags["network:wikipedia"] = ""; + preset.removeTags = { "network:wikipedia": "*", ...preset.removeTags || preset.addTags || preset.tags }; } }); _mainPresetIndex.merge({ diff --git a/vendor/assets/iD/iD/data/address_formats.min.json b/vendor/assets/iD/iD/data/address_formats.min.json index 3235ffb6e..ef6087afc 100644 --- a/vendor/assets/iD/iD/data/address_formats.min.json +++ b/vendor/assets/iD/iD/data/address_formats.min.json @@ -1 +1 @@ -[{"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["au"],"format":[["unit","housenumber","street"],["suburb","state","postcode"]]},{"countryCodes":["id"],"format":[["unit","housename"],["street","housenumber","neighbourhood"],["subdistrict","district"],["city","province","postcode"]]},{"countryCodes":["gb"],"format":[["housename"],["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["ie"],"format":[["housename"],["housenumber","street+place"],["city"],["postcode"]]},{"countryCodes":["at","bg","ch","de","si","pl","lt"],"format":[["street+place","housenumber"],["postcode","city"]]},{"countryCodes":["ad","ba","be","dk","es","gr","hr","it","pt","se","sm","va"],"format":[["street+place","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fi","is","li","nl","no"],"format":[["street","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fr","lu"],"format":[["housenumber","street+place"],["postcode","city"]]},{"countryCodes":["mo"],"format":[["housenumber","street"],["postcode","city"]]},{"countryCodes":["br"],"format":[["street+place"],["housenumber","suburb"],["city","postcode"]]},{"countryCodes":["vn"],"format":[["housenumber","street"],["subdistrict"],["district"],["city"],["province","postcode"]]},{"countryCodes":["ca"],"format":[["housenumber","street","unit"],["city","province","postcode"]]},{"countryCodes":["us"],"format":[["housenumber","street","unit"],["city","state","postcode"]]},{"countryCodes":["tw"],"format":[["postcode","city","district"],["street+place"],["housenumber","floor","unit"]]},{"countryCodes":["jp"],"format":[["postcode","province","county"],["city","suburb"],["quarter","neighbourhood"],["block_number","housenumber"]],"dropdowns":["postcode","province","county","city","suburb","quarter","neighbourhood","block_number"],"widths":{"postcode":0.3,"province":0.35,"county":0.35,"city":0.65,"suburb":0.35,"quarter":0.5,"neighbourhood":0.5,"block_number":0.5,"housenumber":0.5}},{"countryCodes":["kr"],"format":[["province","city","district"],["street","housenumber","unit"],["postcode"]]},{"countryCodes":["tr"],"format":[["neighbourhood"],["street+place","housenumber"],["postcode","district","city"]]},{"countryCodes":["ua"],"format":[["housenumber","postcode"],["street+place"]]},{"countryCodes":["cn"],"format":[["postcode","province"],["city","district"],["street","housenumber"]],"widths":{"postcode":0.3,"province":0.7,"city":0.5,"district":0.5,"street":0.7,"housenumber":0.3}},{"countryCodes":["bo"],"format":[["street","housenumber"],["neighbourhood","city"]],"widths":{"street":0.7,"housenumber":0.3,"neighbourhood":0.5,"city":0.5}},{"countryCodes":["pe"],"format":[["street","housenumber"],["neighbourhood"],["city","state","postcode"]],"dropdowns":["street","neighbourhood","city","state","postcode"],"widths":{"street":0.7,"housenumber":0.3,"city":0.4,"state":0.4,"postcode":0.2}},{"countryCodes":["mx"],"format":[["street","housenumber"],["neighbourhood"],["postcode","city","state"]]},{"countryCodes":["lv"],"format":[["street","housenumber"],["housename","subdistrict"],["district","city","postcode"]],"dropdowns":["street","city","subdistrict","district","postcode"],"widths":{"street":0.7,"housenumber":0.3,"housename":0.4,"subdistrict":0.6,"district":0.4,"city":0.4,"postcode":0.2}},{"countryCodes":["in"],"format":[["housenumber","street"],["city","postcode"],["district"]]},{"countryCodes":["ru"],"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["cz","sk"],"format":[["street","housenumber"],["postcode","city"]]},{"countryCodes":["ph"],"format":[["unit","housename","housenumber","street"],["neighbourhood","district","city"],["postcode","province"]]},{"countryCodes":["hu"],"format":[["postcode","city"],["street","housenumber"]]}] \ No newline at end of file +[{"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["au"],"format":[["unit","housenumber","street"],["suburb","state","postcode"]]},{"countryCodes":["id"],"format":[["unit","housename"],["street","housenumber","neighbourhood"],["subdistrict","district"],["city","province","postcode"]]},{"countryCodes":["gb"],"format":[["housename"],["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["ie"],"format":[["housename"],["housenumber","street+place"],["city"],["postcode"]]},{"countryCodes":["at","bg","ch","de","si","pl","lt"],"format":[["street+place","housenumber"],["postcode","city"]]},{"countryCodes":["ad","ba","be","dk","es","gr","hr","it","pt","se","sm","va"],"format":[["street+place","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fi","is","li","nl","no"],"format":[["street","housenumber","unit"],["postcode","city"]]},{"countryCodes":["fr","lu"],"format":[["housenumber","street+place"],["postcode","city"]]},{"countryCodes":["mo"],"format":[["housenumber","street"],["postcode","city"]]},{"countryCodes":["nz"],"format":[["housenumber","street"],["suburb"],["city","postcode"]]},{"countryCodes":["br"],"format":[["street+place"],["housenumber","suburb"],["city","postcode"]]},{"countryCodes":["vn"],"format":[["housenumber","street"],["subdistrict"],["district"],["city"],["province","postcode"]]},{"countryCodes":["ca"],"format":[["housenumber","street","unit"],["city","province","postcode"]]},{"countryCodes":["us"],"format":[["housenumber","street","unit"],["city","state","postcode"]]},{"countryCodes":["tw"],"format":[["postcode","city","district"],["street+place"],["housenumber","floor","unit"]]},{"countryCodes":["jp"],"format":[["postcode","province","county"],["city","suburb"],["quarter","neighbourhood"],["block_number","housenumber"]],"dropdowns":["postcode","province","county","city","suburb","quarter","neighbourhood","block_number"],"widths":{"postcode":0.3,"province":0.35,"county":0.35,"city":0.65,"suburb":0.35,"quarter":0.5,"neighbourhood":0.5,"block_number":0.5,"housenumber":0.5}},{"countryCodes":["kr"],"format":[["province","city","district"],["street","housenumber","unit"],["postcode"]]},{"countryCodes":["tr"],"format":[["neighbourhood"],["street+place","housenumber"],["postcode","district","city"]]},{"countryCodes":["ua"],"format":[["housenumber","postcode"],["street+place"]]},{"countryCodes":["cn"],"format":[["postcode","province"],["city","district"],["street","housenumber"]],"widths":{"postcode":0.3,"province":0.7,"city":0.5,"district":0.5,"street":0.7,"housenumber":0.3}},{"countryCodes":["bo"],"format":[["street","housenumber"],["neighbourhood","city"]],"widths":{"street":0.7,"housenumber":0.3,"neighbourhood":0.5,"city":0.5}},{"countryCodes":["pe"],"format":[["street","housenumber"],["neighbourhood"],["city","state","postcode"]],"dropdowns":["street","neighbourhood","city","state","postcode"],"widths":{"street":0.7,"housenumber":0.3,"city":0.4,"state":0.4,"postcode":0.2}},{"countryCodes":["mx"],"format":[["street","housenumber"],["neighbourhood"],["postcode","city","state"]]},{"countryCodes":["lv"],"format":[["street","housenumber"],["housename","subdistrict"],["district","city","postcode"]],"dropdowns":["street","city","subdistrict","district","postcode"],"widths":{"street":0.7,"housenumber":0.3,"housename":0.4,"subdistrict":0.6,"district":0.4,"city":0.4,"postcode":0.2}},{"countryCodes":["in"],"format":[["housenumber","street"],["city","postcode"],["district"]]},{"countryCodes":["ru"],"format":[["housenumber","street+place"],["city","postcode"]]},{"countryCodes":["cz","sk"],"format":[["street","housenumber"],["postcode","city"]]},{"countryCodes":["ph"],"format":[["unit","housename","housenumber","street"],["neighbourhood","district","city"],["postcode","province"]]},{"countryCodes":["hu"],"format":[["postcode","city"],["street","housenumber"]]}] \ No newline at end of file