From: Andy Allan Date: Wed, 3 Feb 2021 18:07:29 +0000 (+0000) Subject: Merge pull request #2409 from jalessio/docker-compose-take2 X-Git-Tag: live~1727 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/86dbcb55f25219edc4f0aa93b209357e4cac0621?hp=4fac47a214d4f0ab2228cdb3b0f646f11d41b4ef Merge pull request #2409 from jalessio/docker-compose-take2 Add Docker Compose Support for Development Environment --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 872a03d8b..219135dff 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -18,7 +18,7 @@ require: # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: - Max: 248 + Max: 254 # Offense count: 36 # Configuration parameters: AllowSafeAssignment. diff --git a/Gemfile b/Gemfile index 40476a5b8..b80771a28 100644 --- a/Gemfile +++ b/Gemfile @@ -61,12 +61,13 @@ gem "quad_tile", "~> 1.0.1" gem "rack-uri_sanitizer" # Omniauth for authentication -gem "omniauth" +gem "omniauth", "~> 2.0.2" gem "omniauth-facebook" gem "omniauth-github" gem "omniauth-google-oauth2", ">= 0.6.0" gem "omniauth-mediawiki", ">= 0.0.4" gem "omniauth-openid" +gem "omniauth-rails_csrf_protection", "~> 1.0" gem "omniauth-windowslive" # Markdown formatting support diff --git a/Gemfile.lock b/Gemfile.lock index a84b9a497..a9b901a8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,10 +70,10 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.2) - autoprefixer-rails (10.2.0.0) + autoprefixer-rails (10.2.4.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.419.0) + aws-partitions (1.422.0) aws-sdk-core (3.111.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -92,7 +92,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.15) + better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -102,7 +102,7 @@ GEM smart_properties binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.5.1) + bootsnap (1.7.0) msgpack (~> 1.0) bootstrap (4.5.3) autoprefixer-rails (>= 9.1.0) @@ -111,7 +111,7 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (4.10.1) + brakeman (5.0.0) browser (5.3.0) builder (3.2.4) bzip2-ffi (1.0.0) @@ -119,7 +119,7 @@ GEM cancancan (3.2.1) canonical-rails (0.2.11) rails (>= 4.1, < 6.2) - capybara (3.35.1) + capybara (3.35.3) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -161,7 +161,7 @@ GEM dry-logic (1.1.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.6.0) + dry-schema (1.6.1) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.5, >= 0.5) @@ -216,7 +216,7 @@ GEM html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) i18n-js (3.8.0) i18n (>= 0.6.6) @@ -232,7 +232,7 @@ GEM sprockets image_size (2.1.0) in_threads (1.5.4) - jbuilder (2.11.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jmespath (1.4.0) jquery-rails (4.4.0) @@ -265,7 +265,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.3) - msgpack (1.3.3) + msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) @@ -287,14 +287,15 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.9.1) + omniauth (2.0.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + rack-protection omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-github (2.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) omniauth-google-oauth2 (0.8.1) jwt (>= 2.0) oauth2 (~> 1.1) @@ -303,15 +304,18 @@ GEM omniauth-mediawiki (0.0.4) jwt (~> 2.0) omniauth-oauth (~> 1.0) - omniauth-oauth (1.1.0) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) + omniauth (>= 1.0, < 3) omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) omniauth (>= 1.9, < 3) omniauth-openid (2.0.1) omniauth (>= 1.0, < 3.0) rack-openid (~> 1.4.0) + omniauth-rails_csrf_protection (1.0.0) + actionpack (>= 4.2) + omniauth (~> 2.0) omniauth-windowslive (0.0.12) multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) @@ -323,7 +327,7 @@ GEM popper_js (1.16.0) progress (3.5.2) public_suffix (4.0.6) - puma (5.1.1) + puma (5.2.0) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -334,6 +338,8 @@ GEM rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) + rack-protection (2.1.0) + rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) @@ -381,7 +387,7 @@ GEM rexml (3.2.4) rinku (2.0.6) rotp (6.2.0) - rubocop (1.8.1) + rubocop (1.9.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -449,7 +455,7 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.11.1) + webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -510,12 +516,13 @@ DEPENDENCIES mini_magick minitest (~> 5.1) oauth-plugin (>= 0.5.1) - omniauth + omniauth (~> 2.0.2) omniauth-facebook omniauth-github omniauth-google-oauth2 (>= 0.6.0) omniauth-mediawiki (>= 0.0.4) omniauth-openid + omniauth-rails_csrf_protection (~> 1.0) omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) pg diff --git a/INSTALL.md b/INSTALL.md index 1215cc261..c8811fc3f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -244,7 +244,7 @@ After installing this software, you may need to carry out some [configuration st # Installing compiled shared library database functions (optional) -There are special database functions required by a (little-used) API call, the migrations and diff replication. The former two are provided as *either* pure SQL functions or a compiled shared library. The SQL versions are installed as part of the recommended install procedure above and the shared library versions are recommended only if you are running a production server making a lot of `/changes` API calls or need the diff replication functionality. +There are special database functions required by a (little-used) API call, the migrations and diff replication. The former two are provided as *either* pure SQL functions or a compiled shared library. The SQL versions are installed as part of the recommended install procedure above and the shared library versions are recommended only if you are running a production server and need the diff replication functionality. If you aren't sure which you need, stick with the SQL versions. @@ -271,14 +271,12 @@ cd ../.. If you previously installed the SQL versions of these functions, we'll need to delete those before adding the new ones: ``` -psql -d openstreetmap -c "DROP FUNCTION IF EXISTS maptile_for_point" psql -d openstreetmap -c "DROP FUNCTION IF EXISTS tile_for_point" ``` Then we create the functions within each database. We're using `pwd` to substitute in the current working directory, since PostgreSQL needs the full path. ``` -psql -d openstreetmap -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '`pwd`/db/functions/libpgosm', 'maptile_for_point' LANGUAGE C STRICT" psql -d openstreetmap -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '`pwd`/db/functions/libpgosm', 'tile_for_point' LANGUAGE C STRICT" psql -d openstreetmap -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '`pwd`/db/functions/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" ``` diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e3c8ff202..c010691c6 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -448,26 +448,11 @@ body.compact-nav { .welcome { display: none; - padding-bottom: 5px; p { - padding: $lineheight/2 $lineheight $lineheight; font-size: 110%; font-weight: 300; } - - .button { - width: 50%; - float: left; - margin: 0; - border-radius: 0; - font-weight: normal; - padding: .6em; - - &.learn-more { - border-right: 1px solid #fff; - } - } } #banner { @@ -1005,9 +990,8 @@ tr.turn:hover { .export_area_inputs { margin-bottom: $lineheight/2; input[type="text"] { - width: 80px; + width: 100px; text-align: center; - margin-bottom: 5px; } } @@ -1025,18 +1009,13 @@ tr.turn:hover { float: right; /* no-r2 */ margin-right: -1px; } - #minlat { margin-bottom: 0; } + #minlat { margin-bottom: -1px; } } .export_bound { margin: $lineheight/4; } - .export_button { - margin-top: $lineheight; - margin-bottom: $lineheight; - } - dl { padding-left: $lineheight/2; dd { diff --git a/app/controllers/api/changes_controller.rb b/app/controllers/api/changes_controller.rb deleted file mode 100644 index 7170e1562..000000000 --- a/app/controllers/api/changes_controller.rb +++ /dev/null @@ -1,54 +0,0 @@ -module Api - class ChangesController < ApiController - authorize_resource :class => false - - before_action :check_api_readable - around_action :api_call_handle_error, :api_call_timeout - - # Get a list of the tiles that have changed within a specified time - # period - def index - zoom = (params[:zoom] || "12").to_i - - if params.include?(:start) && params.include?(:end) - starttime = Time.parse(params[:start]) - endtime = Time.parse(params[:end]) - else - hours = (params[:hours] || "1").to_i.hours - endtime = Time.now.getutc - starttime = endtime - hours - end - - if zoom >= 1 && zoom <= 16 && - endtime > starttime && endtime - starttime <= 24.hours - mask = (1 << zoom) - 1 - - tiles = Node.where(:timestamp => starttime..endtime).group("maptile_for_point(latitude, longitude, #{zoom})").count - - doc = OSM::API.new.get_xml_doc - changes = XML::Node.new "changes" - changes["starttime"] = starttime.xmlschema - changes["endtime"] = endtime.xmlschema - - tiles.each do |tile, count| - x = (tile.to_i >> zoom) & mask - y = tile.to_i & mask - - t = XML::Node.new "tile" - t["x"] = x.to_s - t["y"] = y.to_s - t["z"] = zoom.to_s - t["changes"] = count.to_s - - changes << t - end - - doc.root << changes - - render :xml => doc.to_s - else - render :plain => "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", :status => :bad_request - end - end - end -end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b274b1808..a1129339e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -260,7 +260,7 @@ class UsersController < ApplicationController elsif current_user.auth_provider.present? # Verify external authenticator before moving on session[:new_user] = current_user - redirect_to auth_url(current_user.auth_provider, current_user.auth_uid) + redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect else # Save the user record session[:new_user] = current_user diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 5b33b57b3..39532572e 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -60,6 +60,7 @@ module UserHelper link_to( image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"), auth_path(options.merge(:provider => provider)), + :method => :post, :class => "auth_button", :title => t("users.login.auth_providers.#{name}.title") ) diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 33737ae23..0403bc889 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -41,15 +41,21 @@ <% unless current_user %>
<%= render "sidebar_header", :title => t("layouts.intro_header") %> -

<%= t "layouts.intro_text" %>

-

<%= t "layouts.hosting_partners_html", - :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), - :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), - :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> -

-
- <%= t("layouts.learn_more") %> - +
+

<%= t "layouts.intro_text" %>

+

<%= t "layouts.hosting_partners_html", + :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), + :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), + :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> +

+
+
+ <%= t("layouts.learn_more") %> +
+
+ <%= t("layouts.start_mapping") %> +
+
<% end %> diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb index 1d9630f71..1a4445eae 100644 --- a/app/views/messages/_message_summary.html.erb +++ b/app/views/messages/_message_summary.html.erb @@ -1,8 +1,8 @@ -"> +"> <%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %> <%= link_to message_summary.title, message_path(message_summary) %> <%= l message_summary.sent_on, :format => :friendly %> - <%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true %> - <%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true %> - <%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true %> + <%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true, :class => "btn btn-sm btn-primary" %> + <%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true, :class => "btn btn-sm btn-primary" %> + <%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %> diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb index ba18ca875..4d1b361b1 100644 --- a/app/views/messages/_sent_message_summary.html.erb +++ b/app/views/messages/_sent_message_summary.html.erb @@ -2,5 +2,5 @@ <%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %> <%= link_to sent_message_summary.title, message_path(sent_message_summary) %> <%= l sent_message_summary.sent_on, :format => :friendly %> - <%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %> + <%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index f35537953..8e940e341 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -18,9 +18,9 @@ <%= link_to token.client_application.name, token.client_application.url %> <%= token.authorized_at %> - <%= form_tag({ :controller => "oauth", :action => "revoke" }, { :class => "standard-form" }) do %> + <%= form_tag({ :controller => "oauth", :action => "revoke" }) do %> <%= hidden_field_tag "token", token.token %> - <%= submit_tag t(".revoke") %> + <%= submit_tag t(".revoke"), :class => "btn btn-sm btn-primary" %> <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 934b56a02..d6db3908b 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -2,17 +2,17 @@ <%= render "sidebar_header", :title => t(".title") %> -<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form standard-form" }) do %> +<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %> <%= hidden_field_tag "format", "osm" %>
- <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound") %> -
- <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound") %> - <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound") %> -

- <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound") %> + <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %> +
+ <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound form-control") %> + <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound form-control") %> +
+ <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %>
<%= t ".manually_select" %>
@@ -27,8 +27,8 @@
-
- <%= submit_tag t(".export_button") %> +
+ <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>

<%= t ".too_large.advice" %>

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 0b6e21788..1899e5145 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -11,23 +11,23 @@ <% end %> <% if @user_block.ends_at > Time.now %> -

- <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> -

+

+ <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> +

-<%= form_for :revoke, :url => { :action => "revoke" }, :html => { :class => "standard-form" } do |f| %> - <%= f.error_messages %> -

- <%= check_box_tag "confirm", "yes" %> - <%= label_tag "confirm", t(".confirm") %> -

-

- <%= submit_tag t(".revoke") %> -

-<% end %> + <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %> +
+
+ <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %> + <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %> +
+
+ + <%= f.primary t(".revoke") %> + <% end %> <% else %> -

- <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> -

+

+ <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> +

<% end %> diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index 43171d834..bb30581f9 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -100,9 +100,9 @@ <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
-
- checked="checked" <% end %> id="updatehome" /> - +
+ checked="checked" <% end %> id="updatehome" /> +
<%= tag.div "", :id => "map", :class => "content_map set_location" %> diff --git a/config/initializers/config.rb b/config/initializers/config.rb index b74ba57e6..d0f8c26fc 100644 --- a/config/initializers/config.rb +++ b/config/initializers/config.rb @@ -16,7 +16,7 @@ end # rubocop:enable Rails/Output, Rails/Exit # Allowed status values -ALLOWED_STATUS ||= [ +ALLOWED_STATUS = [ "online", # online and operating normally "api_readonly", # site online but API in read-only mode "api_offline", # site online but API offline diff --git a/config/locales/af.yml b/config/locales/af.yml index 4173b6937..d24e65a54 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -111,14 +111,19 @@ af: details: Verskaf asseblief meer besonderhede oor die probleem (verlang). user: email: E-pos + new_email: 'Nuwe e-posadres:' active: Bedrywig display_name: Skermnaam description: Beskrywing + home_lat: 'Breedtegraad:' + home_lon: 'Lengtegraad:' languages: Tale pass_crypt: Wagwoord help: trace: tagstring: komma afgebaken + user: + new_email: (word nooit openbaar vertoon nie) datetime: distance_in_words_ago: about_x_hours: @@ -1584,15 +1589,9 @@ af:

Registreer om 'n bydrae te lewer. Ons sal dan u registrasie per e-pos bevestig.

email address: 'E-posadres:' confirm email address: 'Bevestig e-posadres:' - not_displayed_publicly_html: U adres word nie openbaar gemaak nie; raadpleeg - ons privaatheidsbeleid - vir verdere inligting. display name: 'Skermnaam:' display name description: U gebruikernaam wat openbaar verskyn. U kan dit wel later nog onder voorkeure wysig. - password: 'Wagwoord:' - confirm password: 'Bevestig wagwoord:' use external auth: Gebruik andersins 'n derde party om mee aan te meld continue: Meld aan terms accepted: Dankie dat u die nuwe bydraerooreenkoms aanvaar het! @@ -1667,8 +1666,6 @@ af: title: Redigeer rekening my settings: My instellings current email address: 'Huidige e-posadres:' - new email address: 'Nuwe e-posadres:' - email never displayed publicly: (word nooit openbaar vertoon nie) public editing: heading: 'Openbare redigerings:' enabled: Geaktiveer. Nie anoniem nie en kan data redigeer. @@ -1676,16 +1673,12 @@ af: disabled link text: hoekom kan ek nie redigeer nie? contributor terms: link text: wat is dié? - profile description: 'Profielbeskrywing:' - preferred languages: 'Voorkeurtale:' image: 'Beeld:' new image: Voeg 'n beeld by keep image: Hou die huidige beeld replace image: Vervang die huidige beeld home location: 'Tuisligging:' no home location: U het nog geen tuisligging ingelees nie. - latitude: 'Breedtegraad:' - longitude: 'Lengtegraad:' update home location on click: Werk tuisligging by wanneer ek op die kaart klik? save changes button: Stoor Wysigings make edits public button: Stel al my redigerings openbaar @@ -1851,7 +1844,4 @@ af: add_note: Voeg 'n nota hier by show_address: Wys adres centre_map: Sentreer kaart hier - redactions: - edit: - description: Beskrywing ... diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 5dbdd3853..48da5cba3 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -103,9 +103,12 @@ aln: recipient: Marrës user: email: Email + new_email: 'Email adresa e re:' active: Aktiv display_name: Emri Display description: Përshkrimi + home_lat: 'Latituda:' + home_lon: 'Longituda:' languages: Gjuhët pass_crypt: Fjalëkalimi help: @@ -114,6 +117,8 @@ aln: user_block: needs_view: A i përdoruesit duhet të identifikoheni për para këtij blloku do të fshihet? + user: + new_email: (asnjëherë nuk është publikuar) browse: changeset: title: Ndryshim @@ -1104,13 +1109,9 @@ aln: ma shpejt që tjet e mundshme. email address: 'Email Adresa:' confirm email address: 'Konfirmo Adresën e Emailit:' - not_displayed_publicly_html: Nuk u shfaq publikisht (kshyre privacy policy) display name: 'Emni i pamshem:' display name description: Emni jot publik. Ju muni me ndrru ma von në preferencat e tua. - password: 'Fjalekalimi:' - confirm password: 'Konfirmo fjalëkalimin:' continue: Vazhdo terms: heading: rregullat për Pjesëmarrës @@ -1184,8 +1185,6 @@ aln: title: Ndrysho akountin my settings: Preferencat e mia current email address: 'Email adresa e tanishme:' - new email address: 'Email adresa e re:' - email never displayed publicly: (asnjëherë nuk është publikuar) public editing: heading: 'Ndryshime publike:' enabled: E pranishme. Jo anonime dhe muni me i ndryshue t'dhanat. @@ -1204,8 +1203,6 @@ aln: gjeni se pse ). contributor terms: - heading: 'Bedingungen für Mitwirkende:' + heading: Bedingungen für Mitwirkende agreed: Du hast den neuen Bedingungen für Mitwirkende zugestimmt. not yet agreed: Du hast der neuen Bedingungen für Mitwirkende bislang noch nicht zugestimmt. @@ -2636,14 +2637,10 @@ de: (unter Public Domain stellst). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Worum handelt es sich? - profile description: 'Profil-Beschreibung:' - preferred languages: 'Bevorzugte Sprachen:' - preferred editor: 'Bevorzugter Editor:' - image: 'Bild:' + image: Bild gravatar: gravatar: Gravatar verwenden link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: Was ist das? disabled: Gravatar wurde deaktiviert. enabled: Die Anzeige deines Gravatars wurde aktiviert. new image: Bild einfügen @@ -2654,8 +2651,6 @@ de: am besten) home location: 'Standort:' no home location: Du hast noch keinen Standort angegeben. - latitude: 'Breitengrad:' - longitude: 'Längengrad:' update home location on click: Standort beim Klick auf die Karte aktualisieren save changes button: Änderungen speichern make edits public button: Alle meine Bearbeitungen öffentlich machen @@ -3082,7 +3077,6 @@ de: centre_map: Karte hier zentrieren redactions: edit: - description: Beschreibung heading: Redaction bearbeiten title: Redaction bearbeiten index: @@ -3090,7 +3084,6 @@ de: heading: Liste der Redactions title: Liste der Redaktionen new: - description: Beschreibung heading: Informationenen für eine neue Redaction eingeben title: Neue Redaction erstellen show: diff --git a/config/locales/diq.yml b/config/locales/diq.yml index b21751d53..d0eece984 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -122,13 +122,18 @@ diq: title: Mewzu body: Metın recipient: Grotker + redaction: + description: Şınasnayış report: category: Qandê rapor jew sebeb weçinê user: email: E-poste + new_email: 'E-postay adresiyo newe:' active: Aktiv display_name: Nameyo ke Aseno description: Şınasnayış + home_lat: 'Verıniye:' + home_lon: 'Derganiye:' languages: Zıwani pass_crypt: Parola pass_crypt_confirmation: Parola tesdiq ke @@ -983,8 +988,6 @@ diq: email address: 'Adresa e-postey:' confirm email address: 'Adresê E-posta tesdiq ke:' display name: 'Nameyo ke Aseno:' - password: 'Parola:' - confirm password: 'Parolay tesdiq ke:' continue: Qeyd be terms: title: Terimi @@ -1058,7 +1061,6 @@ diq: title: Hesabi bıvurne my settings: Eyarê mı current email address: 'E-postay şımaya newki:' - new email address: 'E-postay adresiyo newe:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: no çıko? @@ -1071,13 +1073,9 @@ diq: heading: 'Pêron rê akerde vurnayış:' contributor terms: link text: no çıko? - preferred languages: 'Zıwanê ke tercih kerê:' - preferred editor: 'Editorê ke tercih kerê:' image: 'Resım:' new image: Yew resım cı ke home location: 'Herune:' - latitude: 'Verıniye:' - longitude: 'Derganiye:' save changes button: Vurnayışan qeyd ke return to profile: Peyser şo profil confirm: @@ -1195,10 +1193,6 @@ diq: way: Raye relation: Elaqe redactions: - edit: - description: Şınasnayış - new: - description: Şınasnayış show: description: 'Şınasnayış:' user: Vıraştoğ diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index fe11511ce..52210c8e2 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -96,11 +96,16 @@ dsb: title: Tema body: Tekst recipient: Dostawaŕ + redaction: + description: Wopisanje user: email: E-mail + new_email: 'Nowa e-mailowa adresa:' active: Aktiwny display_name: Wužywarske mě description: Wopisanje + home_lat: 'Šyrina:' + home_lon: 'Dlinina:' languages: Rěcy pass_crypt: Gronidło help: @@ -108,6 +113,8 @@ dsb: tagstring: pśez komu wótźělony user_block: needs_view: Musy se wužywaŕ pśizjawiś, nježli až toś to blokěrowanje se wótpórajo? + user: + new_email: (njejo nigda widobna) editor: default: Standard (tuchylu %{name}) id: @@ -1612,14 +1619,9 @@ dsb:

Zregistrěruj se a cyń sobu. Buźomy śi e-mailku słaś, aby my twójo konto wobkšuśili.

email address: 'E-mailowa adresa:' confirm email address: 'E-mailowu adresu wobkšuśiś:' - not_displayed_publicly_html: Njejo zjawnje widobny (glědaj pšawidła - priwatnosći) display name: 'Wužywarske mě:' display name description: Sy wužywarske mě zjawnje pokazał. Móžoš to pózdźej w nastajenjach změniś. - password: 'Gronidło:' - confirm password: 'Gronidło wobkšuśiś:' continue: Registrěrowaś terms accepted: Źěkujomy se, až sy nowe wuměnjenja za sobuskutkajucuch akceptěrował! terms declined: Woblutujomy, až sy se rozsuźił, nowe wužywarske wuměnjenja njeakceptěrowaś. @@ -1716,8 +1718,6 @@ dsb: title: Konto wobźěłaś my settings: Móje nastajenja current email address: 'Aktualna e-mailowa adresa:' - new email address: 'Nowa e-mailowa adresa:' - email never displayed publicly: (njejo nigda widobna) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: Co to jo? @@ -1746,13 +1746,9 @@ dsb: nowe wuměnjenja za sobuskutkajucych. agreed_with_pd: Sy teke deklarěrował, až twóje změny su zjawne. link text: Co to jo? - profile description: 'Profilowe wopisanje:' - preferred languages: 'Preferěrowane rěcy:' - preferred editor: 'Preferěrowany editor :' image: 'Wobraz:' gravatar: gravatar: Gravatar wužywaś - link text: Co to jo? new image: Wobraz pśidaś keep image: Aktualny wobraz wobchowaś delete image: Aktualny wobraz wótpóraś @@ -1760,8 +1756,6 @@ dsb: image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej) home location: 'Bydlišćo:' no home location: Njejsy swóje bydlišćo zapódał. - latitude: 'Šyrina:' - longitude: 'Dlinina:' update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś? save changes button: Změny składowaś make edits public button: Wše móje změny wózjawiś @@ -2008,7 +2002,6 @@ dsb: how. redactions: edit: - description: Wopisanje heading: Redakciju wobźěłaś title: Redakciju wobźěłaś index: @@ -2016,7 +2009,6 @@ dsb: heading: Lisćina redakcijow title: Lisćina redakcijow new: - description: Wopisanje heading: Informacije za nowu redakciju zapódaś title: Nowa redakcija se napórajo show: diff --git a/config/locales/el.yml b/config/locales/el.yml index 92fe6e354..a761c3676 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -139,14 +139,19 @@ el: title: Θέμα body: Κύριο μέρος recipient: Παραλήπτης + redaction: + description: Περιγραφή report: details: Παρακαλούμε παράσχετε περισσότερες λεπτομέρειες σχετικά με το πρόβλημα (απαιτείται). user: email: Ηλεκτρονικό ταχυδρομείο + new_email: 'Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου:' active: Ενεργό display_name: Εμφάνιση ονόματος description: Περιγραφή + home_lat: 'Γεωγραφικό πλάτος:' + home_lon: 'Γεωγραφικό μήκος:' languages: Γλώσσες pass_crypt: Κωδικός help: @@ -154,6 +159,8 @@ el: tagstring: διαχωρισμένο με κόμμα user_block: needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή; + user: + new_email: (να μην εμφανίζεται ποτέ δημόσια) datetime: distance_in_words_ago: about_x_hours: @@ -2162,16 +2169,10 @@ el:

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

email address: 'Διεύθυνση Ηλ. Ταχυδρομείου:' confirm email address: 'Επιβεβαίωση Διεύθυνσης Ηλ. Ταχυδρομείου:' - not_displayed_publicly_html: Η διεύθυνσή σας δεν εμφανίζεται δημόσια (δείτε - την πολιτική απορρήτου - για περισσότερες πληροφορίες) display name: 'Εμφανιζόμενο όνομα:' display name description: Το δημόσια εμφανιζόμενο όνομα χρήστη. Μπορείτε να το αλλάξετε αργότερα από τις προτιμήσεις. external auth: 'Έλεγχος ταυτότητας από τρίτο μέρος:' - password: 'Συνθηματικό:' - confirm password: 'Επιβεβαίωση συνθηματικού:' use external auth: Εναλλακτικά, χρησιμοποιήστε τρίτη υπηρεσία για είσοδο auth no password: Για την έγκριση τρίτων δεν απαιτείται κωδικός πρόσβασης, αλλά μερικά ειδικά εργαλεία αλλιώς ο διακομιστής μπορεί να χρειάζεται ένα. @@ -2293,8 +2294,6 @@ el: title: Επεξεργασία λογαριασμού my settings: Οι ρυθμίσεις μου current email address: 'Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου:' - new email address: 'Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου:' - email never displayed publicly: (να μην εμφανίζεται ποτέ δημόσια) external auth: 'Εξωτερική επαλήθευση ταυτότητας:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2329,14 +2328,10 @@ el: στον δημόσιο τομέα. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: τι είναι αυτό; - profile description: 'Περιγραφή Προφίλ:' - preferred languages: 'Προτιμώμενες Γλώσσες:' - preferred editor: 'Προτιμώμενο πρόγραμμα επεξεργασίας:' image: 'Εικόνα:' gravatar: gravatar: Χρήση Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: τι είναι αυτό; disabled: 'Το Gravatar έχει απενεργοποιηθεί:' enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας. new image: Προσθήκη εικόνας @@ -2346,8 +2341,6 @@ el: image size hint: (τετράγωνες εικόνες τουλάχιστον 100 x 100 λειτουργούν καλύτερα) home location: 'Τοποθεσία Σπιτιού:' no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας. - latitude: 'Γεωγραφικό πλάτος:' - longitude: 'Γεωγραφικό μήκος:' update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον χάρτη; save changes button: Αποθήκευση αλλαγών @@ -2777,7 +2770,6 @@ el: centre_map: Κεντράρισμα χάρτη εδώ redactions: edit: - description: Περιγραφή heading: Επεξεργασία παράληψης title: Επεξεργαστείτε την παράληψη index: @@ -2785,7 +2777,6 @@ el: heading: Κατάλογος παραλήψεων title: Κατάλογος συντακτικών αλλαγών new: - description: Περιγραφή heading: Εισαγωγή πληροφοριών για νέα παράληψη title: Δημιουργώντας νέα παράληψη show: diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index a54403e54..b48b8b727 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -147,14 +147,19 @@ en-GB: title: Subject body: Body recipient: Recipient + redaction: + description: Description report: category: 'Select a reason for your report:' details: Please provide some more details about the problem (required). user: email: E-mail + new_email: 'New Email Address:' active: Active display_name: Display Name description: Description + home_lat: 'Latitude:' + home_lon: 'Longitude:' languages: Languages pass_crypt: Password pass_crypt_confirmation: Confirm Password @@ -163,6 +168,8 @@ en-GB: tagstring: comma delimited user_block: needs_view: Does the user need to log in before this block will be cleared? + user: + new_email: (never displayed publicly) datetime: distance_in_words_ago: about_x_hours: @@ -2024,15 +2031,10 @@ en-GB:

Sign up to get started contributing. We'll send an email to confirm your account.

email address: 'Email Address:' confirm email address: 'Confirm Email Address:' - not_displayed_publicly_html: Your address is not displayed publicly, see our - privacy policy for more information display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' - password: 'Password:' - confirm password: 'Confirm Password:' use external auth: Alternatively, use a third party to login auth no password: With third party authentication a password is not required, but some extra tools or server may still need one. @@ -2136,8 +2138,6 @@ en-GB: title: Edit account my settings: My settings current email address: 'Current Email Address:' - new email address: 'New Email Address:' - email never displayed publicly: (never displayed publicly) external auth: 'External Authentication:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2168,14 +2168,10 @@ en-GB: in the Public Domain. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: what is this? - profile description: 'Profile Description:' - preferred languages: 'Preferred Languages:' - preferred editor: 'Preferred Editor:' image: 'Image:' gravatar: gravatar: Use Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: what is this? disabled: Gravatar has been disabled. enabled: Display of your Gravatar has been enabled. new image: Add an image @@ -2185,8 +2181,6 @@ en-GB: image size hint: (square images at least 100x100 work best) home location: 'Home Location:' no home location: You have not entered your home location. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Update home location when I click on the map? save changes button: Save Changes make edits public button: Make all my edits public @@ -2553,7 +2547,6 @@ en-GB: centre_map: Centre map here redactions: edit: - description: Description heading: Edit redaction title: Edit redaction index: @@ -2561,7 +2554,6 @@ en-GB: heading: List of redactions title: List of redactions new: - description: Description heading: Enter information for new redaction title: Creating new redaction show: diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 3c5b33501..ef8331c19 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -136,15 +136,25 @@ eo: title: Temo body: Enhavo recipient: Ricevonto + redaction: + title: Titolo + description: Priskribo report: category: Elektu kialon de via raporto details: Bonvolu enmeti kelkajn detalojn, kiuj priskribas la problemon (postulata). user: + auth_provider: Liveranto de aŭtentigo + auth_uid: Uzant‑identigilo de aŭtentigo email: Retpoŝto + email_confirmation: Konfirmi retpoŝtan adreson + new_email: Nova retpoŝta adreso active: Aktiva display_name: Montra nomo - description: Priskribo - languages: Lingvoj + description: Priskribo de profilo + home_lat: Latitudo + home_lon: Longitudo + languages: Preferataj lingvoj + preferred_editor: Preferata redaktilo pass_crypt: Pasvorto pass_crypt_confirmation: Konfirmi pasvorton help: @@ -156,6 +166,12 @@ eo: kaj memoru, ke la mesaĝo estos videbla publike. Memoru, ke ne ĉiuj uzantoj komprenas la komunuman ĵargonon, do bonvolu uzi simplajn vortojn. needs_view: Ĉu la uzanto devas ensaluti antaŭ ĉi tiu blokado nuligos? + user: + email_confirmation: Via retpoŝta adreso ne estos montrata publike, legu nian + privatecan politikon + por pli da informoj. + new_email: (neniam publike montrita) datetime: distance_in_words_ago: about_x_hours: @@ -2361,16 +2377,10 @@ eo: por komenci kontribuadon. Ni sendos al vi retleteron por konfirmi vian konton.

email address: 'Retpoŝtadreso:' confirm email address: 'Konfirmi retpoŝtadreson:' - not_displayed_publicly_html: Via adreso ne estos montrata publike, vidu nian - politikon pri - privateco por pli da informoj. display name: 'Montrata nomo:' display name description: Via publike montrata uzantnomo. Vi povas ŝanĝi ĝin poste per la agordoj. external auth: 'Ensaluti per ekstera servo:' - password: 'Pasvorto:' - confirm password: 'Konfirmi pasvorton:' use external auth: Alternative, ensaluti uzante eksteran servon auth no password: Kun ensalutado per ekstera servo, pasvorto ne endas, sed kelkaj iloj aŭ servilo krom tio povas bezoni ĝin. @@ -2488,15 +2498,13 @@ eo: account: title: Redakti konton my settings: Agordoj - current email address: 'Aktuala retpoŝta adreso:' - new email address: 'Nova retpoŝta adreso:' - email never displayed publicly: (neniam publike montrita) - external auth: 'Ekstera aŭtentigo:' + current email address: Aktuala retpoŝta adreso + external auth: Ekstera aŭtentigo openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: kio estas tio? public editing: - heading: 'Publika redaktado:' + heading: Publika redaktado enabled: Ebligita. Ne anonima kaj rajtas redakti. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Kio estas tio ? @@ -2512,7 +2520,7 @@ eo: kial). contributor terms: - heading: 'Interkonsento pri kontribuado:' + heading: Interkonsento pri kontribuado agreed: Vi konsentis la novan interkonsenton pri kontribuado. not yet agreed: Vi ankoraŭ ne konsentis la novan interkonsenton pri kontribuado. review link text: Bonvolu sekvi ĉi tiun ligilon por legi kaj akcepti la novan @@ -2521,14 +2529,11 @@ eo: havaĵo. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: kio estas tio? - profile description: 'Priskribo de profilo:' - preferred languages: 'Preferataj Lingvoj:' - preferred editor: 'Preferata redaktilo:' - image: 'Bildo:' + image: Profilbildo gravatar: gravatar: Uzi “Gravataron” link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: kio estas tio? + what_is_gravatar: Kio estas Gravatar? disabled: “Gravataro” estas malaktiva. enabled: Montrado de via “Gravataro” estas aktiva. new image: Aldoni bildon @@ -2536,10 +2541,8 @@ eo: delete image: Forigi la aktualan bildon replace image: Anstataŭigi la aktualan bildon image size hint: (kvadrataj bildoj kun grando pli ol 100x100 taŭgas) - home location: 'Hejma pozicio:' + home location: Hejma pozicio no home location: Vi ne enigis vian hejmlokon. - latitude: 'Latitudo:' - longitude: 'Longitudo:' update home location on click: Ĉu freŝigi la hejmlokon kiam mi klakas sur la mapo? save changes button: Konservi ŝanĝojn @@ -2955,7 +2958,6 @@ eo: centre_map: Centrigi mapon ĉi tien redactions: edit: - description: Priskribo heading: Redakti korekton title: Redakti korekton index: @@ -2963,7 +2965,6 @@ eo: heading: Listo de korektoj title: Listo de korektoj new: - description: Priskribo heading: Entajpu informojn pri novan korekton title: Kreado de nova korekto show: diff --git a/config/locales/es.yml b/config/locales/es.yml index 581cebf42..366d1fc9e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -183,14 +183,19 @@ es: title: Asunto body: Cuerpo recipient: Destinatario + redaction: + description: Descripción report: category: Seleccione un motivo de su informe details: Es necesario proporcionar más detalles sobre el problema. user: email: Correo electrónico + new_email: 'Nueva dirección de correo electrónico:' active: Activo display_name: Nombre para mostrar description: Descripción + home_lat: 'Latitud:' + home_lon: 'Longitud:' languages: Idiomas pass_crypt: Contraseña pass_crypt_confirmation: Confirmar contraseña @@ -200,6 +205,8 @@ es: user_block: needs_view: ¿Tiene que iniciar sesión el usuario antes de que este bloqueo sea eliminado? + user: + new_email: (nunca es mostrado públicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2448,16 +2455,10 @@ es:

Regístrese para comenzar a colaborar. Le enviaremos un correo electrónico para confirmar su cuenta.

email address: 'Dirección de correo electrónico:' confirm email address: 'Confirmar la dirección de correo electrónico:' - not_displayed_publicly_html: Su dirección no se muestra de forma pública. Consulte - nuestra normativa - de privacidad para obtener más información. display name: 'Nombre en pantalla:' display name description: Su nombre de usuario público. Puede cambiarlo más tarde en las preferencias. external auth: 'Autenticación de terceros:' - password: 'Contraseña:' - confirm password: 'Confirmar contraseña:' use external auth: O bien, utilice un servicio de terceros para acceder auth no password: Con la autenticación de terceros no se necesita una contraseña, aunque hay algunas herramientas y servidores que aún la solicitan. @@ -2576,8 +2577,6 @@ es: title: Editar cuenta my settings: Mis preferencias current email address: 'Dirección de correo electrónico actual:' - new email address: 'Nueva dirección de correo electrónico:' - email never displayed publicly: (nunca es mostrado públicamente) external auth: 'Autenticación externa:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2610,14 +2609,10 @@ es: Dominio Público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: ¿Qué es esto? - profile description: 'Descripción del perfil:' - preferred languages: 'Idiomas preferidos:' - preferred editor: 'Editor preferido:' image: 'Imagen:' gravatar: gravatar: Usa Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: ¿Qué es esto? disabled: Gravatar se ha deshabilitado. enabled: Se ha habilitado la visualización de su Gravatar. new image: Añadir una imagen @@ -2627,8 +2622,6 @@ es: image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor) home location: 'Lugar de origen:' no home location: No ha introducido su lugar de origen. - latitude: 'Latitud:' - longitude: 'Longitud:' update home location on click: ¿Actualizar su lugar de origen cuando pulses sobre el mapa? save changes button: Guardar cambios @@ -3055,7 +3048,6 @@ es: centre_map: Centrar el mapa aquí redactions: edit: - description: Descripción heading: Editar redacción title: Editar redacción index: @@ -3063,7 +3055,6 @@ es: heading: Lista de redacciones title: Lista de redacciones new: - description: Descripción heading: Introduzca la información de la nueva redacción title: Creando nueva redacción show: diff --git a/config/locales/et.yml b/config/locales/et.yml index 5847cd849..f7f78d6ff 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -114,14 +114,19 @@ et: title: Teema body: Sisu recipient: Saaja + redaction: + description: Kirjeldus report: category: Vali kaebuse põhjus details: Palun esita probleemi kohta veel üksikasju (nõutav). user: email: E-posti aadress + new_email: 'Uus e-posti aadress:' active: Aktiivne display_name: Kuvatav nimi description: Kirjeldus + home_lat: 'Laius:' + home_lon: 'Pikkus:' languages: Keeled pass_crypt: Parool pass_crypt_confirmation: Kinnita parool @@ -130,6 +135,8 @@ et: tagstring: komaga eraldatud user_block: needs_view: Kas kasutaja peab sisse logima enne kui see blokeering eemaldatakse? + user: + new_email: (ei näidata mitte kunagi avalikult) datetime: distance_in_words_ago: about_x_hours: @@ -1825,15 +1832,10 @@ et:

Registreeru, et alustada kaardi täiendamist. Saadame sulle e-kirja, et saaksid kinnitada oma kasutajakonto.

email address: 'E-posti aadress:' confirm email address: 'Kinnita e-posti aadress:' - not_displayed_publicly_html: Sinu aadressi ei näidata avalikult, lisateavet - loe meie andmekaitsereeglitest. display name: 'Kuvatav nimi:' display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem eelistustes. external auth: 'Kolmanda osapoole autentimine:' - password: 'Parool:' - confirm password: 'Kinnita parool:' use external auth: Teise võimalusena võid sisse logida kolmanda osapoole kaudu auth no password: Kolmanda osapoole autentimisega parooli ei nõuta, aga mõne lisatööriista või serveri jaoks võib seda siiski tarvis minna. @@ -1936,8 +1938,6 @@ et: title: Konto muutmine my settings: Minu seaded current email address: 'Praegune e-posti aadress:' - new email address: 'Uus e-posti aadress:' - email never displayed publicly: (ei näidata mitte kunagi avalikult) external auth: 'Väline autentimine:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -1968,13 +1968,9 @@ et: agreed_with_pd: Samuti oled deklareerinud oma kaastöö autoriõigustest vabaks (Public Domain). link text: mis see on? - profile description: 'Profiili kirjeldus:' - preferred languages: 'Eelistatud keeled:' - preferred editor: 'Vaikeredaktor:' image: 'Pilt:' gravatar: gravatar: Kasuta Gravatari - link text: mis see on? new image: Lisa pilt keep image: Säilitada praegune pilt delete image: Eemalda praegune pilt @@ -1982,8 +1978,6 @@ et: image size hint: (ruudukujuline pilt mõõtudega vähemalt 100x100 on sobiv) home location: 'Kodu asukoht:' no home location: Sa pole oma kodu asukohta märkinud. - latitude: 'Laius:' - longitude: 'Pikkus:' update home location on click: Kas uuendan kodu asukohta, kui klõpsan kaardil? save changes button: Salvesta muudatused make edits public button: Tee kõik minu muudatused avalikuks @@ -2310,7 +2304,6 @@ et: centre_map: Kuva kaardi keskel redactions: edit: - description: Kirjeldus heading: Redigeeri redaktsiooni title: Redigeeri redaktsiooni index: @@ -2318,7 +2311,6 @@ et: heading: Redaktsioonide loend title: Redaktsioonide loend new: - description: Kirjeldus heading: Sisesta teave uue redaktsiooni kohta title: Uue redaktsiooni loomine show: diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 8b5b8eacb..54a4d98f9 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -115,13 +115,18 @@ eu: title: Gaia body: Testua recipient: Hartzailea + redaction: + description: Deskribapena report: details: Mesedez, eman arazoaren inguruko xehetasun gehiago (beharrezkoa). user: email: Eposta + new_email: 'E-posta helbide berria:' active: Aktibo display_name: Erakusteko izena description: Deskribapena + home_lat: 'Latitude:' + home_lon: 'Longitude:' languages: Hizkuntzak pass_crypt: Pasahitza help: @@ -129,6 +134,8 @@ eu: tagstring: koma mugatua user_block: needs_view: Erabiltzaileak saioa hasi behar al du bloke hau garbitu aurretik? + user: + new_email: (inoiz ez da publikoki bistaratuko) editor: default: Lehenetsia (orain %{name}) id: @@ -2027,16 +2034,10 @@ eu:

Erregistratu lehenengo laguntzeko. Zure kontua baieztatzeko mezu elektronikoa bidaliko dizugu.

email address: 'Eposta Helbidea:' confirm email address: 'Eposta Helbidea baieztatu:' - not_displayed_publicly_html: Zure helbidea ez da publikoki erakutsiko, ikusi - gure pribatutasun - politika) informazio gehiagorako display name: 'Erakusteko izena:' display name description: Zuk publikoki erakutsitako erabiltzaile izena. Hau geroago alda dezakezu hobespenetan. external auth: 'Hirugarrenen Autentifikazioa:' - password: 'Pasahitza:' - confirm password: 'Pasahitza berretsi:' use external auth: Bestela, erabili hirugarrenen bat saioa hasteko auth no password: Hirugarrenen autentifikazioarekin pasahitza ez da beharrezkoa, baina zenbait tresna edo zerbitzari gehigarri batek oraindik ere behar izatea @@ -2144,8 +2145,6 @@ eu: title: Kontua aldatu my settings: Nire aukerak current email address: 'Egungo eposta helbidea:' - new email address: 'E-posta helbide berria:' - email never displayed publicly: (inoiz ez da publikoki bistaratuko) external auth: 'Kanpoko Autentifikazioa:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2177,14 +2176,10 @@ eu: agreed_with_pd: Zure aldaketak domeinu publikoan egongo direla adierazi duzu. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: zer da hau? - profile description: 'Profilaren Deskribapena:' - preferred languages: 'Hobetsitako hizkuntzak:' - preferred editor: 'Lehenetsitako Editorea:' image: 'Irudia:' gravatar: gravatar: Gravatar erabili link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: zer da hau? disabled: Gravatar desgaitu da. enabled: Zure Gravatar bistaratzea gaitu da. new image: Irudi bat gehitu @@ -2194,8 +2189,6 @@ eu: image size hint: (gutxienez 100x100ko irudi koadroak hobeto funtzionatzen dute) home location: 'Etxeko Kokalekua:' no home location: Zure etxe-helbidea ez duzu txertatu. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Eguneratu etxeko kokalekua mapan klik egiten dudanean? save changes button: Aldaketak gorde @@ -2585,7 +2578,6 @@ eu: centre_map: Mapa hona zentratu redactions: edit: - description: Deskribapena heading: Aldatu erredakzioa title: Aldatu erredakzioa index: @@ -2593,7 +2585,6 @@ eu: heading: Erredakzio zerrenda title: Erredakzio zerrenda new: - description: Deskribapena heading: Erredakzio berrirako informazioa sartu title: Erredakzio berria sortzen show: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 0f12dfe29..f84a6eff2 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -151,14 +151,19 @@ fa: title: عنوان body: متن recipient: گیرنده + redaction: + description: شرح report: category: دلیل گزارش خود را انتخاب کنید details: لطفاً جزئیات بیشتری از مشکل ارائه دهید (ضروری است). user: email: ایمیل + new_email: 'نشانی ایمیل جدید:' active: فعال display_name: نام نمایشی description: توضیحات + home_lat: 'عرض جغرافیایی:' + home_lon: 'طول جغرافیایی:' languages: زبان‌ها pass_crypt: گذرواژه pass_crypt_confirmation: تأیید گذرواژه @@ -170,6 +175,8 @@ fa: این دلیل مسدودشدن کاربر است. لطفاً خونسرد و منطقی باشید و هرچه می‌توانید به‌شکل جزئی‌تر اوضاع را شرح دهید. همچنین توجه داشته باشید که پیام شما به‌طور عمومی قابل مشاهده است. در نظر داشته باشید که همهٔ کاربران اصطلاحات تخصصی جامعه را نمی‌فهمند، لطفاً سعی کنید واژه‌هایی که استفاده می‌کنید غیرتخصصی باشد. needs_view: آیا قبل از پاک‌شدن این مسدودی، کاربر باید وارد حساب کاربری شود؟ + user: + new_email: (هرگز به‌صورت عمومی نشان داده نمی‌شود) datetime: distance_in_words_ago: about_x_hours: @@ -2277,15 +2284,10 @@ fa:

برای شروع همکاری، ثبت نام کنید. ایمیلی برای شما می‌فرستیم تا حساب کاربری‌تان را تأیید کنید.

email address: 'نشانی ایمیل:' confirm email address: 'تأیید نشانی ایمیل:' - not_displayed_publicly_html: ایمیل شما به دیگران نشان داده نمی‌شود. برای اطلاعات - بیشتر سیاست حریم خصوصی را ببینید display name: 'نام نمایشی:' display name description: نام کاربری شما که دیگران آن را می‌بینند. می‌توانید بعداً آن را در تنظیمات تغییر دهید. external auth: 'احراز هویت شخص ثالث:' - password: 'گذرواژه:' - confirm password: 'تأیید گذرواژه:' use external auth: به‌جای ثبت نام، از روش شخص ثالث استفاده کنید auth no password: در اعتبارسنجی به‌روش شخص ثالث نیازی به گذرواژهٔ اوپن‌استریت‌مپ ندارید اما شاید میزبان انتخابی شما گذرواژهٔ خودش را بخواهد. @@ -2402,8 +2404,6 @@ fa: title: ویرایش حساب my settings: تنظیمات من current email address: 'ایمیل فعلی:' - new email address: 'نشانی ایمیل جدید:' - email never displayed publicly: (هرگز به‌صورت عمومی نشان داده نمی‌شود) external auth: 'احراز هویت خارجی:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2435,14 +2435,10 @@ fa: باشد. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: این چیست؟ - profile description: 'شرح نمایه:' - preferred languages: 'زبان‌های ترجیحی:' - preferred editor: 'ویرایشگر ترجیحی:' image: 'تصویر:' gravatar: gravatar: استفاده از Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: این چیست؟ disabled: گراواتار غیرفعال شد. enabled: نمایش گراواتار شما فعال شد. new image: افزودن تصویر @@ -2452,8 +2448,6 @@ fa: image size hint: (عکس مربعی با ابعاد حداقل 100×100 بهترین کارایی را دارد) home location: 'موقعیت خانه:' no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید. - latitude: 'عرض جغرافیایی:' - longitude: 'طول جغرافیایی:' update home location on click: وقتی روی نقشه کلیک می‌کنم موقعیت خانه روزآمد شود. save changes button: ذخیرهٔ تغییرات @@ -2845,7 +2839,6 @@ fa: centre_map: اینجا را مرکز نقشه کن redactions: edit: - description: شرح heading: ویرایش پاک‌سازی title: ویرایش پاک‌سازی index: @@ -2853,7 +2846,6 @@ fa: heading: سیاههٔ پاک‌سازی‌ها(redactions) title: سیاههٔ پاک‌سازی‌ها new: - description: شرح heading: اطلاعات پاک‌سازی جدید را وارد کنید title: ایجاد پاک‌سازی جدید show: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 11c7689f7..02f3e020e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -155,13 +155,18 @@ fi: title: Aihe body: Viesti recipient: Vastaanottaja + redaction: + description: Kuvaus report: details: Kuvaile ongelmaa (pakollinen) user: email: Sähköpostiosoite + new_email: 'Uusi sähköpostiosoite:' active: Aktivoitu display_name: Näyttönimi description: Kuvaus + home_lat: 'Leveyspiiri:' + home_lon: 'Pituuspiiri:' languages: Kielet pass_crypt: Salasana pass_crypt_confirmation: Vahvista salasana @@ -170,6 +175,8 @@ fi: tagstring: pilkuilla eroteltu lista user_block: needs_view: Pitääkö tämän käyttäjän kirjautua sisään ennen kuin esto poistetaan? + user: + new_email: (ei näy muille) datetime: distance_in_words_ago: about_x_hours: @@ -2231,16 +2238,10 @@ fi:

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

email address: 'Sähköpostiosoite:' confirm email address: 'Sähköpostiosoite uudelleen:' - not_displayed_publicly_html: Osoitettasi ei esitetä julkisesti. Lisätietoja - tietosuojakäytännöstä - on saatavilla englanniksi. display name: 'Käyttäjätunnus:' display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin muuttaa asetuksista. external auth: 'Kolmannen osapuolen todennus:' - password: 'Salasana:' - confirm password: 'Salasana uudelleen:' use external auth: Voit myös kirjautua jonkun muun palvelun tunnuksilla auth no password: Mikäli kirjaudut sisään kolmannen osapuolen palveluiden avulla, sinun ei tarvitse luoda itsellesi salasanaa, mutta jotkin ylimääräiset työkalut @@ -2356,8 +2357,6 @@ fi: title: Asetusten muokkaus my settings: Käyttäjäasetukset current email address: 'Nykyinen sähköpostiosoite:' - new email address: 'Uusi sähköpostiosoite:' - email never displayed publicly: (ei näy muille) external auth: 'Kolmannen osapuolen tunnukset kirjautuessa:' openid: link: https://wiki.openstreetmap.org/wiki/Fi:OpenID @@ -2389,14 +2388,10 @@ fi: vapaita (Public Domain). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Mitä tämä tarkoittaa? - profile description: 'Henkilökuvaus:' - preferred languages: 'Kielivalinnat:' - preferred editor: 'Ensisijainen muokkausohjelma:' image: 'Kuva:' gravatar: gravatar: Käytä Gravataria link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: Mikä tämä on? disabled: Gravatar on poistettu käytöstä. enabled: Gravatarisi näyttäminen on otettu käyttöön. new image: Lisää kuva @@ -2407,8 +2402,6 @@ fi: 100x100) home location: 'Kotipaikka:' no home location: Kotipaikkaa ei ole vielä määritetty. - latitude: 'Leveyspiiri:' - longitude: 'Pituuspiiri:' update home location on click: Päivitä kotipaikka karttaa napsauttaessa save changes button: Tallenna muutokset make edits public button: Tee muokkauksistani julkisia @@ -2818,7 +2811,6 @@ fi: centre_map: Keskitä kartta redactions: edit: - description: Kuvaus heading: Muokkaa relaatiota title: Muokkaa relaatiota index: @@ -2826,7 +2818,6 @@ fi: heading: Relaatioiden luettelo title: Relaatioiden luettelo new: - description: Kuvaus heading: Kirjoita tietoja uudesta laitoksesta title: Luodaan uusi redaktio show: diff --git a/config/locales/fit.yml b/config/locales/fit.yml index 9d87db1f1..f5fffeb6b 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -99,15 +99,21 @@ fit: title: Aihe body: Viesti recipient: Vastaanottaja + redaction: + description: Kuvvaus report: details: Kuvaile prupleemaa (pakollinen) user: email: E-posti + new_email: 'Uusi e-postiatressi:' active: Aktivoitu display_name: Näyttönimi description: Kuvvaus languages: Kielet pass_crypt: Salasana + help: + user: + new_email: (ei näy muille) datetime: distance_in_words_ago: about_x_hours: @@ -948,8 +954,6 @@ fit: header: Mookkaa vapaasti email address: 'E-postiatressi:' confirm email address: 'E-postiatressi uuesti:' - password: 'Salasana:' - confirm password: 'Salasana uuesti:' continue: Luo konttu terms: title: Ehot @@ -984,15 +988,12 @@ fit: title: Mookkaa konttua my settings: Minun inställninkit current email address: 'Nykynen e-postiatressi:' - new email address: 'Uusi e-postiatressi:' - email never displayed publicly: (ei näy muille) public editing: heading: 'Mookkaukset julkisia:' enabled: Joo. Karttatietojen mookkaus sallittu. disabled link text: miksi en voi mookata? public editing note: heading: Julkinen mookkaus - preferred editor: 'Ensisijainen mookkausohjelma:' new image: Lissää kuva keep image: Säilytä nykynen kuva delete image: Ota poies nykynen kuva @@ -1066,7 +1067,6 @@ fit: centre_map: Keskitä kartta redactions: edit: - description: Kuvvaus heading: Mookkaa laitosta title: Mookkaa laitosta index: @@ -1074,7 +1074,6 @@ fit: heading: Laitosten luettelo title: Laitosten luettelo new: - description: Kuvvaus heading: Kirjota tietoja uudesta laitoksesta title: Luodaan uusi redaktio show: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0d0dca220..10067e650 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -189,15 +189,25 @@ fr: title: Sujet body: Corps recipient: Destinataire + redaction: + title: Titre + description: Description report: category: Sélectionner un motif pour votre signalement details: Veuillez fournir plus de détails sur le problème (obligatoire). user: + auth_provider: Fournisseur d’authentification + auth_uid: UID d’authentification email: Courriel + email_confirmation: Confirmation du courriel + new_email: Nouvelle adresse de courriel active: Actif display_name: Pseudonyme - description: Description - languages: Langues + description: Description du profil + home_lat: Latitude + home_lon: Longitude + languages: Langues préférées + preferred_editor: Éditeur préféré pass_crypt: Mot de passe pass_crypt_confirmation: Confirmer le mot de passe help: @@ -211,6 +221,12 @@ fr: le jargon de la communauté, donc essayez d’utiliser des termes simples. needs_view: Est-ce que l’utilisateur ou l’utilisatrice doit se connecter avant qu’expire ce blocage ? + user: + email_confirmation: Votre adresse n’est pas affichée publiquement, voyez notre + politique + de confidentialité pour plus d’informations. + new_email: (jamais affichée publiquement) datetime: distance_in_words_ago: about_x_hours: @@ -2484,16 +2500,10 @@ fr:

Inscrivez-vous pour commencer à participer. Nous vous enverrons un courriel pour confirmer votre compte.

email address: 'Adresse de courriel :' confirm email address: 'Confirmez l’adresse de courriel :' - not_displayed_publicly_html: Votre adresse n’est pas affichée publiquement, - voir notre politique de confidentialité pour plus d’informations display name: 'Nom affiché :' display name description: Votre nom d’utilisateur affiché publiquement. Vous pouvez changer ceci ultérieurement dans les préférences. external auth: 'Authentification tierce :' - password: 'Mot de passe :' - confirm password: 'Confirmez le mot de passe :' use external auth: Vous pouvez également utiliser un service tiers pour vous connecter. auth no password: Avec l’authentification par tiers, un mot de passe n’est pas @@ -2614,15 +2624,13 @@ fr: account: title: Modifier le compte my settings: Mes options - current email address: 'Adresse de courriel actuelle :' - new email address: 'Nouvelle adresse de courriel :' - email never displayed publicly: (jamais affichée publiquement) - external auth: 'Authentification externe :' + current email address: Adresse de courriel actuelle + external auth: Authentification externe openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: qu’est-ce que ceci ? public editing: - heading: 'Modification publique :' + heading: Modification publique enabled: Activée. Non anonyme et peut modifier les données. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: qu’est-ce que ceci ? @@ -2642,7 +2650,7 @@ fr: opération ne peut pas être annulée et tous les nouveaux utilisateurs sont maintenant en mode de « modifications publiques » par défaut. contributor terms: - heading: 'Conditions de contribution :' + heading: Conditions de contribution agreed: Vous avez accepté les nouvelles Conditions de contribution. not yet agreed: Vous n’avez pas encore accepté les nouvelles Conditions de contribution. @@ -2652,14 +2660,11 @@ fr: comme relevant du domaine public. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: qu’est-ce que ceci ? - profile description: 'Description du profil :' - preferred languages: 'Langues préférées :' - preferred editor: 'Éditeur préféré :' - image: 'Image :' + image: Image gravatar: gravatar: Utiliser Gravatar link: https://wiki.openstreetmap.org/wiki/FR:Gravatar - link text: qu’est-ce que ceci ? + what_is_gravatar: Qu’est-ce que Gravatar ? disabled: Gravatar a été désactivé. enabled: L’affichage de votre Gravatar a été activé. new image: Ajouter une image @@ -2668,10 +2673,8 @@ fr: replace image: Remplacer l’image actuelle image size hint: (les images carrées d’au moins 100×100 pixels fonctionnent le mieux) - home location: 'Lieu de domicile :' + home location: Lieu de domicile no home location: Vous n’avez pas indiqué votre lieu de domicile. - latitude: 'Latitude :' - longitude: 'Longitude :' update home location on click: Mettre à jour mon lieu de domicile quand je clique sur la carte ? save changes button: Enregistrer les modifications @@ -3097,7 +3100,6 @@ fr: centre_map: Centrer la carte ici redactions: edit: - description: Description heading: Modifier le masquage title: Modifier le masquage index: @@ -3105,7 +3107,6 @@ fr: heading: Liste des masquages title: Liste des masquages new: - description: Description heading: Saisissez les informations sur le nouveau masquage title: Création d’un nouveau masquage show: diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 86d92fb63..e7dc0e604 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -90,16 +90,23 @@ fur: title: Sogjet body: Cuarp recipient: Destinatari + redaction: + description: Descrizion user: email: Pueste eletroniche + new_email: 'Gnove direzion di pueste:' active: Atîf display_name: Non di mostrâ description: Descrizion + home_lat: 'Latitudin:' + home_lon: 'Longjitudin:' languages: Lenghis pass_crypt: Password help: trace: tagstring: separâts di virgulis + user: + new_email: (mai mostrade in public) editor: default: Predeterminât (par cumò %{name}) id: @@ -1101,8 +1108,6 @@ fur: display name: 'Non di mostrâ:' display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs gambiâlu plui tart tes preferencis. - password: 'Password:' - confirm password: 'Conferme la password:' continue: Regjistriti terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî! terms: @@ -1190,8 +1195,6 @@ fur: title: Modifiche profîl my settings: Mês impostazions current email address: 'Direzion di pueste eletroniche atuâl:' - new email address: 'Gnove direzion di pueste:' - email never displayed publicly: (mai mostrade in public) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: ce isal chest? @@ -1214,13 +1217,9 @@ fur: agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal Public Domini. link text: ce isal chest? - profile description: 'Descrizion dal profîl:' - preferred languages: 'Lenghis preferidis:' - preferred editor: 'Editôr preferît:' image: 'Figure:' gravatar: gravatar: Dopre Gravatar - link text: ce isal chest? new image: Zonte une figure keep image: Ten la figure di cumò delete image: Gjave la figure di cumò @@ -1228,8 +1227,6 @@ fur: image size hint: (figuris cuadris di almancul 100x100 a van miôr) home location: 'Lûc iniziâl:' no home location: No tu âs configurât il lûc iniziâl. - latitude: 'Latitudin:' - longitude: 'Longjitudin:' update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi parsore la mape? save changes button: Salve cambiaments @@ -1430,10 +1427,6 @@ fur: error: 'Erôr contatant %{server}: %{error}' timeout: Timp scjadût contatant %{server} redactions: - edit: - description: Descrizion - new: - description: Descrizion show: description: 'Descrizion:' user: 'Creadôr:' diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 2544f2a89..3d1bde693 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -90,11 +90,16 @@ ga: title: Ábhar body: Corp recipient: Faighteoir + redaction: + description: Cur síos user: email: Ríomhphost + new_email: 'An seoladh ríomhphoist nua:' active: Gníomhach display_name: Ainm Taispeána description: Cur síos + home_lat: 'Domhanleithead:' + home_lon: 'Domhanfhad:' languages: Teangacha pass_crypt: Focal Faire help: @@ -102,6 +107,8 @@ ga: tagstring: teormharcáilte le camóga user_block: needs_view: An gá don úsáideoir logáil isteach sula mbainfear an bac seo? + user: + new_email: (nach dtaispeántar go poiblí riamh) editor: default: Réamhshocraithe (%{name} faoi láthair) id: @@ -1836,16 +1843,10 @@ ga: header: Saor in aisce agus oscailte don eagarthóireacht email address: 'Seoladh ríomhphoist:' confirm email address: 'Deimhnigh an Seoladh Ríomhphoist:' - not_displayed_publicly_html: Ní thaispeáintear do sheoladh go poiblí, féach - an polasaí príobháideachta - atá againn chun tuilleadh eolais a fháil display name: 'Ainm Taispeána:' display name description: An t-ainm úsáideora atá agat a thaispeántar go poiblí. Is féidir leat é seo a athrú níos moille sna sainroghanna. external auth: 'Fíordheimhniú Tríú Páirtí:' - password: 'Focal Faire:' - confirm password: 'Deimhnigh an Focal Faire:' use external auth: Nó, bain úsáid as tríú páirtí le logáil isteach continue: Cláraigh terms accepted: Go raibh maith agat as glacadh leis na téarmaí nua do rannchuiditheoirí. @@ -1915,8 +1916,6 @@ ga: title: Cuir an cuntas in eagar my settings: Mo chuid socruithe current email address: 'An seoladh ríomhphoist reatha:' - new email address: 'An seoladh ríomhphoist nua:' - email never displayed publicly: (nach dtaispeántar go poiblí riamh) external auth: 'Fíordheimhniú Seachtrach:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -1930,12 +1929,9 @@ ga: not yet agreed: Níor aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí fós. link text: céard é seo? - preferred languages: 'Teangacha is fearr leat:' - preferred editor: 'An tEagarthóir is fearr leat:' image: 'Íomhá:' gravatar: gravatar: Úsáid Gravatar - link text: céard é seo? disabled: Díchumasaíodh Gravatar. new image: Cuir íomhá leis keep image: Coinnigh an íomhá reatha @@ -1943,8 +1939,6 @@ ga: replace image: Ionadaigh an íomhá reatha image size hint: (íomhá chearnógach atá 100x100 ar a laghad is fearr) home location: 'Suíomh Baile:' - latitude: 'Domhanleithead:' - longitude: 'Domhanfhad:' save changes button: Sábháil na hAthruithe confirm: heading: Féach sna ríomhphoist! @@ -2144,10 +2138,6 @@ ga: directions_to: Treoracha go dtí seo add_note: Cuir isteach nóta anseo redactions: - edit: - description: Cur síos - new: - description: Cur síos show: description: 'Cur síos:' title: Ceilt á taispeáint diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 0dc10f2b6..9cbaca834 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -100,11 +100,16 @@ gd: title: Cuspair body: Bodhaig recipient: Faightear + redaction: + description: Tuairisgeul user: email: Post-d + new_email: 'An seòladh puist-d ùr:' active: Gnìomhach display_name: Ainm seallaidh description: Tuairisgeul + home_lat: 'Domhan-leud:' + home_lon: 'Domhan-fhad:' languages: Cànain pass_crypt: Facal-faire help: @@ -113,6 +118,8 @@ gd: user_block: needs_view: Am bi aig a' chleachdaiche clàradh a-steach mus dèid am bacadh seo a thoirt air falamh? + user: + new_email: (na seall gu poblach idir) printable_name: with_version: '%{id}, v%{version}' with_name_html: '%{name} (%{id})' @@ -1813,16 +1820,10 @@ gd:

Clàraich gus taic a thoirt dhuinn. Cuiridh sinn post-d thugad gus an cunntas agad a dhearbhadh.

email address: 'Seòladh puist-d:' confirm email address: 'Dearbhaich an seòladh puist-d:' - not_displayed_publicly_html: Cha dèid do sheòladh shealltainn gu poblach, thoir - sùil air poileasaidh - na prìobhaideachd airson barrachd fiosrachaidh display name: 'Ainm seallaidh:' display name description: An t-ainm-cleachdaiche agad a thèid a shealltainn gu poblach. 'S urrainn dhut seo atharrachadh uair sam bith sna roghainnean. external auth: 'Dearbhadh treas-phàrtaidh:' - password: 'Facal-faire:' - confirm password: 'Dearbhaich am facal-faire:' use external auth: No cleachd treas-phàrtaidh airson clàradh a-steach auth no password: Chan iarr sinn facal-faire ort le dearbhadh treas-phàrtaidh ach dh'fhaoidte gum bi innealan a bharrachd no frithealaiche feumach air fear @@ -1931,8 +1932,6 @@ gd: title: Deasaich an cunntas my settings: Na roghainnean agam current email address: 'An seòladh puist-d làithreach:' - new email address: 'An seòladh puist-d ùr:' - email never displayed publicly: (na seall gu poblach idir) external auth: 'Dearbhadh taobh a-muigh:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID @@ -1967,14 +1966,10 @@ gd: chur ris a' Public Domain. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Dè th`ann? - profile description: 'Tuairisgeul na pròifil:' - preferred languages: 'Na cànanan as fhearr leat:' - preferred editor: 'An deasaiche as fhearr leat:' image: 'Dealbh:' gravatar: gravatar: Cleachd Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: Dè th`ann? new image: Cuir dealbh ris keep image: Cum an dealbh làithreach delete image: Thoir an dealbh làithreach air falbh @@ -1982,8 +1977,6 @@ gd: image size hint: (bidh dealbhan ceàrnach a bhios 100x100 no nas motha as fhearr) home location: 'Far a bheil thu a'' fuireach:' no home location: Cha do dh'innis thu far a bheil thu a' fuireach. - latitude: 'Domhan-leud:' - longitude: 'Domhan-fhad:' update home location on click: A bheil thu airson ùrachadh far a bheil thu a' fuireach le briogadh air a' mhapa? save changes button: Sàbhail na dh'atharraich thu @@ -2285,7 +2278,6 @@ gd: timeout: Dh'fhalbh an ùine air a' chonaltradh le %{server} redactions: edit: - description: Tuairisgeul heading: Deasaich an t-ath-sgrùdadh title: Deasaich an t-ath-sgrùdadh index: @@ -2293,7 +2285,6 @@ gd: heading: Liosta nan ath-sgrùdaidhean title: Liosta nan ath-sgrùdaidhean new: - description: Tuairisgeul heading: Cuir a-steach fiosrachadh airson ath-sgrùdadh ùr title: A' cruthachadh ath-sgrùdadh ùr show: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 4fdedf877..2f8b3e94a 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -130,14 +130,19 @@ gl: title: Asunto body: Corpo recipient: Destinatario + redaction: + description: Descrición report: category: Escoller a razón da túa denuncia details: Por favor, achegue máis detalles sobre o problema (requirido) user: email: Enderezo de correo electrónico + new_email: 'Novo enderezo de correo electrónico:' active: Activo display_name: Nome público description: Descrición + home_lat: 'Latitude:' + home_lon: 'Lonxitude:' languages: Linguas pass_crypt: Contrasinal pass_crypt_confirmation: Confirmar contrasinal @@ -152,6 +157,8 @@ gl: termos sinxelos. needs_view: O usuario ten que acceder ó sistema antes de que o bloqueo sexa revogado? + user: + new_email: (nunca amosado publicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2419,16 +2426,10 @@ gl:

Rexístrate para comezar a contribuír. Enviarémosche un correo electrónico para confirmar a túa conta.

email address: 'Enderezo de correo electrónico:' confirm email address: Confirmar o enderezo de correo electrónico - not_displayed_publicly_html: O teu enderezo IP non se amosa publicamente, olla - a nosa política - de protección de datos para máis información display name: 'Nome público:' display name description: O teu nome de usuario amosado publicamente. Podes mudalo máis tarde nos axustes. external auth: 'Autenticación de terceiros:' - password: 'Contrasinal:' - confirm password: 'Confirmar o contrasinal:' use external auth: Ou ben, emprega un servizo de terceiros para acceder auth no password: Coa autenticación de terceiros non se precisa un contrasinal, aínda que hai algunhas ferramentas e servidores que aínda a solicitan. @@ -2545,8 +2546,6 @@ gl: title: Editar a conta my settings: Os meus axustes current email address: 'Enderezo de correo electrónico actual:' - new email address: 'Novo enderezo de correo electrónico:' - email never displayed publicly: (nunca amosado publicamente) external auth: 'Autenticación externa:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2579,14 +2578,10 @@ gl: dominio público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: que é isto? - profile description: 'Descrición do perfil:' - preferred languages: 'Linguas preferidas:' - preferred editor: 'Editor preferido:' image: 'Imaxe:' gravatar: gravatar: Empregar o Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: que é isto? disabled: Gravatar foi desactivado. enabled: A visualización do teu Gravatar foi activada. new image: Engadir unha imaxe @@ -2596,8 +2591,6 @@ gl: image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor) home location: 'Lugar de orixe:' no home location: Non inseriches o teu lugar de orixe. - latitude: 'Latitude:' - longitude: 'Lonxitude:' update home location on click: Desexas actualizar a túa localización ó premer sobre o mapa? save changes button: Gardar as modificacións @@ -3019,7 +3012,6 @@ gl: centre_map: Centrar o mapa aquí redactions: edit: - description: Descrición heading: Editar a redacción title: Editar a redacción index: @@ -3027,7 +3019,6 @@ gl: heading: Listaxe das redaccións title: Listaxe das redaccións new: - description: Descrición heading: Escriba a información da nova redacción title: Creando unha nova redacción show: diff --git a/config/locales/he.yml b/config/locales/he.yml index d1d0aabb2..d07f61afe 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -146,14 +146,19 @@ he: title: נושא body: גוף recipient: נמען + redaction: + description: תיאור report: category: נא לבחור את הסיבה לדיווח שלך details: נא לספק פרטים נוספים על הבעיה (נדרש). user: email: דוא״ל + new_email: 'כתובת דוא״ל חדשה:' active: פעיל display_name: שם לתצוגה description: תיאור + home_lat: 'קו רוחב:' + home_lon: 'קו אורך:' languages: שפות pass_crypt: סיסמה pass_crypt_confirmation: אימות סיסמה @@ -165,6 +170,8 @@ he: פרטים על המצב. נא לזכור שלא כל המשתמשים מבינים את העגה המקצועית של הקהילה ולהשתדל להשתמש במילים ברורות לכול. needs_view: האם המשתמש צריך להיכנס לפני שהחסימה הזאת תנוקה? + user: + new_email: (לעולם לא מוצגת בפומבי) datetime: distance_in_words_ago: about_x_hours: @@ -2389,14 +2396,10 @@ he:

כדי להתחיל לתרום יש להירשם. אנו נשלח דואר אלקטרוני כדי לאמת את חשבונך.

email address: 'כתובת דוא״ל:' confirm email address: 'אימות כתובת דוא״ל:' - not_displayed_publicly_html: הכתובת שלך לא מוצגת בפומבי, למידע נוסף ראה מדיניות פרטיות display name: 'שם להצגה:' display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעדפות שלך. external auth: 'אימות עם צד שלישי:' - password: 'סיסמה:' - confirm password: 'אימות סיסמה:' use external auth: 'לחלופין, השתמשו בצד שלישי כדי להיכנס:' auth no password: עם אימות צד שלישי אין צורך בסיסמה, אבל כלים נוספים או שרת יכולים להזדקק לכזה. @@ -2509,8 +2512,6 @@ he: title: עריכת חשבון my settings: ההגדרות שלי current email address: 'כתובת דוא״ל נוכחית:' - new email address: 'כתובת דוא״ל חדשה:' - email never displayed publicly: (לעולם לא מוצגת בפומבי) external auth: 'אימות חיצוני:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2540,14 +2541,10 @@ he: agreed_with_pd: הצהרת גם שמבחינתך העריכות שלך יהיו בנחלת הכלל. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: מה זה? - profile description: 'תיאור פרופיל:' - preferred languages: 'שפות מועדפות:' - preferred editor: 'עורך מועדף:' image: 'תמונה:' gravatar: gravatar: להשתמש ב־Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: מה זה? disabled: הגראווטר כובה. enabled: הצגת הגראווטר שלך הופעלה. new image: הוספת תמונה @@ -2557,8 +2554,6 @@ he: image size hint: (תמונה מרובעת בגודל 100x100 לפחות עובדת הכי טוב) home location: 'מיקום ראשי:' no home location: לא הזנת את מיקומך הראשי. - latitude: 'קו רוחב:' - longitude: 'קו אורך:' update home location on click: עדכון המיקום הראשי שלך בעת לחיצה על המפה? save changes button: שמירת השינויים make edits public button: להפוך את כל עריכותיי לציבוריות @@ -2970,7 +2965,6 @@ he: centre_map: למרכז את המפה כאן redactions: edit: - description: תיאור heading: עריכת הסרה title: עריכת חיתוך index: @@ -2978,7 +2972,6 @@ he: heading: רשימת חיתוכים title: רשימת הסרות new: - description: תיאור heading: הוספת מידע להסרה חדשה title: מתבצעת יצירת חיתוך חדש show: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 86c00f467..c025da550 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -999,8 +999,6 @@ hi: disabled link text: मैं नक्षे में बदलाव क्यों नहीं कर पा रहा हूँ? contributor terms: link text: यह क्या है? - gravatar: - link text: यह क्या है? new image: कोई तस्वीर लगाएं keep image: इसी तस्वीर को रखें delete image: इस तस्वीर को हटाएं diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 2b848173d..5f196b4d8 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -116,11 +116,16 @@ hr: title: Naslov body: Tijelo recipient: Primatelj + redaction: + description: Opis user: email: Email + new_email: 'Nova E-mail adresa:' active: Aktivan display_name: Prikaži ime description: Opis + home_lat: 'Geografska širina (Latitude):' + home_lon: 'Geografska dužina (Longitude):' languages: Jezici pass_crypt: Lozinka help: @@ -128,6 +133,8 @@ hr: tagstring: odvojeno zarezom user_block: needs_view: Da li se korisnik mora prijaviti prije nego li se očisti blokada? + user: + new_email: (nikada se ne prikazuje javno) datetime: distance_in_words_ago: half_a_minute: prije pola minute @@ -1587,15 +1594,10 @@ hr:

Prijavite se i krenite uređivati. Poslat ćemo vam e-mail kako bi potvrdili vaš račun.

email address: 'Email:' confirm email address: 'Potvrdi e-mail:' - not_displayed_publicly_html: Vaša adresa nije javno prikazana, vidi naša pravila o privatnosti) display name: 'Korisničko ime:' display name description: Javno prikazano korisničko ime. Možete ga promjeniti i kasnije u postavkama. external auth: 'Prijavljivanje sa drugog servisa:' - password: 'Lozinka:' - confirm password: 'Potvrdi zaporku:' use external auth: Alternativno, koristite drugi servis za prijavljivanje auth no password: Sa prijavljivanjem sa drugog servisa ne trebate lozinku, ali drugi alati ili serveri će možda trebati. @@ -1693,8 +1695,6 @@ hr: title: Uredi korisnički račun my settings: Moje postavke current email address: 'Trenutna E-mail adresa:' - new email address: 'Nova E-mail adresa:' - email never displayed publicly: (nikada se ne prikazuje javno) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: što je ovo? @@ -1723,13 +1723,9 @@ hr: i prihvati nove Uvjete doprinositelja. agreed_with_pd: Također ste proglasili da će vaše izmjene biti u javnom vlasništvu. link text: što je ovo? - profile description: 'Opis profila:' - preferred languages: 'Željeni jezici:' - preferred editor: 'Preferirani editor:' image: 'Slika:' gravatar: gravatar: Koristi Gravatar - link text: što je ovo? new image: Dodajte sliku keep image: Zadržite trenutnu sliku delete image: Uklonite trenutnu sliku @@ -1737,8 +1733,6 @@ hr: image size hint: (kvadratne slike od barem 100x100 pixela rade najbolje) home location: 'Dom:' no home location: Niste unjeli lokaciju vašeg doma. - latitude: 'Geografska širina (Latitude):' - longitude: 'Geografska dužina (Longitude):' update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu? save changes button: Snimi promjene make edits public button: Napravi sve moje promjene javnim @@ -2002,10 +1996,6 @@ hr: show_address: Prikaži adresu query_features: Provjeri elemente karte redactions: - edit: - description: Opis - new: - description: Opis show: description: 'Opis:' user: 'Tvorac:' diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 62204fe5d..ecb75afa6 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -105,13 +105,18 @@ hsb: title: Tema body: Tekst recipient: Přijimowar + redaction: + description: Wopisanje report: details: Prošu zapodaj wjace podrobnosćow k tutomu problemej (trěbne). user: email: E-mejl + new_email: 'Nowa e-mejlowa adresa:' active: Aktiwny display_name: Wužiwarske mjeno description: Wopisanje + home_lat: 'Šěrokostnik:' + home_lon: 'Dołhostnik:' languages: Rěče pass_crypt: Hesło help: @@ -119,6 +124,8 @@ hsb: tagstring: přez komu dźěleny user_block: needs_view: Dyrbi so wužiwar přizjewić, prjedy hač so tute blokowanje zběhnje? + user: + new_email: (njeje ženje zjawnje widźomna) datetime: distance_in_words_ago: about_x_hours: @@ -1999,15 +2006,10 @@ hsb:

Zregistruj so a skutkuj sobu. Budźemy ći e-mejlku słać, zo bychmy twoje konto wobkrućili.

email address: 'E-mejlowa adresa:' confirm email address: 'E-mejlowu adresu wobkrućić:' - not_displayed_publicly_html: Njepokazuje so zjawnje (hlej Prawidła - priwatnosće) display name: 'Wužiwarske mjeno:' display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo w nastajenjach změnić. external auth: Awtentifikacija přez třeću stronu - password: 'Hesło:' - confirm password: 'Hesło wobkrućić:' use external auth: Jako alternatiwa wužij třeću stronu za přizjewjenje auth no password: Z přizjewjenjom přez třeću stronu hesło trěbne njeje, ale někotrym přidatnym funkcijam abo serweram móhło być trjeba. @@ -2108,8 +2110,6 @@ hsb: title: Konto wobdźěłać my settings: Moje nastajenja current email address: 'Aktualna e-mejlowa adresa:' - new email address: 'Nowa e-mejlowa adresa:' - email never displayed publicly: (njeje ženje zjawnje widźomna) external auth: 'Eksterna awtentifikacija:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID @@ -2139,14 +2139,10 @@ hsb: za sobuskutkowarjow přehladał a akceptował. agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne. link text: što to je? - profile description: 'Profilowe wopisanje:' - preferred languages: 'Preferowane rěče:' - preferred editor: 'Preferowany editor:' image: 'Wobraz:' gravatar: gravatar: Gravatar wužiwać link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: Što to je? new image: Wobraz přidać keep image: Aktualny wobraz wobchować delete image: Aktualny wobraz wotstronić @@ -2155,8 +2151,6 @@ hsb: funguja) home location: 'Domjace stejnišćo:' no home location: Njejsy swoje domjace stejnišćo zapodał. - latitude: 'Šěrokostnik:' - longitude: 'Dołhostnik:' update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować? save changes button: Změny składować make edits public button: Wšě moje změny zjawne činić @@ -2470,7 +2464,6 @@ hsb: timeout: Čas překročowany při kontaktowanju %{server} redactions: edit: - description: Wopisanje heading: Redakciju wobdźěłać title: Redakciju wobdźěłać index: @@ -2478,7 +2471,6 @@ hsb: heading: Lisćina redakcijow title: Lisćina redakcijow new: - description: Wopisanje heading: Informacije za nowu redakciju zapodać title: Nowa redakcija so wutworja show: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index c94bffed7..b1764cb00 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -133,14 +133,22 @@ hu: title: Tárgy body: Szöveg recipient: Címzett + redaction: + title: Cím + description: Leírás report: details: Kérlek részletezd a problémát (kötelező). user: email: E-mail + email_confirmation: E-mail cím megerősítése + new_email: Új e-mail-cím active: Aktív display_name: Megjelenítendő név - description: Leírás - languages: Nyelvek + description: Profil leírása + home_lat: 'Földrajzi szélesség:' + home_lon: 'Földrajzi hosszúság:' + languages: Előnyben részesített nyelvek + preferred_editor: Előnyben részesített szerkesztő pass_crypt: Jelszó pass_crypt_confirmation: Jelszó megerősítése help: @@ -148,6 +156,11 @@ hu: tagstring: vesszővel elválasztva user_block: needs_view: Be kell jelentkeznie a felhasználónak, mielőtt a blokkolás feloldódik? + user: + email_confirmation: E-mail címed nem jelenik nyilvánosan. További információ + privacy policy. + new_email: (soha nem jelenik meg nyilvánosan) datetime: distance_in_words_ago: about_x_hours: @@ -2108,15 +2121,10 @@ hu:

Regisztrálj és máris kezdheted a térképszerkesztést. Egy jóváhagyó e-mailt fogunk küldeni a címedre.

email address: 'E-mail cím:' confirm email address: 'E-mail cím megerősítése:' - not_displayed_publicly_html: Nem jelenik meg nyilvánosan (lásd adatvédelmi irányelvek) display name: 'Megjelenítendő név:' display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban később megváltoztathatod. external auth: 'Harmadik fél általi hitelesítés:' - password: 'Jelszó:' - confirm password: 'Jelszó megerősítése:' use external auth: Alternatívaként használhatsz külső fiókokat a bejelentkezéshez auth no password: Harmadik féltől származó hitelesítés esetén a jelszó nem kötelező, de néhány extra eszköz vagy szerver igényelhet egyet. @@ -2231,15 +2239,13 @@ hu: account: title: Felhasználói fiók szerkesztése my settings: Beállításaim - current email address: 'Jelenlegi e-mail-cím:' - new email address: 'Új e-mail-cím:' - email never displayed publicly: (soha nem jelenik meg nyilvánosan) - external auth: 'Külső Hitelesítés:' + current email address: Jelenlegi e-mail-cím + external auth: Külső hitelesítés openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: mi ez? public editing: - heading: 'Nyilvános szerkesztés:' + heading: Nyilvános szerkesztés enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: mi ez? @@ -2258,7 +2264,7 @@ hu: a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó már nyilvános. contributor terms: - heading: 'Hozzájárulási feltételek:' + heading: Hozzájárulási feltételek agreed: Elfogadtad az új hozzájárulási feltételeket. not yet agreed: Még nem fogadtad el az új hozzájárulási feltételeket. review link text: Kérlek, kövesd ezt a hivatkozást az új hozzájárulási feltételek @@ -2266,14 +2272,11 @@ hu: agreed_with_pd: Azt is kijelentetted, hogy a szerkesztéseid közkincsnek tekinthetők. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: mi ez? - profile description: 'Profil leírása:' - preferred languages: 'Előnyben részesített nyelvek:' - preferred editor: 'Előnyben részesített szerkesztő:' - image: 'Kép:' + image: Kép gravatar: gravatar: Gravatar használata link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: mi ez? + what_is_gravatar: Mi az a Gravatar? disabled: A Gravatar le van tiltva. enabled: A Gravatar kép kijelzését bekapcsoltad. new image: Kép hozzáadása @@ -2281,10 +2284,8 @@ hu: delete image: Jelenlegi kép eltávolítása replace image: Jelenlegi kép cseréje image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt) - home location: 'Otthon:' + home location: Otthon no home location: Nem adtad meg az otthonod helyét. - latitude: 'Földrajzi szélesség:' - longitude: 'Földrajzi hosszúság:' update home location on click: Otthon helyének frissítése, amikor a térképre kattintok? save changes button: Módosítások mentése @@ -2669,7 +2670,6 @@ hu: centre_map: Térkép középre hozása itt redactions: edit: - description: Leírás heading: Módosítás szerkesztése title: Módosítás szerkesztése index: @@ -2677,7 +2677,6 @@ hu: heading: Módosítások listája title: Módosítások listája new: - description: Leírás heading: Információ megadása az új módosításról title: Új módosítás létrehozása show: diff --git a/config/locales/ia.yml b/config/locales/ia.yml index f1e488f7b..7991fec62 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -120,14 +120,19 @@ ia: title: Subjecto body: Texto recipient: Destinatario + redaction: + description: Description report: category: Selige un motivo pro tu reporto details: Per favor, forni plus detalios sur le problema (obligatori). user: email: E-mail + new_email: 'Adresse de e-mail nove:' active: Active display_name: Nomine public description: Description + home_lat: 'Latitude:' + home_lon: 'Longitude:' languages: Linguas pass_crypt: Contrasigno pass_crypt_confirmation: Confirmar contrasigno @@ -136,6 +141,8 @@ ia: tagstring: separate per commas user_block: needs_view: Debe le usator aperir un session ante que iste blocada es cancellate? + user: + new_email: (nunquam monstrate publicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2217,16 +2224,10 @@ ia:

Crea un conto pro comenciar a contribuer. Nos te inviara un e-mail pro confirmar tu conto.

email address: 'Adresse de e-mail:' confirm email address: 'Confirmar adresse de e-mail:' - not_displayed_publicly_html: Tu adresse non es monstrate publicamente. Vide - nostre politica - de confidentialitate pro plus information. display name: 'Nomine public:' display name description: Tu nomine de usator monstrate publicamente. Tu pote cambiar lo plus tarde in le preferentias. external auth: 'Authentication per tertios:' - password: 'Contrasigno:' - confirm password: 'Confirmar contrasigno:' use external auth: Alternativemente, usa un tertio pro aperir session auth no password: Con authentication per tertio, un contrasigno non es necessari, ma alcun instrumentos o servitores supplementari pote totevia necessitar un. @@ -2342,8 +2343,6 @@ ia: title: Modificar conto my settings: Mi configurationes current email address: 'Adresse de e-mail actual:' - new email address: 'Adresse de e-mail nove:' - email never displayed publicly: (nunquam monstrate publicamente) external auth: 'Authentication externe:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID @@ -2375,13 +2374,9 @@ ia: agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como liberate al Dominio Public. link text: que es isto? - profile description: 'Description del profilo:' - preferred languages: 'Linguas preferite:' - preferred editor: 'Editor preferite:' image: 'Imagine:' gravatar: gravatar: Usar Gravatar - link text: que es isto? disabled: Gravatar ha essite disactivate. enabled: Tu Gravatar ha essite activate e essera monstrate desde ora. new image: Adder un imagine @@ -2391,8 +2386,6 @@ ia: image size hint: (imagines quadrate de al minus 100×100 functiona melio) home location: 'Position de origine:' no home location: Tu non ha entrate tu position de origine. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Actualisar le position de origine quando io clicca super le carta? save changes button: Salveguardar modificationes @@ -2806,7 +2799,6 @@ ia: centre_map: Centrar le carta hic redactions: edit: - description: Description heading: Modificar suppression title: Modificar obscuration index: @@ -2814,7 +2806,6 @@ ia: heading: Lista de obscurationes title: Lista de suppressiones new: - description: Description heading: Specifica information pro nove suppression title: Creation de nove obscuration show: diff --git a/config/locales/id.yml b/config/locales/id.yml index 2192ccfca..5e593fb1e 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -143,14 +143,19 @@ id: title: Subyek body: Isi recipient: Penerima + redaction: + description: Deskripsi report: category: 'Pilih alasan laporan Anda:' details: Silakan berikan rincian tentang masalah (wajib). user: email: Email + new_email: 'Alamat Email Baru:' active: Aktif display_name: Nama Tampilan description: Keterangan + home_lat: 'Garis Lintang:' + home_lon: 'Garis Bujur:' languages: Bahasa pass_crypt: Kata Sandi pass_crypt_confirmation: Konfirmasi Kata Sandi @@ -159,6 +164,8 @@ id: tagstring: dipisahkan oleh koma user_block: needs_view: Apakah pengguna harus login sebelum blokirnya dihapus? + user: + new_email: (jangan pernah ditampilkan ke publik) datetime: distance_in_words_ago: about_x_hours: @@ -2283,16 +2290,10 @@ id:

Mendaftar untuk mulai memberikan kontribusi. Kami akan mengirimkan surel konfirmasi akun Anda.

email address: 'Alamat Email:' confirm email address: 'Konfirmasi Alamat Email:' - not_displayed_publicly_html: Alamat Anda tidak dipajang secara umum, lihat kebijakan privasi kami untuk - informasi lebih lanjut display name: 'Tampilan Nama:' display name description: Username Anda yang ditampilkan pada publik. Anda dapat mengubahnya dalam pengaturan. external auth: 'Autentikasi Pihak Ketiga:' - password: 'Kata Sandi:' - confirm password: 'Konfirmasi Kata Sandi:' use external auth: Atau, gunakan pihak ketiga untuk masuk auth no password: Dengan autentikasi pihak ketiga kata sandi tidak diperlukan, tetapi beberapa alat tambahan atau server mungkin memerlukannya. @@ -2412,8 +2413,6 @@ id: title: Edit akun my settings: Pengaturan saya current email address: 'Alamat Email Saat Ini:' - new email address: 'Alamat Email Baru:' - email never displayed publicly: (jangan pernah ditampilkan ke publik) external auth: 'Autentikasi Eksternal:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2446,14 +2445,10 @@ id: Anda berada dalam Domain publik. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Apa ini? - profile description: 'Deskripsi Profil:' - preferred languages: 'Bahasa yang Dipilih:' - preferred editor: 'Editor yang Dipilih:' image: 'Gambar:' gravatar: gravatar: Gunakan Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: apa ini? disabled: Gravatar telah dinonaktifkan. enabled: Tampilan dari Gravatar Anda telah diaktifkan. new image: Tambahkan gambar @@ -2464,8 +2459,6 @@ id: 100x100) home location: 'Lokasi Beranda:' no home location: Anda telah memasukkan lokasi rumah Anda. - latitude: 'Garis Lintang:' - longitude: 'Garis Bujur:' update home location on click: Memperbarui lokasi rumah ketika saya klik pada peta? save changes button: Simpan Perubahan @@ -2868,7 +2861,6 @@ id: centre_map: Pusatkan peta di sini redactions: edit: - description: Deskripsi heading: Mengedit Redaksi title: Mengedit Redaksi index: @@ -2876,7 +2868,6 @@ id: heading: Daftar redaksi title: Daftar redaksi new: - description: Deskripsi heading: Masukkan informasi untuk redaksi baru title: Membuat redaksi baru show: diff --git a/config/locales/is.yml b/config/locales/is.yml index d5c9f8e31..a2b29773d 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -126,14 +126,19 @@ is: title: Fyrirsögn body: Texti recipient: Móttakandi + redaction: + description: Lýsing report: category: Veldu ástæðu fyrir að þú gerir skýrslu details: Tilgreindu öll nauðsynleg atriði um vandamálið (nauðsynlegt). user: email: Netfang + new_email: 'Nýtt netfang:' active: Virkur display_name: Sýnilegt nafn description: Lýsing + home_lat: 'Lengdargráða:' + home_lon: 'Breiddargráða:' languages: Tungumál pass_crypt: Lykilorð pass_crypt_confirmation: Staðfestu lykilorð @@ -142,6 +147,8 @@ is: tagstring: aðskilið með kommum user_block: needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi. + user: + new_email: (aldrei sýnt opinberlega) datetime: distance_in_words_ago: about_x_hours: @@ -2352,15 +2359,10 @@ is:

Skráðu þig sem notanda til að geta tekið þátt. Við munum senda þér tölvupóst til staðfestingar á skráningunni.

email address: 'Tölvupóstfang:' confirm email address: 'Staðfestu netfang:' - not_displayed_publicly_html: Netfangið þitt er ekki birt opinberlega, sjá kaflann - um meðferð persónuupplýsinga display name: 'Sýnilegt nafn:' display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt því síðar í stillingunum þínum. external auth: 'Auðkenning með þriðja aðila:' - password: 'Lykilorð:' - confirm password: 'Staðfestu lykilorðið:' use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar auth no password: Með auðkenningu frá þriðja aðila er ekki nauðsynlegt að nota lykilorð, en einhver aukaverkfæri eða þjónar gætu samt þurft á því að halda. @@ -2480,8 +2482,6 @@ is: title: Stillingar my settings: Mínar stillingar current email address: 'Núverandi netfang:' - new email address: 'Nýtt netfang:' - email never displayed publicly: (aldrei sýnt opinberlega) external auth: 'Ytri auðkenning:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2516,14 +2516,10 @@ is: almenningseigu (Public Domain). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Hvað er þetta? - profile description: 'Lýsing á þér:' - preferred languages: 'Viðmótstungumál:' - preferred editor: 'Uppáhaldsritill:' image: 'Mynd:' gravatar: gravatar: Nota Gravatar-auðkennismynd link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: Hvað er þetta? disabled: Gravatar-auðkennismynd hefur verið gerð óvirk. enabled: Birting Gravatar-auðkennismyndar hefur verið gerð virk. new image: Bæta við mynd @@ -2533,8 +2529,6 @@ is: image size hint: (ferningslaga myndir minnst 100x100 dílar virka best) home location: 'Staðsetning:' no home location: Þú hefur ekki stillt staðsetningu þína. - latitude: 'Lengdargráða:' - longitude: 'Breiddargráða:' update home location on click: Uppfæra staðsetninguna þegar ég smelli á kortið save changes button: Vista breytingar make edits public button: Gera allar breytingarnar mínar opinberar @@ -2948,7 +2942,6 @@ is: centre_map: Miðjusetja kort hér redactions: edit: - description: Lýsing heading: Breyta leiðréttingu title: Breyta leiðréttingu index: @@ -2956,7 +2949,6 @@ is: heading: Listi yfir leiðréttingar title: Listi yfir leiðréttingar new: - description: Lýsing heading: Settu inn upplýsingar um nýju leiðréttinguna title: Bý til nýja leiðréttingu show: diff --git a/config/locales/it.yml b/config/locales/it.yml index 733b94efd..fb8a264ad 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -165,15 +165,25 @@ it: title: Oggetto body: Corpo recipient: Destinatario + redaction: + title: Titolo + description: Descrizione report: category: Seleziona un motivo per la tua segnalazione details: Fornire più dettagli sul problema (obbligatorio). user: + auth_provider: Fornitore d'autenticazione + auth_uid: UID d'autenticazione email: Email + email_confirmation: Conferma email + new_email: Nuovo indirizzo email active: Attivo display_name: Nome visualizzato - description: Descrizione - languages: Lingue + description: Descrizione del profilo + home_lat: Latitudine + home_lon: Longitudine + languages: Lingue preferite + preferred_editor: Editor preferito pass_crypt: Password pass_crypt_confirmation: Conferma password help: @@ -187,6 +197,12 @@ it: quindi cerca di utilizzare dei termini comuni. needs_view: L'utente ha bisogno di collegarsi prima che questo blocco sia cancellato? + user: + email_confirmation: Il tuo indirizzo non è visualizzato pubblicamente, vedi + l'informativa + sulla privacy per ulteriori informazioni. + new_email: (mai visualizzato pubblicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2281,13 +2297,13 @@ it: tuo profilo, %{user}. Si prega di verificare se si desidera che l'applicazione abbia le seguenti capacità. È possibile scegliere a piacere. allow_to: 'Consenti all''applicazione client di:' - allow_read_prefs: leggi le preferenze personali. + allow_read_prefs: leggere le tue preferenze. allow_write_prefs: modificare le tue preferenze utente. allow_write_diary: crea pagine di diario, commenti e fai amicizia. - allow_write_api: modifica la mappa. - allow_read_gpx: Visualizza i tuoi tracciati GPS - allow_write_gpx: carica tracciati GPS. - allow_write_notes: modifica le note. + allow_write_api: modificare la mappa. + allow_read_gpx: leggere i tuoi tracciati GPS privati. + allow_write_gpx: caricare tracciati GPS. + allow_write_notes: modificare le note. grant_access: Concedi l'accesso authorize_success: title: Richiesta di autorizzazione consentita @@ -2435,16 +2451,10 @@ it:

Registrati per iniziare a contribuire. Ti invieremo un'email per confermare il tuo account.

email address: 'Indirizzo email:' confirm email address: 'Conferma indirizzo email:' - not_displayed_publicly_html: Il tuo indirizzo non visualizzato pubblicamente, - vedi l'informativa sulla privacy - per ulteriori informazioni display name: 'Nome visualizzato:' display name description: Il proprio nome utente visualizzato pubblicamente. Può essere modificato più tardi nelle preferenze. external auth: 'Autenticazione tramite terze parti:' - password: 'Password:' - confirm password: 'Conferma password:' use external auth: In alternativa, effettua l'accesso tramite terze parti auth no password: Con l'autenticazione tramite terze parti non è richiesta una password, ma alcuni strumenti o server aggiuntivi potrebbero ancora averne @@ -2501,7 +2511,7 @@ it: my profile: Il mio profilo my settings: Impostazioni my comments: Miei commenti - oauth settings: impostazioni oauth + oauth settings: Impostazioni oauth blocks on me: Blocchi su di me blocks by me: Blocchi applicati da me send message: Invia messaggio @@ -2564,15 +2574,13 @@ it: account: title: Modifica profilo my settings: Impostazioni - current email address: 'Indirizzo e-mail attuale:' - new email address: 'Nuovo indirizzo e-mail:' - email never displayed publicly: (mai visualizzato pubblicamente) - external auth: 'Autenticazione Esterna:' + current email address: Indirizzo email attuale + external auth: Autenticazione esterna openid: link: https://wiki.openstreetmap.org/wiki/IT:OpenID link text: che cos'è questo? public editing: - heading: 'Modifiche pubbliche:' + heading: Modifica pubblica enabled: Abilitate. Non anonimo con il permesso di modificare i dati. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: che cos'è questo? @@ -2590,7 +2598,7 @@ it: decisione non può essere revocata e tutti i nuovi utenti sono ora pubblici in modo predefinito. contributor terms: - heading: 'Regole per contribuire:' + heading: Regole per contribuire agreed: Hai accettato le nuove regole per contribuire. not yet agreed: Non hai ancora accettato le nuove regole per contribuire. review link text: Quando puoi segui per favore questo link per leggere ed @@ -2599,14 +2607,11 @@ it: fossero di pubblico dominio. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: che cos'è questo? - profile description: 'Descrizione del profilo:' - preferred languages: 'Lingua preferita:' - preferred editor: 'Editor preferito:' - image: 'Immagine:' + image: Immagine gravatar: gravatar: Usa Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: che cos'è questo? + what_is_gravatar: Che cosa è un Gravatar? disabled: Gravatar è stato disattivato. enabled: La visualizzazione del vostro Gravatar è stata attivata. new image: Aggiungi un'immagine @@ -2614,10 +2619,8 @@ it: delete image: Rimuovi l'immagine attuale replace image: Sostituisci l'immagine attuale image size hint: (immagini quadrate di almeno 100x100 funzionano meglio) - home location: 'Posizione:' + home location: Posizione no home location: Non si è inserita la propria posizione. - latitude: 'Latitudine:' - longitude: 'Longitudine:' update home location on click: Aggiorna la posizione quando clicco sulla mappa? save changes button: Salva modifiche make edits public button: Rendi pubbliche tutte le mie modifiche @@ -2841,6 +2844,7 @@ it: custom_dimensions: Imposta dimensioni personalizzate format: 'Formato:' scale: 'Scala:' + image_dimensions: L'immagine mostrerà il livello standard in %{width} x %{height} download: Scarica short_url: URL breve include_marker: Includi il marcatore @@ -3033,7 +3037,6 @@ it: centre_map: Centra la mappa qui redactions: edit: - description: Descrizione heading: Modifica revisione title: Modifica revisione index: @@ -3041,7 +3044,6 @@ it: heading: Elenco di revisioni title: Elenco di revisioni new: - description: Descrizione heading: Inserire informazioni per una nuova revisione title: Crea nuova revisione show: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index b840d4031..d8432b6df 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -161,14 +161,19 @@ ja: title: 件名 body: 本文 recipient: 受信者 + redaction: + description: 説明 report: category: 報告の理由を選択してください。 details: 問題についてもう少し詳しく記述してください (必須)。 user: email: メール + new_email: '新しいメール アドレス:' active: アクティブ display_name: 表示名 description: 説明 + home_lat: '緯度:' + home_lon: '経度:' languages: 言語 pass_crypt: パスワード pass_crypt_confirmation: パスワードを確認 @@ -178,6 +183,8 @@ ja: user_block: reason: ユーザーがブロックされている理由です。メッセージは多くの人の目にふれることになるため、できるだけ冷静かつ理性的になり、できるだけ丁寧に状況を説明するようにしてください。すべての利用者がコミュニティ固有の用語を理解しているわけではないため、分かりやすい用語を使うように努めてください。 needs_view: このブロックを解消するには、先に利用者がログインする必要がありますか？ + user: + new_email: (非公開) datetime: distance_in_words_ago: about_x_hours: @@ -2230,13 +2237,9 @@ ja:

協力を始めるにはサインアップしてください。あなたのアカウントの確認メールが送信されます。

email address: 'メール アドレス:' confirm email address: 'メール アドレスの確認:' - not_displayed_publicly_html: あなたのアドレスは非公開です。詳細は弊財団のプライバシーポリシーをご参照ください display name: '表示名:' display name description: あなたの公開利用者名です。あとで個人設定で変更できます。 external auth: 'サードパーティ認証:' - password: 'パスワード:' - confirm password: 'パスワードの確認:' use external auth: サードパーティのアカウントでもログインできます auth no password: サードパーティ認証があるとパスワードは不要ですが、それでもその他のツールやサーバーが必要な場合があります。 continue: ユーザー登録 @@ -2343,8 +2346,6 @@ ja: title: アカウントの編集 my settings: 設定 current email address: '現在のメール アドレス:' - new email address: '新しいメール アドレス:' - email never displayed publicly: (非公開) external auth: '外部認証:' openid: link: https://wiki.openstreetmap.org/wiki/JA:OpenID?uselang=ja @@ -2369,14 +2370,10 @@ ja: agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。 link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: これは何ですか? - profile description: 'プロフィールの説明:' - preferred languages: '優先言語:' - preferred editor: '優先エディター:' image: '画像:' gravatar: gravatar: Gravatar を使用 link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: これは何ですか? disabled: Gravatarは無効です。 enabled: Gravatarの表示が有効になりました。 new image: 画像を追加 @@ -2386,8 +2383,6 @@ ja: image size hint: (100x100 以下の正方形の画像が最適) home location: 'ホーム地点:' no home location: あなたはまだホーム地点を登録していません。 - latitude: '緯度:' - longitude: '経度:' update home location on click: ホーム地点を、地図上のクリックした地点に変更 save changes button: 変更を保存 make edits public button: 自分の編集をすべて公開する @@ -2766,7 +2761,6 @@ ja: centre_map: ここで地図を中央に置く redactions: edit: - description: 説明 heading: 改訂の編集 title: 改訂の編集 index: @@ -2774,7 +2768,6 @@ ja: heading: 改訂一覧 title: 改訂一覧 new: - description: 説明 heading: 新しい改訂の情報の入力 title: 改訂の新規作成 show: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 47a8e5d3f..ab2945e25 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -90,11 +90,16 @@ ka: title: თემა body: ტექსტი recipient: მიმღები + redaction: + description: აღწერა user: email: ელ. ფოსტა + new_email: 'ახალი ელ. ფოსტის მისამართი:' active: აქტიური display_name: სახელი ეკრანზე description: აღწერა + home_lat: 'განედი:' + home_lon: 'გრძედი:' languages: ენები pass_crypt: პაროლი help: @@ -1030,8 +1035,6 @@ ka: email address: 'ელ. ფოსტის მისამართი:' confirm email address: 'ელ. ფოსტის მისამართის დადასტურება:' display name: 'სახელი ეკრანზე:' - password: 'პაროლი:' - confirm password: 'პაროლის დადასტურება:' continue: რეგისტრაცია terms: consider_pd_why: რა არის ეს? @@ -1082,7 +1085,6 @@ ka: title: ანგარიშის რედაქტირება my settings: ჩემი პარამეტრები current email address: 'ელ-ფოსტის ამჟამინდელი მისამართი:' - new email address: 'ახალი ელ. ფოსტის მისამართი:' openid: link: http://wiki.openstreetmap.org/wiki/KA:OpenID link text: რა არის ეს? @@ -1092,12 +1094,8 @@ ka: contributor terms: link text: რა არის ეს? image: 'სურათი:' - gravatar: - link text: ეს რა არის? new image: სურათის დამატება home location: 'ჩემი ადგილსამყოფელი:' - latitude: 'განედი:' - longitude: 'გრძედი:' save changes button: ცვლილებების შენახვა return to profile: პროფილში დაბრუნება confirm: @@ -1204,10 +1202,6 @@ ka: context: show_address: მისამართის ჩვენება redactions: - edit: - description: აღწერა - new: - description: აღწერა show: description: 'აღწერა:' user: 'შემქმნელი:' diff --git a/config/locales/kab.yml b/config/locales/kab.yml index ebe9848d6..7c86bde20 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -116,17 +116,24 @@ kab: title: Asentel body: Tafekka recipient: Aɣerwaḍ + redaction: + description: Aglam user: email: Imayl + new_email: Tansa imayl tamaynut active: Urmid display_name: Mefffer isem description: Aglam + home_lat: 'Tarrut:' + home_lon: 'Tazegrart:' languages: Tutlayin pass_crypt: Awal uffir pass_crypt_confirmation: Sentem awal uffir help: trace: tagstring: Ticcert yettulessesen + user: + new_email: (werǧin ad d-iban s wudem azayez) datetime: distance_in_words_ago: half_a_minute: Azgen n tsedast aya @@ -1259,8 +1266,6 @@ kab: title: Jerred email address: 'Tansa imayl:' confirm email address: 'Sentem tansa n e-mail:' - password: 'Awal uffir:' - confirm password: 'Sentem awal uffir:' continue: Jerred terms: title: Tiwtilin n iwiziw @@ -1335,8 +1340,6 @@ kab: title: Ẓreg amiḍan my settings: Iɣewwaṛen-iw current email address: Tansa imayl n tura - new email address: Tansa imayl tamaynut - email never displayed publicly: (werǧin ad d-iban s wudem azayez) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: d acu-t wa? @@ -1350,20 +1353,14 @@ kab: contributor terms: heading: 'Tiwtilin n iwiziw:' link text: what is this? - profile description: 'Aglam n umaɣnu:' - preferred languages: 'Tutlayin tebɣiḍ:' - preferred editor: 'Amaẓrag tebɣiḍ:' image: 'Tugna:' gravatar: gravatar: Seqdec Gravatar - link text: d acu-t wa? new image: Rbu tugna delete image: Kkes tugna tamirant replace image: Semselsi tugna tamirant home location: 'Adig n uxxam:' no home location: Ur tsekcemeḍ ara adig n uxxam-ik. - latitude: 'Tarrut:' - longitude: 'Tazegrart:' update home location on click: Snifel adig n uxxam-ik ticki siteɣ ɣef tkarḍa? save changes button: Sekles asnifel make edits public button: Err akk tiẓrigin-iw s tizuyaz @@ -1516,10 +1513,6 @@ kab: show_address: Sken tansa query_features: Suter tiɣawsiwin redactions: - edit: - description: Aglam - new: - description: Aglam show: description: 'Aglam:' user: 'Amernay:' diff --git a/config/locales/km.yml b/config/locales/km.yml index 75bfb2f5e..75593c450 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -789,7 +789,6 @@ km: title: កែប្រែគណនី​ public editing: disabled link text: មូលហេតុអ្វី​ ខ្ញុំមិនអាចកែប្រែបាន​? - profile description: បរិយាយ​ប្រវត្តិរូប​៖ flash update success confirm needed: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។ សូមពិនិត្យមើលអ៊ីមែលរបស់អ្នក ដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក។ flash update success: ព័ត៌មានអ្នកប្រើប្រាស់​ បានបន្ទាន់សម័យដោយជោគជ័យ​។ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 3f83be6ae..b0f4a0c45 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -152,15 +152,24 @@ ko: title: 제목 body: 본문 recipient: 받는 사람 + redaction: + title: 제목 + description: 설명 report: category: 보고 이유를 선택하세요 details: 문제와 관련하여 더 자세한 사항을 제공해주세요.(필수) user: + auth_uid: 인증 UID email: 이메일 + email_confirmation: 이메일 인증 + new_email: 새 이메일 주소 active: 활성 display_name: 표시되는 이름 - description: 설명 - languages: 언어 + description: 프로필 설명 + home_lat: 위도 + home_lon: 경도 + languages: 주로 사용하는 언어 + preferred_editor: 주로 사용하는 편집기 pass_crypt: 비밀번호 pass_crypt_confirmation: 비밀번호 확인 help: @@ -171,6 +180,8 @@ ko: 최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요. needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까? + user: + new_email: (절대 공개하지 않습니다) datetime: distance_in_words_ago: about_x_hours: 약 %{count}시간 전 @@ -2186,13 +2197,9 @@ ko:

기여를 시작하려면 가입하세요. 계정 확인용 이메일을 보내드립니다.

email address: '이메일 주소:' confirm email address: '이메일 주소 확인:' - not_displayed_publicly_html: 당신의 주소는 공개되지 않습니다. 자세한 내용은 개인정보처리방침을 참조하시기 바랍니다. display name: '표시 이름:' display name description: 공개적으로 표시되는 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다. external auth: '제3자 인증:' - password: '비밀번호:' - confirm password: '비밀번호 확인:' use external auth: 다른 제3자 로그인 방식 사용하기 auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다. continue: 가입하기 @@ -2298,15 +2305,13 @@ ko: account: title: 계정 편집 my settings: 프로필 설정 - current email address: '현재 이메일 주소:' - new email address: '새 이메일 주소:' - email never displayed publicly: (절대 공개하지 않습니다) - external auth: '외부 인증:' + current email address: 현재 이메일 주소 + external auth: 외부 인증 openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: 무엇인가요? public editing: - heading: '공개 편집:' + heading: 공개 편집 enabled: 활성화했습니다. 익명이 아니며 데이터를 편집할 수 있습니다. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: 무엇인가요? @@ -2320,21 +2325,17 @@ ko: 알아보기). contributor terms: - heading: '기여자 약관:' + heading: 기여자 약관 agreed: 새 기여자 약관에 동의했습니다. not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다. review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요. agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: 무엇인가요? - profile description: '프로필 설명:' - preferred languages: 주로 사용하는 언어 - preferred editor: '주로 사용하는 편집기:' - image: '그림:' + image: 이미지 gravatar: gravatar: Gravatar 사용 link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: 무엇인가요? disabled: 그라바타가 비활성화되었습니다. enabled: 그라바타의 표시가 활성화되었습니다 new image: 그림 추가 @@ -2342,10 +2343,8 @@ ko: delete image: 현재 그림 제거 replace image: 현재 그림 바꾸기 image size hint: (100x100 이하의 정사각형 그림이 최적) - home location: '집 위치:' + home location: 집 위치 no home location: 집 위치를 입력하지 않았습니다. - latitude: '위도:' - longitude: '경도:' update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요? save changes button: 변경사항 저장 make edits public button: 내 편집을 공개하기 @@ -2729,7 +2728,6 @@ ko: centre_map: 여기를 가운데로 지정 redactions: edit: - description: 설명 heading: 교정 편집 title: 교정 편집 index: @@ -2737,7 +2735,6 @@ ko: heading: 교정 목록 title: 교정 목록 new: - description: 설명 heading: 새 교정에 대한 정보 입력 title: 새 교정 만들기 show: diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index a67cb5633..3046776c9 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -125,15 +125,20 @@ ku-Latn: title: Mijar body: Nivîs recipient: Wergir + redaction: + description: Danasîn report: category: Ji bo rapora xwe sedemekî bibijêre details: Ji kerema xwe di derbarê pirsgirêkê de zêdetir zanyarî bide (hewce ye). user: email: E-name + new_email: 'Navnîşana e-nameyê yê nû:' active: Çalak display_name: Nav nîşan bide description: Danasîn + home_lat: 'Hêlîpan:' + home_lon: 'Hêlîlar:' languages: Ziman pass_crypt: Şîfre pass_crypt_confirmation: Şîfreyê Bipejirîne @@ -147,6 +152,8 @@ ku-Latn: civatê fam nakin, lewma xêra xwe gotinên ku yên nû dest pê kirine jî bikaribin fam bikin bi kar bîne. needs_view: Gelo hewce dike bikarhêner berî ku ev astengî rabe têkeve? + user: + new_email: (ti carî nayê nîşandan) datetime: distance_in_words_ago: about_x_hours: @@ -2427,16 +2434,10 @@ ku-Latn:

Ji bo ku dest bi beşdariyê bikî qeyd bibe. Ji bo pejirandina hesabê te, em ê ji te re e-peyamek bişînin.

email address: 'Navnîşana e-peyamê:' confirm email address: Navnîşana e-peyamê nas bike - not_displayed_publicly_html: Adrêsa te ji her kesê re nayê nîşandan, ji bo zêdetir - agahiyan binêre siyaseta - me ya veşarîtiyê. display name: Navê ku tê xuyanː display name description: Navê te yê ku ji her kesê re tê xuyan. Tu paşê dikarî vê navê ji hevyazên xwe biguherînî. external auth: 'Teyîdkirina bi aliyên sêyem:' - password: Şîfre - confirm password: 'Şîfreyê bipejirîne:' use external auth: Wek alternatîv, ji bo têketinê yekî ji van bi kar bîne auth no password: Eger tu bi aliyên sêyem teyîd bikî şîfre hewce nake, lê belê ji bo hinek amûrên din an jî ji bo serverê dibe ku dîsa jî şîfreyek hewce @@ -2558,8 +2559,6 @@ ku-Latn: title: Hesabê biguherîne my settings: Hevyazên min current email address: 'Navnîşana e-nameyê yê niha:' - new email address: 'Navnîşana e-nameyê yê nû:' - email never displayed publicly: (ti carî nayê nîşandan) external auth: Teyîdkirina xaricîː openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2593,14 +2592,10 @@ ku-Latn: Giştî were qebûlkirin. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Ev çi ye? - profile description: Danasîna profîlêː - preferred languages: Zimanên ku têne tercîhkirinː - preferred editor: Edîtora tercîhkirîː image: 'Wêne:' gravatar: gravatar: Gravatarê bi kar bîne link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: ev çi ye disabled: Gravatar hate neçalakkirin. enabled: Gravatarê te niha dikare were xuyan. new image: Wêneyek lê zêde bike @@ -2611,8 +2606,6 @@ ku-Latn: xuyan) home location: Cihê malê teː no home location: Te cihê malê xwe diyar nekir. - latitude: 'Hêlîpan:' - longitude: 'Hêlîlar:' update home location on click: Gava ku tu bitikînî ser nexşeyê bila cihê malê te were rojanekirin? save changes button: Guherandinan qeyd bike @@ -3040,7 +3033,6 @@ ku-Latn: centre_map: Vê der bike merkeza nexşeyê redactions: edit: - description: Danasîn heading: Redaksiyonê biguherîne title: Redaksiyonê biguherîne index: @@ -3048,7 +3040,6 @@ ku-Latn: heading: Lîsteya redaksiyonan title: Lîsteya redaksiyonan new: - description: Danasîn heading: Ji bo redaksiyona nû agahiyan têkeve title: Redaksiyona nû tê çêkirin show: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 2ed842c30..e51825143 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -80,17 +80,25 @@ lb: sender: Sender title: Sujet recipient: Empfänger + redaction: + title: Titel + description: Beschreiwung user: email: E-Mail + new_email: Nei E-Mail-Adress active: Aktiv display_name: Numm dee gewise gëtt - description: Beschreiwung - languages: Sproochen + description: Beschreiwung vum Profil + home_lat: Breedegrad + home_lon: Längegrad + languages: Léifst Sproochen pass_crypt: Passwuert pass_crypt_confirmation: Passwuert confirméieren help: trace: tagstring: Mat Komma getrennt + user: + new_email: (ni ëffentlech gewisen) datetime: distance_in_words_ago: about_x_hours: @@ -1180,13 +1188,7 @@ lb: header: Fäi a verännerbar email address: 'E-Mail-Adress:' confirm email address: 'E-Mail-Adress confirméieren:' - not_displayed_publicly_html: Är Adress gëtt net ëffentlech gewisen, kuckt eis - Dateschutzrichtlinn fir méi - Informatiounen display name: Numm weisen - password: 'Passwuert:' - confirm password: 'Passwuert confirméieren:' continue: Mellt Iech un terms: heading: Bedingungen @@ -1251,9 +1253,7 @@ lb: account: title: Benotzerkont änneren my settings: Meng Astellungen - current email address: 'Aktuell E-Mail-Adress:' - new email address: 'Nei E-Mail-Adress:' - email never displayed publicly: (ni ëffentlech gewisen) + current email address: Aktuell E-Mail-Adress openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: wat ass dat? @@ -1262,19 +1262,14 @@ lb: disabled link text: Firwat kann ech net änneren? contributor terms: link text: wat ass dëst? - profile description: 'Beschreiwung vum Profil:' - preferred languages: 'Léifste Sproochen:' - image: 'Bild:' + image: Bild gravatar: - link text: wat ass dat? disabled: Gravatar gouf desaktivéiert. enabled: D'Weise vun Ärem Gravatar gouf aktivéiert. new image: E Bild derbäisetzen keep image: Dat aktuellt Bild behalen delete image: Dat aktuellt Bild ewechhuelen replace image: Dat aktuellt Bild ersetzen - latitude: 'Breedegrad:' - longitude: 'Längegrad:' save changes button: Ännerunge späicheren make edits public button: All meng Ännerunge ëffentlech maachen return to profile: 'Zréck op de Profil:' @@ -1493,10 +1488,6 @@ lb: show_address: Adress weisen centre_map: Kaart hei zentréieren redactions: - edit: - description: Beschreiwung - new: - description: Beschreiwung show: description: 'Beschreiwung:' confirm: Sidd Dir sécher? diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 9557cb65d..2ecb34d52 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -130,14 +130,19 @@ lt: title: Antraštė body: Tekstas recipient: Gavėjas + redaction: + description: Aprašymas report: category: Pasirinkti pranešimo priežastį details: Prašoma pateikti daugiau informacijos apie problemą (privaloma). user: email: El. paštas + new_email: 'Naujas e-pašto adresas:' active: Aktyvus display_name: Rodomas vardas description: Aprašymas + home_lat: 'Platuma:' + home_lon: 'Ilguma:' languages: Kalbos pass_crypt: Slaptažodis help: @@ -146,6 +151,8 @@ lt: user_block: needs_view: Ar naudotojas turi prisiregistruoti, tam kad šis blokavimas būtų panaikintas? + user: + new_email: (niekada viešai nerodomas) datetime: distance_in_words_ago: about_x_hours: @@ -2078,15 +2085,10 @@ lt: kad patvirtintume jūsų paskyrą.

email address: 'E-pašto adresas:' confirm email address: 'Patvirtinkite e-pašto adresą:' - not_displayed_publicly_html: Jūsų adresas nėra viešai rodomas, daugiau informacijos - rasite privatumo politikoje display name: 'Rodomas vardas:' display name description: Jūsų viešai rodomas naudotojo vardas. Jei norėsite, galėsite jį vėliau pakeisti savo nustatymuose. external auth: 'Trečios šalies autentikacija:' - password: 'Slaptažodis:' - confirm password: 'Patvirtinkite slaptažodį:' use external auth: Alternatyviai, naudokite trečią šalį prisijungimui auth no password: Naudojant trečios šalies autentikaciją nereikia slaptažodžio, bet kai kuriems papildomiems įrankiams arba serveriui gali jo prireikti. @@ -2197,8 +2199,6 @@ lt: title: Keisti paskyrą my settings: Mano nustatymai current email address: 'Dabartinis e-pašto adresas:' - new email address: 'Naujas e-pašto adresas:' - email never displayed publicly: (niekada viešai nerodomas) external auth: 'Išorinė autentikacija:' openid: link: https://wiki.OpenStreetMap.org/wiki/OpenID @@ -2231,14 +2231,10 @@ lt: naudojimo. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: kas tai? - profile description: 'Profilio aprašymas:' - preferred languages: 'Pageidautinos kalbos:' - preferred editor: 'Pageidautina rengyklė:' image: 'Nuotrauka:' gravatar: gravatar: Naudoti Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: kas tai? disabled: Gravatar buvo išjungtas. enabled: Jūsų Gravatar rodymas įjungtas. new image: Pridėti nuotrauką @@ -2249,8 +2245,6 @@ lt: dydžio nuotraukos) home location: Namų pozicija no home location: Jūs neįvedėte savo namų pozicijos - latitude: 'Platuma:' - longitude: 'Ilguma:' update home location on click: Atnaujinti namų poziciją paspaudus ant žemėlapio? save changes button: Įrašyti pakeitimus make edits public button: Padaryti visus mano pakeitimus viešais @@ -2618,7 +2612,6 @@ lt: centre_map: Centruoti žemėlapį čia redactions: edit: - description: Aprašymas heading: Keisti redakciją title: Keisti redakciją index: @@ -2626,7 +2619,6 @@ lt: heading: Redakcijų sąrašas title: Redakcijų sąrašas new: - description: Aprašymas heading: Įrašykite naujos redakcijos informaciją title: Sukurti naują redakciją show: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 0cda96fb4..7285a58c0 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -117,11 +117,16 @@ lv: title: Temats body: Teksts recipient: Saņēmējs + redaction: + description: Apraksts user: email: E-pasts + new_email: 'Jauna e-pasta adrese:' active: Aktīvs display_name: Rādāmais vārds description: Apraksts + home_lat: 'Platums:' + home_lon: 'Garums:' languages: Valodas pass_crypt: Parole help: @@ -129,6 +134,8 @@ lv: tagstring: atdalīts ar komatiem user_block: needs_view: Vai lietotājam ir nepieciešams ieiet pirms šis bloks tiks noņemts? + user: + new_email: (nekad netiek rādīta publiski) editor: default: Noklusējuma (pašlaik %{name}) id: @@ -1884,15 +1891,10 @@ lv:

Reģistrējies, lai sāktu papildināt karti. Mēs tev nosūtīsim e-pastu, lai apstiprinātu tavu lietotāju.

email address: 'E-pasta adrese:' confirm email address: 'Apstipriniet e-pasta adresi:' - not_displayed_publicly_html: Netiek rādīts publiski (skati Privātuma - politika) display name: 'Rādāmais vārds:' display name description: Vārds, kas tiks rādīts publiski. Jūs to vēlāk varēsiet izmainīt iestatījumos. external auth: 'Trešo Pušu Autentifikācija:' - password: 'Parole:' - confirm password: 'Parole (pārbaudei):' use external auth: Alternatīvi, varat izmantot trešās puses 'ielogošanās' opciju auth no password: Ar trešās partijas autentifikāciju nav nepieciešama parole, bet dažiem rīkiem vai serveriem tā vēl joprojām varētu būt nepieciešama. @@ -1995,8 +1997,6 @@ lv: title: Rediģēt kontu my settings: Mani iestatījumi current email address: 'Pašreizējā e-pasta adrese:' - new email address: 'Jauna e-pasta adrese:' - email never displayed publicly: (nekad netiek rādīta publiski) external auth: 'Ārējā autentifikācija:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2025,13 +2025,9 @@ lv: agreed_with_pd: Tu arī esi paziņojis, ka tavi labojumi var būt Publiskajā Domēnā. link text: kas tas ir? - profile description: 'Profila apraksts:' - preferred languages: 'Vēlamās valodas:' - preferred editor: 'Vēlamais redaktors:' image: 'Attēls:' gravatar: gravatar: Izmantot Gravatar - link text: kas šis ir? disabled: Gravatar ir atspējots. enabled: Jūsu Gravatar apskate ir iespējota new image: Pievienot attēlu @@ -2041,8 +2037,6 @@ lv: image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā) home location: 'Māju atrašanās vieta:' no home location: Jūs neesat norādījis mājas atrašanās vietu. - latitude: 'Platums:' - longitude: 'Garums:' update home location on click: Atjaunināt māju atrašanās vietu, noklikšķinot uz kartes? save changes button: Saglabāt izmaiņas @@ -2375,7 +2369,6 @@ lv: show_address: Rādīt adresi redactions: edit: - description: Apraksts heading: Labot redakciju title: Labot redakciju index: @@ -2383,7 +2376,6 @@ lv: heading: Redakciju saraksts title: Redakciju saraksts new: - description: Apraksts heading: Ievadi informāciju jaunajai redakcijai title: Jaunas redakcijas veidošana show: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 27f63e357..20f00f604 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -122,15 +122,25 @@ mk: title: Тема body: Содржина recipient: Примател + redaction: + title: Наслов + description: Опис report: category: Изберете причина за пријавата details: Наведете повеќе подробности за проблемот (задолжително). user: + auth_provider: Заверувач + auth_uid: Назнака за заверката email: Е-пошта + email_confirmation: Потврда на е-пошта + new_email: Нова е-пошта active: Активно display_name: Име за приказ - description: Опис - languages: Јазици + description: Опис за профилот + home_lat: Гео. ширина + home_lon: Гео. должина + languages: Претпочитани јазици + preferred_editor: Претпочитан уредник pass_crypt: Лозинка pass_crypt_confirmation: Потврдете ја лозинката help: @@ -142,6 +152,12 @@ mk: ќе биде јавно видлива. Имајте предвид и дека не сите корисници го разбираат жаргонот на заедницата, па затоа обидете се да користите лаички поими. needs_view: Дали корисникот треба да се најави пред да се исчисти овој блок? + user: + email_confirmation: Вашата адреса нема да се прикажува јавно. Повеќе информации + за ова ќе најдете во Правилата + за заштита на личните податоци. + new_email: (никогаш не се прикажува јавно) datetime: distance_in_words_ago: about_x_hours: @@ -2388,16 +2404,10 @@ mk:

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

email address: 'Е-пошта:' confirm email address: 'Потврдете ја е-поштата:' - not_displayed_publicly_html: Вашата адреса нема да се прикажува јавно. Повеќе - информации за ова ќе најдете во Правилата - за заштита на личните податоци. display name: 'Име за приказ:' display name description: Вашето јавно прикажано име. Можете да го смените подоцна во прилагодувањата. external auth: 'Заверка за надворешното место:' - password: 'Лозинка:' - confirm password: 'Потврдете ја лозинката:' use external auth: Во спротивно, најавете преку надворешно место auth no password: Ако користите надворешно место, тогаш не ви треба лозинка, но може да ја побараат некои дополнителни алатки или опслужувачот. @@ -2514,15 +2524,13 @@ mk: account: title: Уреди сметка my settings: Мои прилагодувања - current email address: 'Тековна е-пошта:' - new email address: 'Нова е-поштенска адреса:' - email never displayed publicly: (никогаш не се прикажува јавно) - external auth: 'Надворешна заверка:' + current email address: Тековна е-пошта + external auth: Надворешна заверка openid: link: https://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk link text: што е ова? public editing: - heading: 'Јавно уредување:' + heading: Јавно уредување enabled: Овозможено. Сега не е анонимно и може да се уредуваат податоци. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: што е ова? @@ -2540,7 +2548,7 @@ mk: да се открие.
  • Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.
    • contributor terms: - heading: 'Услови за учество:' + heading: Услови за учество agreed: Се согласивте на новите Услови за учество. not yet agreed: Сè уште се немате согласено со новите Услови за учество. review link text: Проследете ја врската кога ќе сакате за да ги прегледате @@ -2549,14 +2557,11 @@ mk: сопственост. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk link text: што е ова? - profile description: 'Опис за профилот:' - preferred languages: 'Претпочитани јазици:' - preferred editor: 'Претпочитан уредник:' - image: 'Слика:' + image: Слика gravatar: gravatar: Користи Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk - link text: што е ова? + what_is_gravatar: Што е тоа Gravatar? disabled: Граватарот е исклучен. enabled: Вашиот граватар е вклучен. new image: Додај слика @@ -2564,10 +2569,8 @@ mk: delete image: Отстрани тековна слика replace image: Замени тековна слика image size hint: (најдобро работат квадратни слики, барем 100x100) - home location: 'Матична местоположба:' + home location: Матична местоположба no home location: Немате внесено матична местоположба. - latitude: 'Гео. ширина:' - longitude: Гео. должина update home location on click: Подновувај ја матичната местоположба кога ќе стиснам на картата save changes button: Зачувај ги промените @@ -2985,7 +2988,6 @@ mk: centre_map: Тука сосредоточи ја картата redactions: edit: - description: Опис heading: Уреди исправки title: Уреди исправки index: @@ -2993,7 +2995,6 @@ mk: heading: Список на исправки title: Список на исправки new: - description: Опис heading: Внесете информации за нова исправка title: Создавање на нова исправка show: diff --git a/config/locales/mr.yml b/config/locales/mr.yml index d6ec125fc..e4985a2da 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -88,11 +88,15 @@ mr: title: विषय body: मायना recipient: प्राप्तकर्ता + redaction: + description: वर्णन user: email: ई-मेल active: सक्रिय display_name: दर्शवायचे नाव description: वर्णन + home_lat: 'अक्षांश:' + home_lon: 'रेखांश:' languages: भाषा pass_crypt: परवलीचा शब्द help: @@ -1212,8 +1216,6 @@ mr: email address: 'विपत्र पत्ता:' confirm email address: विपत्रपत्त्याची निश्चिती करा display name: 'दर्शवायचे नाव:' - password: 'परवलीचा शब्द:' - confirm password: 'परवलीच्या शब्दाची निश्चिती करा:' continue: नोंदणी करा terms declined: आपण नवीन योगदात्यांसाठी अटी मान्य न करण्याचे निवडल्याचा आम्हाला खेद आहे. अधिक माहितीसाठी कृपया हे विकीपान पहा. @@ -1279,19 +1281,14 @@ mr: disabled link text: मी संपादन कां करू शकत नाही? contributor terms: link text: हे काय आहे? - preferred languages: 'पसंतीच्या भाषा:' - preferred editor: 'पसंतीचा संपादक:' image: 'चित्र:' gravatar: gravatar: Gravatar वापरा - link text: हे काय आहे? new image: चित्र जोडा keep image: वर्तमान चित्र राखा delete image: वर्तमान चित्र काढून टाका replace image: वर्तमान चित्र बदला image size hint: (किमान १००x१०० आकाराची चौरस चित्रे उत्तम) - latitude: 'अक्षांश:' - longitude: 'रेखांश:' save changes button: बदल जतन करा confirm: heading: आपले विपत्र तपासा! @@ -1375,8 +1372,6 @@ mr: offramp_left_with_exit_name_directions: '%{directions}कडे जाताना %{name}वर %{exit}ने बाहेर पडा' redactions: - new: - description: वर्णन show: description: 'वर्णन:' user: 'निर्माता:' diff --git a/config/locales/ms.yml b/config/locales/ms.yml index feca78bc7..71aa02ae5 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -115,11 +115,16 @@ ms: title: Subjek body: Isi recipient: Penerima + redaction: + description: Keterangan user: email: E-mel + new_email: 'Alamat E-mel Baru:' active: Aktif display_name: Nama Paparan description: Keterangan + home_lat: 'Garis Lintang:' + home_lon: 'Garis Bujur:' languages: Bahasa pass_crypt: Kata laluan pass_crypt_confirmation: Sahkan Kata Laluan @@ -129,6 +134,8 @@ ms: user_block: needs_view: Perlukan pengguna log masuk sebelum sekatan ini dapat ditarik balik? + user: + new_email: (tidak sesekali dipaparkan kepada umum) datetime: distance_in_words_ago: about_x_hours: sekitar %{count} jam yang lalu @@ -1896,14 +1903,10 @@ ms:

    Berdaftarlah untuk mula menyumbang kepada peta ini. Kami akan mengirim e-mel untuk mengesahkan akaun anda.

    email address: 'Alamat E-mel:' confirm email address: 'Sahkan Alamat E-mel:' - not_displayed_publicly_html: Tidak dipaparkan kepada umum (lihat dasar privasi) display name: 'Nama Paparan:' display name description: Nama pengguna anda yang dipaparkan kepada awam. Anda boleh menukarnya dalam keutamaan anda pada bila-bila masa. external auth: Pengesahan Pihak Ketiga - password: 'Kata laluan:' - confirm password: 'Sahkan Kata Laluan:' use external auth: Secara alternatif, gunakan khidmat pihak ketiga untuk log masuk continue: Daftar @@ -2006,8 +2009,6 @@ ms: title: Sunting akaun my settings: Tetapan saya current email address: 'Alamat E-Mel Sekarang:' - new email address: 'Alamat E-mel Baru:' - email never displayed publicly: (tidak sesekali dipaparkan kepada umum) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: apakah ini? @@ -2038,14 +2039,10 @@ ms: agreed_with_pd: Anda juga telah mengisytiharkan bahawa anda menganggap suntingan-suntingan anda sebagai berada dalam Domain Awam. link text: apakah ini? - profile description: 'Keterangan Profil:' - preferred languages: 'Bahasa Pilihan:' - preferred editor: 'Editor Pilihan:' image: 'Imej:' gravatar: gravatar: Gunakan Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: apakah ini? new image: Tambahkan imej keep image: Simpan imej semasa delete image: Buang imej semasa @@ -2054,8 +2051,6 @@ ms: paling bagus) home location: 'Lokasi Rumah:' no home location: Anda belum memasukkan lokasi rumah anda. - latitude: 'Garis Lintang:' - longitude: 'Garis Bujur:' update home location on click: Adakah anda ingin mengemaskinikan lokasi rumah dengan mengklik pada peta? save changes button: Simpan Perubahan @@ -2335,7 +2330,6 @@ ms: relation: Hubungan redactions: edit: - description: Keterangan heading: Sunting redaksi title: Sunting redaksi index: @@ -2343,7 +2337,6 @@ ms: heading: Senarai redaksi title: Senarai redaksi new: - description: Keterangan heading: Isikan maklumat untuk redaksi baru title: Mencipta redaksi baru show: diff --git a/config/locales/my.yml b/config/locales/my.yml index fab7775a7..926418fc9 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -59,11 +59,16 @@ my: title: အကြောင်းအရာ body: စာကိုယ် recipient: လက်ခံသူ + redaction: + description: ဖော်ပြချက် user: email: အီးမေးလ် + new_email: 'အီးမေးလ်လိပ်စာ အသစ်:' active: လက်ရှိအသုံးပြုနေသည် display_name: ဖော်ပြမည့်အမည် description: ဖော်ပြချက် + home_lat: 'လတ္တီကျု:' + home_lon: 'လောင်ဂျီကျု:' languages: ဘာသာစကားများ pass_crypt: စကားဝှက် datetime: @@ -742,8 +747,6 @@ my: email address: 'အီးမေး လိပ်စာ :' confirm email address: 'အီးမေးလ်ကို အတည်ပြုပါ:' display name: ဖော်ပြမည့်အမည် - password: 'စကားဝှက်:' - confirm password: 'စကားဝှက်ကို အတည်ပြုပါ:' continue: မှတ်ပုံတင်ရန် terms: title: သတ်မှတ်ချက်များ @@ -774,9 +777,6 @@ my: friend: သူငယ်ချင်း account: current email address: 'လက်ရှိ အီးမေးလ်လိပ်စာ:' - new email address: 'အီးမေးလ်လိပ်စာ အသစ်:' - latitude: 'လတ္တီကျု:' - longitude: 'လောင်ဂျီကျု:' save changes button: ပြောင်းလဲမှုများကို သိမ်းရန် return to profile: ပရိုဖိုင်သို့ ပြန်သွားရန် confirm: @@ -848,10 +848,6 @@ my: distance: အကွာအဝေး time: အချိန် redactions: - edit: - description: ဖော်ပြချက် - new: - description: ဖော်ပြချက် show: description: 'ဖော်ပြချက်:' user: 'ဖန်တီးသူ:' diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 796fcfa98..294abda6f 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -138,14 +138,19 @@ nb: title: Emne body: Brødtekst recipient: Mottaker + redaction: + description: Beskrivelse report: category: Begrunn rapporten din details: Fremskaff flere detaljer om problemet (påkrevet) user: email: E-post + new_email: 'Ny e-postadresse:' active: Aktiv display_name: Visningsnavn description: Beskrivelse + home_lat: 'Breddegrad:' + home_lon: 'Lengdegrad:' languages: Språk pass_crypt: Passord pass_crypt_confirmation: Bekreft passord @@ -154,6 +159,8 @@ nb: tagstring: kommaseparert user_block: needs_view: Må brukeren logge inn før denne blokkeringen blir fjernet? + user: + new_email: ' (vises aldri offentlig)' datetime: distance_in_words_ago: about_x_hours: @@ -2117,15 +2124,10 @@ nb:

    Registrer deg for å komme i gang med å bidra. Vi vil sende en e-mail for å bekrefte din konto.

    email address: 'E-postadresse:' confirm email address: 'Bekreft e-postadresse:' - not_displayed_publicly_html: Adressen din vises ikke offentlig, se vår - personvernpolitikk for mer informasjon. display name: 'Visningsnavn:' display name description: Ditt offentlig fremviste brukernavn. Du kan endre dette senere i innstillingene. external auth: 'Tredjepartsgodkjenning:' - password: 'Passord:' - confirm password: 'Bekreft passord:' use external auth: Alternativt kan du bruke en tredjepart til å logge inn auth no password: Med tredjepartsbekreftelse er passord ikke påkrevd, men en del ekstra verktøy og tjenere kan trenge det. @@ -2242,8 +2244,6 @@ nb: title: Rediger konto my settings: Mine innstillinger current email address: 'Nåværende e-postadresse:' - new email address: 'Ny e-postadresse:' - email never displayed publicly: ' (vises aldri offentlig)' external auth: 'Ekstern bekreftelse:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2275,14 +2275,10 @@ nb: offentlig eiendom (Public Domain). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: hva er dette? - profile description: 'Profilbeskrivelse:' - preferred languages: 'Foretrukne språk:' - preferred editor: 'Foretrukket redigeringsverktøy:' image: 'Bilde:' gravatar: gravatar: Bruk Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: hva er dette? disabled: Gravatar har blitt slått av. enabled: Visning av din Gravatar er slått på. new image: Legg til et bilde @@ -2292,8 +2288,6 @@ nb: image size hint: (kvadratiske bilder som er minst 100x100 fungerer best) home location: 'Hjemmeposisjon:' no home location: Du har ikke angitt din hjemmeposisjon. - latitude: 'Breddegrad:' - longitude: 'Lengdegrad:' update home location on click: Oppdater hjemmeposisjon når jeg klikker på kartet? save changes button: Lagre endringer make edits public button: Gjør alle mine redigeringer offentlig @@ -2699,7 +2693,6 @@ nb: centre_map: Sentrer kartet her redactions: edit: - description: Beskrivelse heading: Rediger maskering title: Rediger maskering index: @@ -2707,7 +2700,6 @@ nb: heading: Liste over maskeringer title: Liste over maskeringer new: - description: Beskrivelse heading: Legg inn informasjon for ny maskering title: Lager ny maskering show: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 7425fb315..94074c71c 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -101,11 +101,15 @@ ne: title: विषय body: बडी recipient: प्रापक + redaction: + description: वर्णन user: email: इमेल active: सक्रिय display_name: देखाउने नाम description: वर्णन + home_lat: 'देशान्तर:' + home_lon: 'अक्षांश:' languages: भाषाहरू pass_crypt: पासवर्ड help: @@ -1118,8 +1122,6 @@ ne: email address: 'इमेल ठेगाना:' confirm email address: 'इमेल ठेगाना पक्का गर्नुहोस्:' display name: 'देखाउने नाम:' - password: 'पासवर्ड:' - confirm password: 'पासवर्ड निश्चित गर्नुहोस्:' continue: खाता खाेल्नुहाेस् terms: consider_pd_why: यो के हो ? @@ -1169,14 +1171,9 @@ ne: heading: सार्वजनिक सम्पादन contributor terms: link text: यो के हो ? - preferred languages: 'रुचाइएका भाषाहरू:' image: 'चित्र:' - gravatar: - link text: यो के हो ? home location: 'गृह स्थान:' no home location: तपाईंले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन। - latitude: 'देशान्तर:' - longitude: 'अक्षांश:' save changes button: परिवर्तनहरू संग्रह गर्नुहोस् flash update success confirm needed: प्रयोगकर्ताको जानकारीहरू सफलतापूर्वक अध्यावधिक गरियो। Check your email for a note to confirm your new email address. @@ -1290,10 +1287,6 @@ ne: add_note: यहाँ एउटा टिपोट थप्नुहोस् show_address: ठेगाना देखाउनुहोस् redactions: - edit: - description: वर्णन - new: - description: वर्णन show: description: विवरण user: 'सर्जक:' diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 408f9f326..b1a5d2af0 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -169,14 +169,19 @@ nl: title: Onderwerp body: Tekst recipient: Ontvanger + redaction: + description: Beschrijving report: category: Selecteer een reden voor je melding details: Verschaf a.u.b. nog wat meer details over het probleem (vereist). user: email: E-mail + new_email: 'Nieuw e-mailadres:' active: Actief display_name: Weergavenaam description: Beschrijving + home_lat: 'Breedtegraad:' + home_lon: 'Lengtegraad:' languages: Talen pass_crypt: Wachtwoord pass_crypt_confirmation: Wachtwoord bevestigen @@ -189,6 +194,8 @@ nl: zichtbaar. Bedenk dat niet alle gebruikers het gemeenschapsjargon begrijpen, dus formuleer begrijpelijk. needs_view: Moet de gebruiker aanmelden voordat deze blokkade wordt verwijderd? + user: + new_email: (nooit openbaar gemaakt) datetime: distance_in_words_ago: about_x_hours: @@ -2424,15 +2431,10 @@ nl:

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

    email address: 'E-mailadres:' confirm email address: 'E-mailadres bevestigen:' - not_displayed_publicly_html: Uw adres wordt niet openbaar gemaakt, zie ons privacybeleid voor meer informatie. display name: 'Weergavenaam:' display name description: Uw openbare gebruikersnaam. U kunt deze later in uw voorkeuren wijzigen. external auth: 'Derde partijverificatie:' - password: 'Wachtwoord:' - confirm password: 'Wachtwoord bevestigen:' use external auth: U kunt ook gebruik maken van een derde partij om aan te melden auth no password: Met derde partijverificatie is een wachtwoord niet verplicht, maar sommige extra hulpmiddelen of servers kunnen het nog steeds nodig hebben. @@ -2552,8 +2554,6 @@ nl: title: Account bewerken my settings: Mijn instellingen current email address: 'Huidige e-mailadres:' - new email address: 'Nieuw e-mailadres:' - email never displayed publicly: (nooit openbaar gemaakt) external auth: 'Externe verificatie:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2587,14 +2587,10 @@ nl: Publieke domein. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: wat is dit? - profile description: 'Profielbeschrijving:' - preferred languages: 'Voorkeurstalen:' - preferred editor: 'Voorkeursprogramma voor kaartbewerking:' image: 'Afbeelding:' gravatar: gravatar: Gravatar gebruiken link: https://wiki.openstreetmap.org/wiki/NL:Gravatar - link text: wat is dit? disabled: Gravatar is uitgeschakeld. enabled: Het weergeven van uw Gravatar is ingeschakeld. new image: Afbeelding toevoegen @@ -2605,8 +2601,6 @@ nl: het beste) home location: 'Thuislocatie:' no home location: Er is geen thuislocatie ingevoerd. - latitude: 'Breedtegraad:' - longitude: 'Lengtegraad:' update home location on click: Thuislocatie aanpassen bij klikken op de kaart save changes button: Wijzigingen opslaan make edits public button: Al mijn wijzigingen openbaar maken @@ -3019,7 +3013,6 @@ nl: centre_map: De kaart hier centreren redactions: edit: - description: Beschrijving heading: Redigering bewerken title: Redigering bewerken index: @@ -3027,7 +3020,6 @@ nl: heading: Lijst met redigeringen title: Lijst met redigeringen new: - description: Beschrijving heading: Gegevens voor nieuwe redigering invoeren title: Aanmaak van een nieuwe redigering show: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index af06f3c0e..f77d87b66 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -121,11 +121,16 @@ nn: title: Emne body: Brødtekst recipient: Mottakar + redaction: + description: Skildring user: email: E-post + new_email: 'Ny e-postadresse:' active: Aktive display_name: Visningsnamn description: Skildring + home_lat: 'Breiddegrad:' + home_lon: 'Lengdegrad:' languages: Språk pass_crypt: Passord pass_crypt_confirmation: Stadfest passord @@ -134,6 +139,8 @@ nn: tagstring: kommaseparert user_block: needs_view: Må brukaren logge inn før denne blokkeringa vert fjerna? + user: + new_email: ' (vis aldri offentleg)' datetime: distance_in_words_ago: about_x_hours: @@ -1699,14 +1706,9 @@ nn:

    Registrer deg for å starte å bidra. Vi sender deg ein e-post for å stadfeste kontoen din.

    email address: 'E-postadresse:' confirm email address: 'Stadfest e-postadresse:' - not_displayed_publicly_html: Ikkje vist offentleg (sjå vår - personvernpolitikk) display name: 'Visningsnavn:' display name description: Ditt offentleg framviste brukernavn. Du kan endre dette seinare i innstellingane. - password: 'Passord:' - confirm password: 'Stadfest passord:' continue: Registrer deg terms accepted: Takk for at du godtok dei nye bidragsytervilkårene! terms declined: Me beklagar at du har vedteke å ikkje akseptere dei nye bidragsytervilkårene. @@ -1810,8 +1812,6 @@ nn: title: Rediger konto my settings: Innstellingane mine current email address: 'Noverande e-postadresse:' - new email address: 'Ny e-postadresse:' - email never displayed publicly: ' (vis aldri offentleg)' openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: kva er dette? @@ -1843,14 +1843,10 @@ nn: offentleg eigedom (Public Domain). link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: kva er dette? - profile description: 'Profilskildring:' - preferred languages: 'Føretrekte språk:' - preferred editor: Foretrukket redigeringsverktøy image: 'Bilete:' gravatar: gravatar: Bruk Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: kva er dette? new image: Legg til eit bilete keep image: Hald på gjeldande bilete delete image: Fjern gjeldande bilete @@ -1858,8 +1854,6 @@ nn: image size hint: (kvadratiske bilete som er minst 100x100 fungerer best) home location: 'Heimeposisjon:' no home location: Du har ikkje skrive inn din heimelokasjon. - latitude: 'Breiddegrad:' - longitude: 'Lengdegrad:' update home location on click: Oppdatere heimeplassering når eg klikkar på kartet? save changes button: Lagre endringar make edits public button: Gjer alle redigeringane mine offentleg @@ -2173,7 +2167,6 @@ nn: centre_map: Sentrer kartet her redactions: edit: - description: Skildring heading: Rediger maskering title: Rediger relasjon index: @@ -2181,7 +2174,6 @@ nn: heading: Liste over maskeringar title: Liste over maskeringar new: - description: Skildring heading: Legg inn informasjon for ein ny maskering title: Lagar ein ny maskering show: diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index bbdb5b878..fbf58b528 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -368,6 +368,7 @@ nqo: has_commented_on: '%{display_name} ߟߎ߫ ߓߘߴߊ߬ߟߎ߬ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ ߟߎ߫ ߞߊ߲߬' post: ߗߋߓߏ߲ + when: ߕߎ߬ߡߊ߫ ߖߐ߲߬ comment: ߡߙߌߣߊ߲ߦߌߘߊ newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬ older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬ @@ -399,11 +400,18 @@ nqo: prefix: aerialway: cable_car: ߘߎ߲ߞߎߟߎ߲ + chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲ aeroway: + gate: ߘߏ߲߬ߘߊ hangar: ߜߕߊ + helipad: ߛߊ߲ߡߊߘߊ߲ + holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ + navigationaid: ߛߊ߲ߡߊߘߊ߲ ߛߏ߯ߓߊߟߌ ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬ parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ + taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫ taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ + terminal: ߟߊ߬ߓߊ߲ amenity: bank: ߜߍߓߏ߲ bar: ߡߌ߲߬ߓߏ߲ @@ -504,6 +512,7 @@ nqo: bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫ living_street: ߛߏߞߣߐ߫ ߛߌߟߊ + path: ߛߌߟߊ primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲ raceway: ߜߛߊ߬ߞߍ߬ ߛߌߟߊ @@ -536,6 +545,7 @@ nqo: garden: ߣߊߞߐ horse_riding: ߛߏ߬ ߓߏߙߌ nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲ + park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲ swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ man_made: @@ -544,6 +554,9 @@ nqo: telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲ tower: ߛߊ߲ߓߏ߲ water_tower: ߖߌߡߣߐ + water_well: ߊ߬ ߞߊߢߌ߲߬ + water_works: ߖߌ߫ ߓߊ߯ߙߊ + windmill: ߝߢߐ߫ ߥߎ߮ works: ߝߊ߲ߓߏ߲ "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ military: @@ -552,6 +565,7 @@ nqo: forest: ߕߎ hill: ߞߎ߬ߙߎ island: ߕߌ߲ + point: ߕߏ߲ߘߋ sand: ߕߌ߬ߢߍ tree: ߦߙߌߖߎ valley: ߝߏ߲ߝߊ߲ @@ -559,19 +573,32 @@ nqo: wetland: ߦߙߐ߫ ߦߌߟߌ߲ߣߍ߲ wood: ߦߙߌ office: + company: ߖߊ߬ߥߏ߬ߘߊ + diplomatic: ߕߍߓߊ߯ߦߊ ߛߓߍߘߊ + educational_institution: ߟߊ߬ߞߙߐ߬ߛߌ߬ߟߌ ߘߋ߬ߙߌ߬ߘߊ + employment_agency: ߓߊ߯ߙߊ ߖߋ߬ߕߌ߰ߘߊ government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ + it: ߕߞ ߛߓߍߘߊ + lawyer: ߟߊ߬ߝߛߊ߬ߟߌ߬ߟߊ + logistics: ߕߞߌߦߊ ߛߓߍߘߊ newspaper: ߝߐ߰ߓߍ߬ ߛߓߍ߬ߘߊ߮ ngo: ߛ.ߘ.ߞ ߛߓߍߘߊ + notary: ߛߙߋߘߐߦߟߊ religion: ߣߊߡߎ߲ ߛߓߍߘߊ + research: ߛߓߍߘߊ ߕߌߙߌ߲ߠߌ߲ߘߊ telecommunication: ߓߌ߬ߟߊ߬ߢߐ߲߱ߡߊ ߛߓߍߘߊ travel_agent: ߕߐ߰ߕߐ߰ߟߌ߬ ߗߋߘߊ "yes": ߛߓߍߘߊ place: + city: ߛߏ + city_block: ߛߏ ߜߊ߲߬ߕߎ country: ߖߡߊ߬ߣߊ + county: ߖߡߊ߬ߣߊ farm: ߝߏ߬ߘߏ house: ߟߎ houses: ߟߎ ߟߎ߬ island: ߕߌ߲ + locality: ߦߌߟߊߦߙߐ region: ߕߌ߲߬ߞߎߘߎ߲ sea: ߞߐ߰ߖߌ state: ߞߊ߬ߝߏ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index b675105eb..441c37551 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -110,13 +110,18 @@ oc: title: Subjècte body: Còrs recipient: Destinatari + redaction: + description: Descripcion report: details: Se vos plai, fornissètz mai de detalhs sus la dificultat (obligatòri). user: email: Adreça de corrièr electronic + new_email: 'Novèla adreça de corrièr electronic :' active: Actiu display_name: Nom afichat description: Descripcion + home_lat: 'Latitud :' + home_lon: 'Longitud :' languages: Lengas pass_crypt: Senhau help: @@ -125,6 +130,8 @@ oc: user_block: needs_view: L’utilizaire se deu connectar abans qu'aqueste blocatge expire ? + user: + new_email: (pas jamai afichat publicament) datetime: distance_in_words_ago: about_x_hours: @@ -1985,8 +1992,6 @@ oc: display name description: Vòstre nom d'utilizaire afichat publicament. Podètz cambiar aquò ulteriorament dins las preferéncias. external auth: 'Autentificacion tèrça :' - password: 'Senhal :' - confirm password: 'Confirmatz lo senhal :' use external auth: A la plaça, utilizatz un tèrç per vos connectar continue: S’inscriure terms accepted: Mercé d’aver acceptat los novèls tèrmes del contributor ! @@ -2084,8 +2089,6 @@ oc: title: Modificar lo compte my settings: Meis opcions current email address: 'Adreça de corrièr electronic actuala:' - new email address: 'Novèla adreça de corrièr electronic :' - email never displayed publicly: (pas jamai afichat publicament) external auth: 'Autenticacion extèrna:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2105,13 +2108,9 @@ oc: agreed: Avètz acceptat los novèls tèrmes del contributor. not yet agreed: Avètz pas encara acceptat los novèls tèrmes del contributor. link text: qu’es aquò ? - profile description: 'Descripcion del perfil :' - preferred languages: 'Lengas preferidas :' - preferred editor: 'Editor preferit :' image: 'Imatge :' gravatar: gravatar: Utilizar Gravatar - link text: qu’es aquò ? disabled: Gravatar es estat desactivat. enabled: L'afichatge de vòstre Gravatar es estat activat. new image: Ajustar un imatge @@ -2121,8 +2120,6 @@ oc: image size hint: (los imatges carrats d'al mens 100×100 pixèls foncionan melhor) home location: 'Emplaçament del domicili :' no home location: Avètz pas indicat l'emplaçament de vòstre domicili. - latitude: 'Latitud :' - longitude: 'Longitud :' update home location on click: Metre a jorn l'emplaçament de vòstre domicili quand clicatz sus la mapa ? save changes button: Enregistrar las modificacions @@ -2487,7 +2484,6 @@ oc: centre_map: Centrar la mapa aicí redactions: edit: - description: Descripcion heading: Modificar la redaccion title: Modificar la redaccion index: @@ -2495,7 +2491,6 @@ oc: heading: Lista de redaccions title: Lista de redaccions new: - description: Descripcion heading: Picatz las informacions sus la novèla redaccion title: Crear una redaccion novèla show: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index d7240d099..75d51cd70 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -102,11 +102,16 @@ pa: title: ਵਿਸ਼ਾ body: ਮੁੱਖ ਭਾਗ recipient: ਪ੍ਰਾਪਤਕਰਤਾ + redaction: + description: ਵੇਰਵਾ user: email: ਈਮੇਲ + new_email: 'ਨਵਾਂ ਈ-ਮੇਲ ਪਤਾ:' active: ਸਰਗਰਮ display_name: ਵਿਖਾਉਣ ਨਾਂ description: ਵੇਰਵਾ + home_lat: 'ਅਕਸ਼ਾਂਸ਼:' + home_lon: 'ਰੇਖਾਂਸ਼:' languages: ਬੋਲੀਆਂ pass_crypt: ਪਛਾਣ-ਸ਼ਬਦ datetime: @@ -1036,8 +1041,6 @@ pa: email address: 'ਈਮੇਲ ਪਤਾ:' confirm email address: 'ਈ-ਮੇਲ ਪਤਾ ਤਸਦੀਕ ਕਰੋ:' display name: 'ਵਖਾਵੇ ਦਾ ਨਾਂ:' - password: 'ਪਛਾਣ-ਸ਼ਬਦ:' - confirm password: 'ਪਛਾਣ ਸ਼ਬਦ ਤਸਦੀਕ ਕਰੋ:' continue: ਭਰਤੀ ਹੋਵੋ terms: title: ਯੋਗਦਾਨੀ ਦੀਆਂ ਸ਼ਰਤਾਂ @@ -1107,7 +1110,6 @@ pa: title: ਖਾਤਾ ਸੋਧੋ my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ current email address: 'ਮੌਜੂਦਾ ਈਮੇਲ ਪਤਾ:' - new email address: 'ਨਵਾਂ ਈ-ਮੇਲ ਪਤਾ:' openid: link text: ਇਹ ਕੀ ਹੈ? public editing: @@ -1121,21 +1123,15 @@ pa: agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਜਤਾਈ ਹੈ। not yet agreed: ਤੁਸੀਂ ਯੋਗਦਾਨੀ ਦੀਆਂ ਨਵੀਆਂ ਸ਼ਰਤਾਂ ਨਾਲ਼ ਸਹਿਮਤੀ ਨਹੀਂ ਜਤਾਈ। link text: ਇਹ ਕੀ ਹੈ? - profile description: 'ਪ੍ਰੋਫ਼ਾਈਲ ਵੇਰਵਾ:' - preferred languages: 'ਤਰਜੀਹੀ ਬੋਲੀਆਂ:' - preferred editor: 'ਤਰਜੀਹੀ ਸੰਪਾਦਕ:' image: 'ਤਸਵੀਰ:' gravatar: gravatar: ਗਰੈਵੇਤਾਰ ਵਰਤੋ - link text: ਇਹ ਕੀ ਹੈ? new image: ਇੱਕ ਤਸਵੀਰ ਜੋੜੋ keep image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਰੱਖੋ delete image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਹਟਾਉ replace image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਵਟਾਉ home location: 'ਘਰ ਦੀ ਸਥਿਤੀ:' no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ। - latitude: 'ਅਕਸ਼ਾਂਸ਼:' - longitude: 'ਰੇਖਾਂਸ਼:' save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ make edits public button: ਮੇਰੀਆਂ ਸਾਰੀਆਂ ਸੋਧਾਂ ਜਨਤਕ ਕਰੋ return to profile: ਪ੍ਰੋਫ਼ਾਈਲ ਵੱਲ ਮੁੜੋ @@ -1257,10 +1253,6 @@ pa: reactivate: ਮੁੜ ਚਾਲੂ ਕਰੋ comment: ਟਿੱਪਣੀ ਕਰੋ redactions: - edit: - description: ਵੇਰਵਾ - new: - description: ਵੇਰਵਾ show: confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? ... diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 616d6858c..2a1cd04e0 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -173,15 +173,25 @@ pl: title: Temat body: Treść recipient: Odbiorca + redaction: + title: Tytuł + description: Opis report: category: Wybierz powód zgłoszenia details: Opisz, proszę, problem bardziej szczegółowo (wymagane). user: + auth_provider: Dostawca uwierzytelnienia + auth_uid: UID uwierzytelnienia email: E-mail + email_confirmation: Potwierdzenie adresu e‐mail + new_email: 'Nowy adres e-mail:' active: Aktywny display_name: Wyświetlana nazwa description: Opis + home_lat: 'Szerokość:' + home_lon: 'Długość geograficzna:' languages: Języki + preferred_editor: 'Preferowane edytowanie w:' pass_crypt: Hasło pass_crypt_confirmation: Potwierdź hasło help: @@ -194,6 +204,12 @@ pl: użytkownicy mogą znać żargon obowiązujący w społeczności projektu, więc staraj się używać ogólnie rozumianych pojęć. needs_view: Czy użytkownik musi się zalogować, zanim blokada zostanie zdjęta? + user: + email_confirmation: Twój adres nie będzie wyświetlany publicznie, zobacz naszą + politykę prywatności, + aby uzyskać więcej informacji. + new_email: (nie jest wyświetlany publicznie) datetime: distance_in_words_ago: about_x_hours: @@ -2469,16 +2485,10 @@ pl: oraz pobierać i używać map za darmo.

    email address: 'Adres e-mail:' confirm email address: 'Potwierdzenie adresu e-mail:' - not_displayed_publicly_html: Twój adres nie będzie wyświetlany publicznie, zobacz - naszą politykę prywatności, - aby uzyskać więcej informacji. display name: 'Przyjazna nazwa:' display name description: Twoja publiczna nazwa użytkownika. Można ją później zmienić w ustawieniach. external auth: 'Logowanie przez:' - password: Hasło - confirm password: 'Potwierdzenie hasła:' use external auth: 'Zaloguj się przez:' auth no password: Jeśli korzystasz z logowania pośredniego, hasło nie jest wymagane, jednak niektóre dodatkowe narzędzia lub serwer mogą go potrzebować. @@ -2598,8 +2608,6 @@ pl: title: Zmiana ustawień konta my settings: Ustawienia current email address: 'Aktualny adres e-mail:' - new email address: 'Nowy adres e-mail:' - email never displayed publicly: (nie jest wyświetlany publicznie) external auth: 'Zewnętrzne uwierzytelnienie:' openid: link: https://wiki.openstreetmap.org/wiki/Pl:OpenID @@ -2631,14 +2639,11 @@ pl: agreed_with_pd: Zadeklarowałeś, że twoje edycje publikujesz w domenie publicznej. link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: co to jest? - profile description: 'Opis profilu:' - preferred languages: 'Preferowane języki:' - preferred editor: 'Preferowane edytowanie w:' image: 'Obraz:' gravatar: gravatar: Użyj Gravatara link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: co to jest? + what_is_gravatar: Co to jest Gravatar? disabled: Wyłączono Gravatara. enabled: Włączono wyświetlanie Gravatara. new image: Dodanie obrazu @@ -2649,8 +2654,6 @@ pl: 100x100) home location: 'Położenie domu:' no home location: Nie wpisałeś swojej lokalizacji domowej. - latitude: 'Szerokość:' - longitude: 'Długość geograficzna:' update home location on click: Uaktualnianie położenia kliknięciem na mapie save changes button: Zapisz zmiany make edits public button: Niech wszystkie edycje będą publiczne. @@ -3079,7 +3082,6 @@ pl: centre_map: Wycentruj mapę tutaj redactions: edit: - description: Opis heading: Edytuj poprawkę title: Edytuj poprawkę index: @@ -3087,7 +3089,6 @@ pl: heading: Lista poprawek title: Lista poprawek new: - description: Opis heading: Wprowadź informację dla nowej poprawki title: Tworzenie nowej poprawki show: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 98f64c556..dc1c92a9e 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -163,15 +163,25 @@ pt-BR: title: Assunto body: Corpo recipient: Destinatário + redaction: + title: Título + description: Descrição report: category: Seleciona um motivo para o seu relatório details: Por favor, forneça mais alguns detalhes sobre o problema (obrigatório). user: + auth_provider: Provedor de autenticação + auth_uid: UID de autenticação email: E-mail + email_confirmation: Confirmação do e-mail + new_email: Novo endereço de e-mail active: Ativo display_name: Nome de exibição - description: Descrição - languages: Idiomas + description: Descrição do perfil + home_lat: Latitude + home_lon: Longitude + languages: Idiomas preferidos + preferred_editor: Editor preferido pass_crypt: Senha pass_crypt_confirmation: Confirmar Senha help: @@ -184,6 +194,12 @@ pt-BR: de que nem todos os usuários entendem o jargão da comunidade, então tente usar termos leigos. needs_view: O usuário precisa se logar para esse bloqueio ser retirado? + user: + email_confirmation: Seu endereço não é exibido publicamente, consulte nossa + privacy + policy para maiores informações. + new_email: (nunca exibido publicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2440,16 +2456,10 @@ pt-BR:

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

    email address: 'Endereço de E-mail:' confirm email address: 'Confirme o Endereço de E-mail:' - not_displayed_publicly_html: O seu endereço de IP não será visível publicamente. - Consulte a política - de privacidade para mais informação. display name: 'Nome de exibição:' display name description: Seu nome de usuário disponível publicamente. Você pode mudá-lo depois nas preferências. external auth: 'Autenticação de Terceiros:' - password: 'Senha:' - confirm password: 'Confirmar senha:' use external auth: Ou identifique-se através de terceiros auth no password: Com autenticação por terceiros não é necessária uma senha, mas certas ferramentas ou o servidor talvez ainda precisem. @@ -2565,15 +2575,13 @@ pt-BR: account: title: Editar conta my settings: Minhas configurações - current email address: 'Endereço de e-mail atual:' - new email address: 'Novo endereço de e-mail:' - email never displayed publicly: (nunca exibido publicamente) - external auth: 'Autenticação externa:' + current email address: Endereço de e-mail atual + external auth: Autenticação externa openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: o que é isto? public editing: - heading: 'Edição pública:' + heading: Edição pública enabled: Ativado. Não é anônimo e pode editar dados. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: o que é isso? @@ -2591,7 +2599,7 @@ pt-BR: de e-mail não será revelado.
  • Esta ação não pode ser revertida e todos os novos utilizadores têm as edições disponibilizadas publicamente.
    • contributor terms: - heading: 'Termos do contribuidor:' + heading: Termos do contribuidor agreed: Você aceitou os novos termos do contribuidor. not yet agreed: Você não aceitou os novos termos do contribuidor. review link text: Por favor siga este link quando você puder para revisar @@ -2600,14 +2608,11 @@ pt-BR: Público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: o que é isso? - profile description: 'Descrição do perfil:' - preferred languages: 'Idiomas preferidos:' - preferred editor: 'Editor preferido:' - image: 'Imagem:' + image: Imagem gravatar: gravatar: Usar o Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=pt-br - link text: O que é isto? + what_is_gravatar: O que é o Gravatar? disabled: O Gravatar foi desativado. enabled: A exibição do seu Gravatar foi ativada. new image: Adicionar uma imagem @@ -2615,10 +2620,8 @@ pt-BR: delete image: Remover a imagem atual replace image: Trocar a imagem atual image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor) - home location: 'Local principal:' + home location: Local principal no home location: Você ainda não definiu o seu local principal. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Atualizar local principal ao clicar no mapa? save changes button: Salvar alterações make edits public button: Tornar públicas todas as minhas edições @@ -3035,7 +3038,6 @@ pt-BR: centre_map: Centralizar o mapa aqui redactions: edit: - description: Descrição heading: Editar anulação title: Editar anulação index: @@ -3043,7 +3045,6 @@ pt-BR: heading: Lista de anulações title: Lista de redações new: - description: Descrição heading: Digite informações para a nova anulação title: Criando uma nova anulação show: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index c7b0d5d94..bb6d1c18f 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -151,14 +151,19 @@ pt-PT: title: Assunto body: Conteúdo recipient: Destinatário + redaction: + description: Descrição report: category: Seleciona um motivo para a tua denúncia details: Por favor, fornece mais alguns detalhes sobre o problema (obrigatório). user: email: E-mail + new_email: 'Novo e-mail:' active: Ativo display_name: Nome visualizado description: Descrição + home_lat: 'Latitude:' + home_lon: 'Longitude:' languages: Idiomas pass_crypt: Palavra-passe pass_crypt_confirmation: Confirmar palavra-passe @@ -168,6 +173,8 @@ pt-PT: user_block: needs_view: O utilizador precisa de iniciar sessão antes de o bloqueio ser revogado? + user: + new_email: (nunca é mostrado publicamente) datetime: distance_in_words_ago: about_x_hours: @@ -2358,16 +2365,10 @@ pt-PT:

    Cria uma conta de utilizador para começares a colaborar. Enviaremos um e-mail para confirmares a tua conta.

    email address: 'E-mail:' confirm email address: 'Confirmar e-mail:' - not_displayed_publicly_html: O teu endereço não ficará visível publicamente. - Consulta a política - de privacidade para mais informações. display name: 'Nome de utilizador:' display name description: O nome de utilizador ficará visível publicamente. Poderás alterar o nome posteriormente nas configurações do teu perfil. external auth: 'Autenticação por terceiros:' - password: 'Palavra-passe:' - confirm password: 'Confirmar palavra-passe:' use external auth: Em alternativa, utiliza um serviço externo para iniciares sessão auth no password: Com a autenticação através de terceiros, não é necessário @@ -2489,8 +2490,6 @@ pt-PT: title: Editar conta my settings: Definições current email address: 'E-mail atual:' - new email address: 'Novo e-mail:' - email never displayed publicly: (nunca é mostrado publicamente) external auth: 'Autenticação externa:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2523,14 +2522,10 @@ pt-PT: em Domínio Público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: o que é isto? - profile description: 'Descrição do perfil:' - preferred languages: 'Idiomas preferidos:' - preferred editor: 'Editor preferido:' image: 'Imagem:' gravatar: gravatar: Usar imagem Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: o que é isto? disabled: O Gravatar foi desativado. enabled: A exibição do teu Gravatar foi ativada. new image: Adicionar uma imagem @@ -2541,8 +2536,6 @@ pt-PT: melhor) home location: Localização principal no home location: Não definiste a tua localização principal. - latitude: 'Latitude:' - longitude: 'Longitude:' update home location on click: Atualizar a localização ao clicar no mapa? save changes button: Gravar alterações make edits public button: Tornar todas as minhas edições públicas @@ -2964,7 +2957,6 @@ pt-PT: centre_map: Centrar mapa aqui redactions: edit: - description: Descrição heading: Editar supressão title: Editar supressão index: @@ -2972,7 +2964,6 @@ pt-PT: heading: Lista de supressões title: Lista de supressões new: - description: Descrição heading: Introduza a informação da nova supressão title: A criar uma nova supressão show: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 1aeb3d8bd..f7104d291 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -129,14 +129,19 @@ ro: title: Subiect body: Textul mesajului recipient: Destinatar + redaction: + description: Descriere report: category: Selectați un motiv pentru raportul dvs details: Vă rugăm să furnizați mai multe detalii despre problemă (necesar). user: email: E-mail + new_email: 'Adresa de e-mail nouă:' active: Activ display_name: Afișare nume description: Descriere + home_lat: 'Latitudine:' + home_lon: 'Longitudine:' languages: Limbi pass_crypt: Parolă help: @@ -145,6 +150,8 @@ ro: user_block: needs_view: Utilizatorul trebuie să se conecteze înainte ca această blocare să fie ștearsă? + user: + new_email: (nu a fost afișată în mod public) datetime: distance_in_words_ago: about_x_hours: @@ -2231,16 +2238,10 @@ ro:

    Înscrieți-vă pentru a începe să contribuiți. Vom trimite un e-mail pentru a vă confirma contul.

    email address: 'Adresa de e-mail:' confirm email address: 'Confirmați adresa de e-mail:' - not_displayed_publicly_html: Adresa dvs. nu este afișată în mod public, consultați - privacy policy politica de - confidențialitateЗарегистрируйтесь, чтобы сделать свой вклад. Мы отправим вам письмо, чтобы подтвердить ваш аккаунт.

    email address: 'Адрес эл. почты:' confirm email address: 'Подтвердите адрес эл. почты:' - not_displayed_publicly_html: Ваш адрес не будет отображаться публично, смотрите - нашу политику конфиденциальности - для получения дополнительной информации display name: 'Отображаемое имя:' display name description: Ваше имя, как оно будет видно другим пользователям. Вы сможете изменить его позже в настройках. external auth: 'Внешний сайт с учётной записью:' - password: 'Пароль:' - confirm password: 'Повторите пароль:' use external auth: Либо воспользуйтесь аккаунтом с другого сайта auth no password: С внешним логином пароль не обязателен, но в некоторых случаях он необходим @@ -2406,8 +2413,6 @@ ru: title: Изменить учетную запись my settings: Мои настройки current email address: 'Текущий адрес электронной почты:' - new email address: 'Новый адрес электронной почты:' - email never displayed publicly: (не будет показан) external auth: 'Внешняя аутентификация:' openid: link: https://wiki.openstreetmap.org/wiki/RU:OpenID @@ -2440,14 +2445,10 @@ ru: в общественном достоянии. link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru link text: что это? - profile description: 'Описание профиля:' - preferred languages: 'Предпочитаемые языки:' - preferred editor: 'Предпочтительный редактор:' - image: 'Изображение:' + image: Изображение gravatar: gravatar: Использовать Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=ru - link text: что это? disabled: Gravatar отключён. enabled: Отображение вашего Gravatar включено. new image: Добавить изображение @@ -2458,8 +2459,6 @@ ru: лучше) home location: 'Моё местоположение:' no home location: Вы не обозначили свое домашнее местоположение. - latitude: 'Широта:' - longitude: 'Долгота:' update home location on click: Обновлять моё местоположение, когда я нажимаю на карту? save changes button: Сохранить изменения @@ -2890,7 +2889,6 @@ ru: centre_map: Центрировать карту redactions: edit: - description: Описание heading: Редактировать исправление title: Редактировать исправление index: @@ -2898,7 +2896,6 @@ ru: heading: Список исправлений title: Список исправлений new: - description: Описание heading: Введите информацию для нового исправления title: Создание нового исправления show: diff --git a/config/locales/sat.yml b/config/locales/sat.yml index 12523b6df..bd04f500b 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -87,10 +87,13 @@ sat: sender: ᱵᱷᱮᱡᱟᱭᱤᱪ title: ᱵᱤᱥᱚᱭ body: ᱦᱚᱲᱢᱚ + redaction: + description: ᱵᱤᱵᱨᱚᱱ report: category: ᱟᱢᱟᱜ ᱨᱤᱯᱚᱴ ᱨᱮᱭᱟᱜ ᱠᱟᱨᱚᱬ ᱪᱚᱭᱚᱱ ᱢᱮ user: email: ᱤᱢᱮᱞ + new_email: 'ᱱᱟᱶᱟ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:' active: ᱩᱥᱨᱟᱹᱣ display_name: ᱩᱫᱩᱜ ᱧᱩᱛᱩᱢ description: ᱵᱤᱵᱨᱚᱱ @@ -628,8 +631,6 @@ sat: email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:' confirm email address: 'ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ ᱜᱚᱴᱟᱭ ᱢᱮ:' display name: ᱩᱫᱩᱜᱟ ᱧᱩᱠᱩᱢ - password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:' - confirm password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱜᱚᱴᱟᱭ ᱢᱮ:' continue: ᱧᱩᱛᱩᱢ ᱚᱞ terms: consider_pd_why: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ? @@ -663,7 +664,6 @@ sat: title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ current email address: 'ᱱᱮᱛᱚᱜ-ᱟᱜ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:' - new email address: 'ᱱᱟᱶᱟ ᱤᱢᱮᱞ ᱴᱷᱤᱠᱟᱹᱬᱟ:' openid: link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ? public editing: @@ -671,8 +671,6 @@ sat: contributor terms: link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ? image: ᱪᱤᱛᱟᱹᱨᱺ - gravatar: - link text: ᱱᱤᱭᱟᱹ ᱫᱚ ᱪᱮᱫ? new image: ᱢᱤᱫᱴᱮᱱ ᱪᱤᱛᱟᱹᱨ ᱥᱮᱞᱮᱫ ᱢᱮ home location: 'ᱚᱲᱟᱜ ᱡᱟᱭᱜᱟ:' save changes button: ᱵᱚᱫᱚᱞᱠᱚ ᱪᱟᱺᱪᱟᱣ ᱢᱮ @@ -769,10 +767,6 @@ sat: show_address: ᱴᱷᱤᱠᱟᱹᱬᱟ ᱩᱫᱩᱜ centre_map: ᱱᱚᱠᱥᱟ ᱱᱚᱰᱮ ᱛᱟᱞᱟᱭ ᱢᱮ redactions: - edit: - description: ᱵᱤᱵᱨᱚᱱ - new: - description: ᱵᱤᱵᱨᱚᱱ show: description: 'ᱵᱤᱵᱨᱚᱱ:' confirm: ᱪᱮᱫ ᱟᱢ ᱜᱚᱴᱟ ᱢᱮᱱᱟᱢ-ᱟ? diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 8f167edfb..321a9a75a 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -91,10 +91,14 @@ sc: title: Ogetu body: Corpus recipient: Destinatàriu + redaction: + description: Descritzione user: email: E-lìtera active: Ativu description: Descritzione + home_lat: 'Latitùdine:' + home_lon: 'Longitùdine:' languages: Limbas pass_crypt: Crae datetime: @@ -926,8 +930,6 @@ sc: popup: friend: Amigu account: - latitude: 'Latitùdine:' - longitude: 'Longitùdine:' save changes button: Sarva sas modìficas confirm: button: Cunfirma @@ -997,7 +999,6 @@ sc: relation: Relata redactions: edit: - description: Descritzione heading: Modìfica sa revisione title: Modìfica sa revisione index: @@ -1005,7 +1006,6 @@ sc: heading: Lista de revisiones title: Lista de revisiones new: - description: Descritzione heading: Inserta informatziones pro una revisione noa show: description: 'Descritzione:' diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 9e263ff00..e40d69491 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -99,11 +99,16 @@ scn: title: Oggettu body: Corpu recipient: Distinatariu + redaction: + description: Discrizzioni user: email: Posta elittrònica + new_email: 'Nnirizzu di posta elittrònica novu:' active: Attivu display_name: Nomu ammustratu description: Discrizzioni + home_lat: 'Latitùdini:' + home_lon: 'Luncitùdini:' languages: Lingui pass_crypt: Palora d'òrdini help: @@ -111,6 +116,8 @@ scn: tagstring: spartuti câ vìrgula user_block: needs_view: Havi a tràsiri l'utenti avanti chi stu bloccu veni livatu? + user: + new_email: (nun veni ammustratu mai pubblicamenti) editor: default: Pridifinutu (com'a ora %{name}) id: @@ -1774,15 +1781,10 @@ scn:

    Scrìviti p'accuminzari a dari lu tò cuntribbutu. Ti mannamu nu missaggiu di posta elittrònica pi cunfirmari lu tò cuntu.

    email address: 'Nnirizzu di posta elittrònica:' confirm email address: 'Cunferma lu nnirizzu di posta elittrònica:' - not_displayed_publicly_html: Nun veni ammustratu pubblicamenti (talìa la pulìtica - dâ risirvatizza) display name: 'Nomu ammustratu:' display name description: Lu tò nomu d'utenti comu veni ammustratu pubblicamenti. Appoi lu poi canciari ntê prifirenzi. external auth: 'Autinticazzioni di terzi parti:' - password: 'Palora d''òrdini:' - confirm password: 'Cunferma la palora d''òrdini:' use external auth: O puru, trasi pi menzu di na terza parti auth no password: Cu l'autinticazzioni di terzi parti nun ci voli na palora d'òrdini, pirò certi strummenti o sirventi nni ponnu addumannari una lu stissu. @@ -1886,8 +1888,6 @@ scn: title: Cancia lu cuntu my settings: Li mè mpustazzioni current email address: 'Nnirizzu di posta elittrònica attuali:' - new email address: 'Nnirizzu di posta elittrònica novu:' - email never displayed publicly: (nun veni ammustratu mai pubblicamenti) external auth: 'Autinticazzioni esterna:' openid: link: http://wiki.openstreetmap.org/wiki/IT:OpenID @@ -1919,13 +1919,9 @@ scn: agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu Pùbblicu. link text: chi voli diri? - profile description: 'Discrizzioni dû prufilu:' - preferred languages: 'Lingui prifiruti:' - preferred editor: 'Editor prifirutu:' image: 'Mmàggini:' gravatar: gravatar: Adòpira Gravatar - link text: chi voli diri? new image: Agghiunci na mmàggini keep image: Manteni la mmàggini attuali delete image: Leva la mmàggini attuali @@ -1933,8 +1929,6 @@ scn: image size hint: (sù megghiu li mmàggini quatrati 100x100 o chiù grossi) home location: 'Pusizzioni basi:' no home location: Ancora nun mpustasti la tò pusizzioni basi. - latitude: 'Latitùdini:' - longitude: 'Luncitùdini:' update home location on click: Aggiorna la pusizzioni basi quannu cliccu supra â carta? save changes button: Sarva li canciamenti @@ -2241,7 +2235,6 @@ scn: timeout: Tempu scadutu ntô cuntattari %{server} redactions: edit: - description: Discrizzioni heading: Cancia occultamentu title: Cancia occultamentu index: @@ -2249,7 +2242,6 @@ scn: heading: Lista di l'occultamenti title: Lista di l'occultamenti new: - description: Discrizzioni heading: Nziriri li nfurmazzioni di l'occultamentu novu title: Criazzioni dûn occultamentu novu show: diff --git a/config/locales/sco.yml b/config/locales/sco.yml index d7acb1072..8a60d9639 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -1131,6 +1131,5 @@ sco: centre_map: Centre cairt here redactions: edit: - description: Descreeption heading: Eedit redaction ... diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 9f649681e..7d791f7c0 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -121,13 +121,18 @@ sk: title: Predmet body: Text recipient: Príjemca + redaction: + description: Popis report: details: Prosím uveďte bližšie informácie o probléme (potrebné). user: email: E-mail + new_email: 'Nová e-mailová adresa:' active: Aktívny display_name: Zobrazované meno description: Popis + home_lat: 'Zem. šírka:' + home_lon: 'Zem. dĺžka:' languages: Jazyky pass_crypt: Heslo help: @@ -136,6 +141,8 @@ sk: user_block: needs_view: Potrebuje sa používateľ prihlásiť pred tým, než bude tento blok vymazaný? + user: + new_email: (nikde se verejne nezobrazuje) datetime: distance_in_words_ago: half_a_minute: pred pol minútou @@ -1734,15 +1741,10 @@ sk: čo najrýchlejšie. email address: 'Emailová adresa:' confirm email address: 'Potvrdiť emailovú adresu:' - not_displayed_publicly_html: Nezobrazuje sa nikde verejne (pozrite pravidlá ochrany osobných údajov) display name: 'Zobrazované meno:' display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom zmeniť v nastaveniach. external auth: 'Autentifikácia treťou stranou:' - password: 'Heslo:' - confirm password: 'Potvrdiť heslo:' use external auth: Prípadne použite na prihlásenie služby tretích strán continue: Zaregistrovať sa terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania! @@ -1842,8 +1844,6 @@ sk: title: Upraviť účet my settings: Moje nastavenia current email address: 'Aktuálna e-mailová adresa:' - new email address: 'Nová e-mailová adresa:' - email never displayed publicly: (nikde se verejne nezobrazuje) openid: link: http://wiki.openstreetmap.org/wiki/CS:OpenID link text: čo to znamená? @@ -1873,14 +1873,10 @@ sk: agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné dielo. link text: čo to znamená? - profile description: 'Popis profilu:' - preferred languages: 'Preferované jazyky:' - preferred editor: 'Preferovaný editor:' image: 'Obrázok:' gravatar: gravatar: Používať Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: čo to znamená? new image: 'Pridať obrázok:' keep image: Ponechať aktuálny obrázok delete image: Odstrániť aktuálny obrázok @@ -1888,8 +1884,6 @@ sk: image size hint: (najvhodnejšie sú štvorcové obrázky s veľkosťou najmenej 100×100) home location: 'Domovské miesto:' no home location: Nezadali ste svoje domovské miesto. - latitude: 'Zem. šírka:' - longitude: 'Zem. dĺžka:' update home location on click: Aktualizovať domovské miesto kliknutím na mapu? save changes button: Uložiť zmeny make edits public button: Zverejniť všetky moje úpravy @@ -2180,7 +2174,6 @@ sk: centre_map: Tu vycentrovať mapu redactions: edit: - description: Popis heading: Upraviť revíziu title: Upraviť revíziu index: @@ -2188,7 +2181,6 @@ sk: heading: Zoznam revízií title: Zoznam revízií new: - description: Popis heading: Zadajte informácie k novej revízii. title: Vytváranie nových revízií show: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index b7a59d860..25aad1184 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -117,14 +117,19 @@ sl: title: Zadeva body: Besedilo recipient: Prejemnik + redaction: + description: Opis report: category: Izberite razlog za poročilo details: Prosimo, opišite še več podrobnosti o težavi (polje je obvezno). user: email: Elektronski naslov + new_email: 'Nov e-poštni naslov:' active: Aktiven display_name: Prikazno ime description: Opis + home_lat: 'Zemljepisna širina:' + home_lon: 'Zemljepisna dolžina:' languages: Jeziki pass_crypt: Geslo pass_crypt_confirmation: Potrditev gesla @@ -133,6 +138,8 @@ sl: tagstring: uporabite vejice user_block: needs_view: Ali se mora uporabnik prijaviti preden bo blokada ukinjena. + user: + new_email: (nikoli javno objavljen) datetime: distance_in_words_ago: half_a_minute: pol minute nazaj @@ -193,8 +200,8 @@ sl: no_comment: (brez komentarja) part_of: Del download_xml: Prenesi XML - view_history: Poglej zgodovino - view_details: Poglej podrobnosti + view_history: Ogled zgodovine + view_details: Prikaz podrobnosti location: 'Lokacija:' changeset: title: 'Paket sprememb: %{id}' @@ -251,7 +258,7 @@ sl: changeset: Paket sprememb note: opomba timeout: - sorry: Oprostite, podatki za %{type} z ID-jem %{id} se predolgo prenašajo. + sorry: Pridobivanje podatkov za %{type} z ID-jem %{id} žal traja predolgo. type: node: vozlišče way: pot @@ -312,7 +319,7 @@ sl: changesets: changeset_paging_nav: showing_page: Stran %{page} - next: Naslednja » + next: Naprej » previous: « Prejšnja changeset: anonymous: Brezimen @@ -1645,10 +1652,10 @@ sl: make_public: made_public: Sled je postala javna offline_warning: - message: Sistem za nalaganje GPX-datotek trenutno ni na razpolago. + message: Sistem za nalaganje GPX-datotek trenutno ni na voljo. offline: heading: GPX-sistem trenutno ni dostopen. - message: Sistem za nalaganje GPX-datotek in GPX-sistem trenutno nista na razpolago. + message: Sistem za nalaganje GPX-datotek in GPX-sistem trenutno nista na voljo. georss: title: OpenStreetMap-sledi GPS description: @@ -1817,8 +1824,8 @@ sl: title: Prijavite se no_auto_account_create: Na žalost vam trenutno ne moremo samodejno ustvariti uporabniškega računa. - contact_webmaster_html: Prosimo, pišite webmastru - (v angleščini) in se dogovorite za ustvarjenje uporabniškega računa - potrudili + contact_webmaster_html: Prosimo, pišite skrbniku spletišča + (v angleščini) in se dogovorite za ustvaritev uporabniškega računa – potrudili se bomo za čimprejšnjo obravnavo vašega zahtevka. about: header: Brezplačen, ki ga je mogoče urejati @@ -1827,15 +1834,10 @@ sl:

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

    email address: 'E-poštni naslov:' confirm email address: 'Potrdite naslov e-pošte:' - not_displayed_publicly_html: Vaš naslov ne bo javno objavljen (za več informacij - glej politiko zasebnosti) display name: 'Prikazno ime:' display name description: Javno prikazano uporabniško ime. To lahko spremenite kasneje v nastavitvah. external auth: Overitev tretje osebe - password: 'Geslo:' - confirm password: 'Potrdite geslo:' use external auth: Lahko pa uporabite prijavo tretje osebe auth no password: Pri overitvi tretje osebe geslo ni zahtevano, vendar ga bodo nekatera dodatna orodja ali strežnik morda še vedno zahtevala. @@ -1943,8 +1945,6 @@ sl: title: Urejanje uporabniškega računa my settings: Moje nastavitve current email address: 'E-poštni naslov:' - new email address: 'Nov e-poštni naslov:' - email never displayed publicly: (nikoli javno objavljen) external auth: 'Zunanje preverjanje pristnosti:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -1960,13 +1960,13 @@ sl: public editing note: heading: Javno urejanje html: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslati - sporočil oz. videti vaše lokacije. Da prikažete, kar ste urejali in ljudem + sporočil ali videti vaše lokacije. Da prikažete, kar ste urejali in ljudem omogočite, da vas kontaktirajo prek spletne strani, kliknite spodnji gumb. Od prehoda na API 0.6 lahko zemljevid urejajo le javni uporabniki. ( Ugotovite, - zakaj). + zakaj). contributor terms: heading: 'Pogoji sodelovanja:' agreed: Sprejeli ste nove pogoje sodelovanja. @@ -1976,14 +1976,10 @@ sl: agreed_with_pd: Prav tako ste izjavili, da so vaša urejanja v javni lasti. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Kaj je to? - profile description: 'Opis uporabnika:' - preferred languages: 'Prednostni jeziki:' - preferred editor: 'Izbran urejevalnik:' image: 'Slika:' gravatar: gravatar: Uporabi Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: Kaj je to? disabled: Gravatar je onemogočen. new image: Dodaj sliko keep image: Obdrži trenutno sliko @@ -1992,8 +1988,6 @@ sl: image size hint: (najbolje delujejo kvadratne slike vsaj 100x100 točk) home location: 'Domača lokacija:' no home location: Niste nastavili vaše domače lokacije. - latitude: 'Zemljepisna širina:' - longitude: 'Zemljepisna dolžina:' update home location on click: Posodobi domačo lokacijo ob kliku na zemljevid? save changes button: Shrani spremembe make edits public button: Naj bodo vsi moji prispevki javni @@ -2103,7 +2097,7 @@ sl: title: Urejanje blokade za %{name} heading_html: Urejanje blokade za %{name} period: Kako dolgo bo uporabnik blokiran za uporabo APIja. - show: Poglej to blokado + show: Prikaži blokado back: Prikaži vse blokade filter: block_expired: Blokada je že potekla in je ni mogoče urejati. @@ -2172,7 +2166,7 @@ sl: status: Stanje revoker_name: Preklical showing_page: Stran %{page} - next: Naslednja » + next: Naprej » previous: « Prejšnja notes: index: @@ -2210,7 +2204,7 @@ sl: key: title: Ključ zemljevida tooltip: Ključ zemljevida - tooltip_disabled: Ključ zemljevida ni na voljo za to plast + tooltip_disabled: Ključ zemljevida za to plast ni na voljo map: zoom: in: Povečaj @@ -2375,7 +2369,6 @@ sl: centre_map: Premakni na sredino redactions: edit: - description: Opis heading: Uredi redakcijo title: Uredi redakcijo index: @@ -2383,7 +2376,6 @@ sl: heading: Seznam redakcij title: Seznam redakcij new: - description: Opis heading: Vnesite informacije za novo redakcijo title: Ustvarite novo redakcijo show: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 9566dde51..9948ba513 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -103,14 +103,19 @@ sq: recipient: Marrësi user: email: Emaili + new_email: 'Adresa e re e emailit:' active: Aktiv display_name: Emër i dukshëm description: Përshkrimi + home_lat: 'Latituda:' + home_lon: 'Longituda:' languages: Gjuhët pass_crypt: Fjalëkalimi help: trace: tagstring: ndarë me presje + user: + new_email: (asnjëherë nuk është publikuar) printable_name: with_version: '%{id}, v%{version}' editor: @@ -1367,13 +1372,8 @@ sq: header: E lirë dhe e redaktueshme email address: 'Adresa e emailit:' confirm email address: 'Konfirmo adresën e emailit:' - not_displayed_publicly_html: Nuk shihet publikisht (shih privacy policy) display name: 'Emër i dukshëm:' display name description: Emri yt publik. Ti mund ta ndryshosh më vonë në preferenca. - password: 'Fjalëkalimi:' - confirm password: 'Konfirmo fjalëkalimin:' continue: Vazhdo terms accepted: Faleminderit për pranimin kushteve të reja për kontribues! terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined @@ -1460,8 +1460,6 @@ sq: title: Redakto llogarinë my settings: Preferencat e mia current email address: 'Adresa e tanishme e emailit:' - new email address: 'Adresa e re e emailit:' - email never displayed publicly: (asnjëherë nuk është publikuar) openid: link text: çfarë është kjo? public editing: @@ -1484,13 +1482,9 @@ sq: pronësi publike. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Çka është kjo? - profile description: 'Përshkrimi i profilit:' - preferred languages: 'Gjuhët e parapëlqyera:' - preferred editor: 'Redaktori i parapëlqyer:' image: 'Imazhi:' gravatar: gravatar: Përdor Gravatar - link text: çfarë është kjo? new image: Shto një imazh keep image: Mbaj imazhin e tanishëm delete image: Heq imazhin e tanishëm @@ -1498,8 +1492,6 @@ sq: image size hint: (imazhet katror të paktën 100x100 duken më mirë) home location: 'Vendndodhja e shtëpisë:' no home location: Nuk ke shëuar vendndodhjen e shtëpisë tënde. - latitude: 'Latituda:' - longitude: 'Longituda:' update home location on click: Përditëso vendndodhjen e shtëpisë kur unë klikoj në hartë! save changes button: Ruaj ndryshimet diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 2dd9951fe..b4312a17a 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -100,11 +100,16 @@ sr-Latn: title: Naslov body: Tekst recipient: Primalac + redaction: + description: Opis user: email: Imejl + new_email: 'Nova imejl adresa:' active: Aktivan display_name: Ime prikaza description: Opis + home_lat: 'Geografska širina:' + home_lon: 'Geografska dužina:' languages: Jezici pass_crypt: Lozinka help: @@ -112,6 +117,8 @@ sr-Latn: tagstring: razdvojeno zapetama user_block: needs_view: Da li korisnik mora da se prijavi da bi blokada bila uklonjena? + user: + new_email: (nikada se ne prikazuje javno) printable_name: with_version: '%{id}, ver. %{version}' editor: @@ -1273,14 +1280,9 @@ sr-Latn: za otvaranje novog naloga. Obradićemo zahtev što je pre moguće. email address: 'E-adresa:' confirm email address: 'Potvrdite imejl adresu:' - not_displayed_publicly_html: Ne prikazuje se javno (pogledajte politiku - privatnosti) display name: 'Ime prikaza:' display name description: Javno prikazano korisničko ime. Kasnije ga možete promeniti u postavkama. - password: 'Lozinka:' - confirm password: 'Potvrdite lozinku:' continue: Nastavi terms accepted: Hvala vam što prihvatate nove uslove uređivanja. terms declined: Žao nam je što ste odlučili da ne prihvatite nove uslove uređivanja. @@ -1376,8 +1378,6 @@ sr-Latn: title: Uredi nalog my settings: Postavke current email address: 'Trenutna e-adresa:' - new email address: 'Nova imejl adresa:' - email never displayed publicly: (nikada se ne prikazuje javno) openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: šta je ovo? @@ -1407,9 +1407,6 @@ sr-Latn: agreed_with_pd: Takođe se slažete da vaše izmene budu u javnom vlasništvu. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec link text: šta je ovo? - profile description: 'Opis profila:' - preferred languages: 'Željeni jezici:' - preferred editor: 'Željeni uređivač:' image: 'Slika:' new image: Dodaj sliku keep image: Zadrži trenutnu sliku @@ -1418,8 +1415,6 @@ sr-Latn: image size hint: (kvadratne slike od barem 100×100 piksela rade najbolje) home location: 'Mesto stanovanja:' no home location: Niste uneli mesto stanovanja. - latitude: 'Geografska širina:' - longitude: 'Geografska dužina:' update home location on click: Ažurirati mesto stanovanja kada kliknem na mapu? save changes button: Sačuvaj izmene make edits public button: Neka sve moje izmene budu javne @@ -1592,7 +1587,6 @@ sr-Latn: edit_disabled_tooltip: Uvećajte prikaz da biste uredili mapu redactions: edit: - description: Opis heading: Uredi redakciju title: Uređivanje redakcije index: @@ -1600,7 +1594,6 @@ sr-Latn: heading: Spisak redakcija title: Spisak redakcija new: - description: Opis heading: Unesite podatke za novu redakciju title: Pravljenje nove redakcije show: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index f017237c6..0dc5524ed 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -127,11 +127,16 @@ sr: title: Наслов body: Текст recipient: Прималац + redaction: + description: Опис user: email: Имејл + new_email: 'Нова имејл адреса:' active: Активан display_name: Име за приказ description: Опис + home_lat: 'Географска ширина:' + home_lon: 'Географска дужина:' languages: Језици pass_crypt: Лозинка help: @@ -139,6 +144,8 @@ sr: tagstring: раздвојено запетама user_block: needs_view: Да ли корисник мора да се пријави да би блокада била уклоњена? + user: + new_email: (никада се не приказује јавно) datetime: distance_in_words_ago: half_a_minute: пре пола минута @@ -1976,16 +1983,10 @@ sr:

    Пријавите се да бисте почели да доприносите. Послаћемо Вам имејл за потврду Вашег налога.

    email address: 'Имејл адреса:' confirm email address: 'Потврдите имејл адресу:' - not_displayed_publicly_html: Ваша адреса се не приказује јавно, погледајте политику приватности за више - информација display name: 'Име приказа:' display name description: Јавно приказано корисничко име. Касније га можете променити у поставкама. external auth: 'Аутентификација треће стране:' - password: 'Лозинка:' - confirm password: 'Потврдите лозинку:' use external auth: Алтернативно, користите трећу страну за пријаву auth no password: Са аутентификацијом треће стране, лозинка није потребна — али неки додатни алати или сервер можда је ипак буду захтевали. @@ -2091,8 +2092,6 @@ sr: title: Уреди налог my settings: Поставке current email address: 'Тренутна имејл адреса:' - new email address: 'Нова имејл адреса:' - email never displayed publicly: (никада се не приказује јавно) external auth: 'Спољна аутентификација:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2123,14 +2122,10 @@ sr: agreed_with_pd: Такође се слажете да ваше измене буду у јавном власништву. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=sr-ec link text: шта је ово? - profile description: 'Опис профила:' - preferred languages: 'Жељени језици:' - preferred editor: 'Жељени уређивач:' image: 'Слика:' gravatar: gravatar: Користи Граватар link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=sr - link text: шта је ово? disabled: Граватар је онемогућен. enabled: Приказ Вашег Граватара је омогућен. new image: Додај слику @@ -2140,8 +2135,6 @@ sr: image size hint: (квадратне слике од барем 100×100 пиксела раде најбоље) home location: 'Место становања:' no home location: Нисте унели место становања. - latitude: 'Географска ширина:' - longitude: 'Географска дужина:' update home location on click: Ажурирати место становања када кликнем на мапу? save changes button: Сачувај промене make edits public button: Нека све моје измене буду јавне @@ -2492,7 +2485,6 @@ sr: centre_map: Центрирај мапу овде redactions: edit: - description: Опис heading: Уреди редакцију title: Уређивање редакције index: @@ -2500,7 +2492,6 @@ sr: heading: Списак редакција title: Списак редакција new: - description: Опис heading: Унесите податке за нову редакцију title: Прављење нове редакције show: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index fba77193e..2fac247e4 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -161,15 +161,23 @@ sv: title: Ämne body: Brödtext recipient: Mottagare + redaction: + title: Titel + description: Beskrivning report: category: Välj en anledning för din rapport details: Ange fler detaljer om problemet (nödvändigt). user: email: E-post + email_confirmation: E-postbekräftelse + new_email: Ny e-postadress active: Aktiv display_name: Visa namn - description: Beskrivning - languages: Språk + description: Profilbeskrivning + home_lat: Breddgrad (latitud) + home_lon: Längdgrad (longitud) + languages: Föredragna språk + preferred_editor: Önskat redigeringsprogram pass_crypt: Lösenord pass_crypt_confirmation: Bekräfta lösenord help: @@ -177,6 +185,8 @@ sv: tagstring: kommaseparerad user_block: needs_view: Behöver användaren logga in innan blockeringen upphör? + user: + new_email: (visas aldrig offentligt) datetime: distance_in_words_ago: about_x_hours: @@ -2288,15 +2298,10 @@ sv:

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

    email address: 'E-postadress:' confirm email address: 'Bekräfta e-postadress:' - not_displayed_publicly_html: Din adress visas inte offentligt, se vår integritetspolicy - för mer information display name: 'Visat namn:' display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna. external auth: 'Tredjepartsautentisering:' - password: 'Lösenord:' - confirm password: 'Bekräfta lösenord:' use external auth: Alternativt kan du använda en tredje part för att logga in auth no password: Med autentisering av tredje part krävs inte lösenord, men en del extra verktyg eller server kan fortfarande behöva det. @@ -2416,15 +2421,13 @@ sv: account: title: Redigera konto my settings: Mina inställningar - current email address: 'Nuvarande e-postadress:' - new email address: 'Ny e-postadress:' - email never displayed publicly: (visas aldrig offentligt) - external auth: 'Extern autentisering:' + current email address: Nuvarande e-postadress + external auth: Extern autentisering openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: vad är detta? public editing: - heading: 'Offentlig redigering:' + heading: Offentlig redigering enabled: Aktiverat, du är inte anonym och kan redigera data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: vad är detta? @@ -2442,7 +2445,7 @@ sv: du blir publik användare.
  • Denna handling kan inte Ã¥ngras och alla nya användare är numera publika som standard.
    • contributor terms: - heading: 'Bidragsgivarvillkor:' + heading: Bidragsgivarvillkor agreed: Du har godkänt de nya bidragsgivarvillkoren. not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren. review link text: Följ denna länk när du har tid att granska och godkänna @@ -2451,14 +2454,11 @@ sv: är inom Public Domain. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: vad är detta? - profile description: 'Profilbeskrivning:' - preferred languages: 'Föredraget sprÃ¥k:' - preferred editor: 'Önskat redigeringsprogram:' - image: 'Bild:' + image: Bild gravatar: gravatar: Använd Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: vad är detta? + what_is_gravatar: Vad är Gravatar? disabled: Gravatar har inaktiverats. enabled: Din Gravatar har aktiverats. new image: Lägg till en bild @@ -2466,10 +2466,8 @@ sv: delete image: Ta bort nuvarande bild replace image: Ersätt nuvarande bild image size hint: (kvadratiska bilder pÃ¥ minst 100x100 fungerar bäst) - home location: 'Hemposition:' + home location: Hemposition no home location: Du har inte angivit nÃ¥gon hemposition. - latitude: 'Breddgrad (latitud):' - longitude: 'Längdgrad (longitud):' update home location on click: Uppdatera hemplatsen när jag klickar pÃ¥ kartan? save changes button: Spara ändringar make edits public button: Gör alla mina redigeringar publika @@ -2883,7 +2881,6 @@ sv: centre_map: Centrera kartan här redactions: edit: - description: Beskrivning heading: Redigera redaktering title: Redigera redaktering index: @@ -2891,7 +2888,6 @@ sv: heading: Lista över redakteringar title: Lista över redakteringar new: - description: Beskrivning heading: Ange information för ny redaktering title: Skapa ny redaktering show: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index bfc47c2a4..b44429bf7 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -97,6 +97,7 @@ ta: recipient: பெறுனர் user: email: மின்னஞ்சல் + new_email: 'புதிய மின்னஞ்சல் முகவரி:' active: செயல்பாட்டிலுள்ளது display_name: காட்டவிரும்பும் பெயர் description: விளக்கம் @@ -698,8 +699,6 @@ ta: title: கணக்கை உருவாக்கு email address: 'மின்னஞ்சல் முகவரி:' confirm email address: 'மின்னஞ்சல் முகவரியை உறுதி செய்யவும்:' - password: 'கடவுச்சொல்:' - confirm password: 'கடவுச்சொல்லை உறுதிசெய்:' terms: decline: நிராகரி legale_names: @@ -758,14 +757,10 @@ ta: title: கணக்கை திருத்து my settings: என் அமைப்புகள் current email address: 'தற்பொழுதுள்ள மின்னஞ்சல் முகவரி:' - new email address: 'புதிய மின்னஞ்சல் முகவரி:' openid: link text: இது என்ன? contributor terms: link text: இது என்ன? - profile description: 'சுயகுறிப்பு விளக்கம்:' - preferred languages: 'விருப்பமான மொழிகள்:' - preferred editor: 'விருப்பப்பட்ட திருத்துனர்:' image: 'படம்:' new image: ஒரு படத்தை சேர் keep image: நடப்பு படத்தை வைத்திரு diff --git a/config/locales/te.yml b/config/locales/te.yml index 798c4a7c4..5bf5eaa57 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -75,16 +75,23 @@ te: title: విషయం body: వివరణ recipient: అందుకునేవారు + redaction: + description: వివరణ user: email: ఈ-మెయిల్ + new_email: 'కొత్త ఈమెయిల్ చిరునామా:' active: క్రియాశీలం display_name: కనిపించే పేరు description: వివరణ + home_lat: 'అక్షాంశం:' + home_lon: 'రేఖాంశం:' languages: భాషలు pass_crypt: సంకేతపదం help: trace: tagstring: కామాలతో వేరుపరచినవి + user: + new_email: (బహిరంగంగా ఎన్నటికీ చూపించబడదు) editor: default: అప్రమేయం (ప్రస్తుతం %{name}) api: @@ -706,13 +713,7 @@ te: title: నమోదవ్వండి email address: 'ఈమెయిలు చిరునామా:' confirm email address: 'ఈమెయిలు చిరునామాని నిర్ధారించండి:' - not_displayed_publicly_html: మీ చిరునామా బహిరంగంగా చూపబడదు, మరింత సమాచారం కోసం - మా గోప్యతా విధానాన్ని - చూడండి display name: 'చూపించే పేరు:' - password: 'సంకేతపదం:' - confirm password: 'సంకేతపదాన్ని నిర్ధారించండి:' continue: నమోదవ్వండి terms: heading: నియమాలు @@ -767,8 +768,6 @@ te: title: ఖాతా మార్పు my settings: నా అమరికలు current email address: 'ప్రస్తుత ఈ-మెయిలు చిరునామా:' - new email address: 'కొత్త ఈమెయిల్ చిరునామా:' - email never displayed publicly: (బహిరంగంగా ఎన్నటికీ చూపించబడదు) openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: ఇది ఏమిటి? @@ -778,20 +777,15 @@ te: disabled link text: నేను ఎందుకు మార్చలేను? contributor terms: link text: ఇది ఏమిటి? - profile description: 'ప్రొఫైలు వివరణ:' - preferred languages: 'ప్రాధాన్యతా భాషలు:' image: 'బొమ్మ:' gravatar: gravatar: గ్రావతార్‌ని వాడు - link text: ఇది ఏమిటి? keep image: ప్రస్తుత చిత్రాన్ని ఉంచు delete image: ప్రస్తుత చిత్రాన్ని తొలగించు replace image: ప్రస్తుత చిత్రాన్ని మార్చు image size hint: (కనీసం 100x100 ఉండే చదరపు చిత్రం అయితే మేలు) home location: 'నివాస ప్రాంతం:' no home location: మీరు మీ నివాస ప్రాంతాన్ని పేర్కొనలేదు. - latitude: 'అక్షాంశం:' - longitude: 'రేఖాంశం:' save changes button: మార్పులను భద్రపరచు make edits public button: నా దిద్దుబాట్లన్నింటినీ బహిరంగం చేయి flash update success: వాడుకరి సమాచారం విజయవంతంగా తాజాకరించబడింది. @@ -904,10 +898,6 @@ te: show_address: చిరునామా చూపించు centre_map: ఈచోటును పటానికి కేంద్రం చేయి redactions: - edit: - description: వివరణ - new: - description: వివరణ show: description: 'వివరణ:' ... diff --git a/config/locales/th.yml b/config/locales/th.yml index 732e98d23..5ce47b2db 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -125,14 +125,19 @@ th: title: หัวเรื่อง body: เนื้อหา recipient: ผู้รับ + redaction: + description: คำอธิบาย report: category: เลือกเหตุผลของปัญหาที่ท่านแจ้ง details: โปรดให้คำอธิบายเพิ่มเติมเกี่ยวกับปัญหา (จำเป็นต้องใส่) user: email: อีเมล์ + new_email: 'ที่อยู่อีเมลใหม่:' active: เปิดใช้ display_name: ชื่อที่ใช้แสดง description: คำอธิบาย + home_lat: 'ละติจูด:' + home_lon: 'ลองจิจูด:' languages: ภาษา pass_crypt: รหัสผ่าน pass_crypt_confirmation: ยืนยันรหัสผ่าน @@ -141,6 +146,8 @@ th: tagstring: คั่นด้วยจุลภาค user_block: needs_view: ต้องการให้ผู้ใช้คนนี้เข้าระบบก่อนเพิกถอนการระงับหรือไม่? + user: + new_email: (จะไม่แสดงต่อสาธารณะ) datetime: distance_in_words_ago: about_x_hours: @@ -1964,14 +1971,9 @@ th: header: เสรีและแก้ไขได้ email address: 'ที่อยู่อีเมล:' confirm email address: 'ยืนยันที่อยู่อีเมล:' - not_displayed_publicly_html: ที่อยู่ของท่านจะไม่แสดงให้บุคคลภายนอกเห็น โปรดดู - นโบายความเป็นส่วนบุคคล ถ้าต้องการรายละเอียดเพิ่มเติม display name: 'ชื่อที่ใช้แสดง:' display name description: ชื่อที่แสดงต่อสาธารณะ ท่านสามารถเปลี่ยนในภายหลังได้ในหน้าการตั้งค่า external auth: 'บัญชีผู้ใช้จากเว็บอื่น:' - password: 'รหัสผ่าน:' - confirm password: 'ยืนยันรหัสผ่าน:' use external auth: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้ auth no password: ถ้ามีบัญชีผู้ใช้จากเว็บอื่น โดยปกติไม่จำเป็นต้องมีรหัสผ่าน แต่ถ้าเข้าใช้งานเครื่องมือบางตัวหรือเซิร์ฟเวอร์ก็ยังจำเป็นต้องมีรหัสผ่านอยู่ @@ -2054,8 +2056,6 @@ th: title: แก้ไขบัญชี my settings: การตั้งค่าของฉัน current email address: 'ที่อยู่อีเมลปัจจุบัน:' - new email address: 'ที่อยู่อีเมลใหม่:' - email never displayed publicly: (จะไม่แสดงต่อสาธารณะ) external auth: 'เชื่อมโยงตัวตนจากบริการอื่น:' openid: link text: นี้คืออะไร? @@ -2068,13 +2068,9 @@ th: heading: แก้ไขโดยเปิดเผย contributor terms: link text: นี้คืออะไร? - profile description: 'คำอธิบายหน้าประวัติส่วนตัว:' - preferred languages: 'ภาษาที่ต้องการ:' - preferred editor: 'ตัวแก้ไขที่ต้องการใช้:' image: 'รูปภาพ:' gravatar: gravatar: ใช้ Gravatar - link text: นี้คืออะไร? disabled: Gravatar ถูกปิดใช้ enabled: การแสดง Gravatar ของท่านถูกเปิดใช้ new image: เพิ่มรูปภาพ @@ -2084,8 +2080,6 @@ th: image size hint: (ภาพขนาดสี่เหลี่ยม 100x100 จะดีที่สุด) home location: 'ที่อยู่บ้าน:' no home location: ท่านยังไม่ได้ระบุที่อยู่บ้าน - latitude: 'ละติจูด:' - longitude: 'ลองจิจูด:' update home location on click: แก้ไขที่อยู่บ้านถ้าคลิกแผนที่หรือไม่? save changes button: บันทึกการเปลี่ยนแปลง make edits public button: ทำให้การแก้ไขของข้าพเจ้าเป็นสาธารณะเห็นได้ทั่วไป @@ -2385,7 +2379,6 @@ th: centre_map: วางแผนที่ตรงกลางที่นี่ redactions: edit: - description: คำอธิบาย heading: แก้ไขการตรวจทาน title: แก้ไขการตรวจทาน index: @@ -2393,7 +2386,6 @@ th: heading: รายการการตรวจทาน title: รายการการตรวจทาน new: - description: คำอธิบาย heading: กรอกรายละเอียดการตรวจทานใหม่ title: สร้างการตรวจทานใหม่ show: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index e0c87000a..b384e615d 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -108,11 +108,16 @@ tl: title: Paksa body: Katawan recipient: Tumatanggap + redaction: + description: Paglalarawan user: email: Sulatroniko + new_email: 'Bagong Tirahan ng E-liham:' active: Masigla display_name: Ipakita ang Pangalan description: Paglalarawan + home_lat: 'Latitud:' + home_lon: 'Longhitud:' languages: Mga wika pass_crypt: Password help: @@ -121,6 +126,8 @@ tl: user_block: needs_view: Kailangan bang lumagda muna ng tagagamit bago mahawi ang hadlang na ito? + user: + new_email: (hindi kailanman ipinapakita sa madla) printable_name: with_version: '%{id}, v%{version}' editor: @@ -1537,15 +1544,9 @@ tl: namin at harapin ang kahilingan sa lalong madaling panahon. email address: 'Tirahan ng E-liham:' confirm email address: 'Patotohanan ang Tirahan ng E-liham:' - not_displayed_publicly_html: Ang iyong tirahan ng e-liham ay hindi ipinapakita - sa madla, tingnan ang ating patakaran - sa pagsasarilinan para sa karagdagang impormasyon display name: 'Pangalang Ipinapakita:' display name description: Ang iyong pangalan ng tagagamit na ipinapakita sa madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan. - password: 'Password:' - confirm password: 'Tiyakin ang Hudyat:' continue: Magpatala terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag! terms declined: Ikinalulungkot namin na nagpasya kang huwag tanggapin ang bagong @@ -1644,8 +1645,6 @@ tl: title: Baguhin ang akawnt my settings: Mga pagtatakda ko current email address: 'Pangkasalukuyang Tirahan ng E-liham:' - new email address: 'Bagong Tirahan ng E-liham:' - email never displayed publicly: (hindi kailanman ipinapakita sa madla) external auth: 'Panlabas na Pagpapatunay:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID @@ -1680,13 +1679,9 @@ tl: bilang nasa loob ng Nasasakupan ng Madla. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: ano ba ito? - profile description: 'Paglalarawan ng Balangkas:' - preferred languages: 'Nais na mga Wika:' - preferred editor: 'Nais na Patnugot:' image: 'Larawan:' gravatar: gravatar: Gamitin ang Gravatar - link text: ano ba ito? disabled: Hindi na pinagana ang Gravatar. enabled: Pinagana ang pagpapakita ng iyong Gravatar. new image: Magdagdag ng isang larawan @@ -1697,8 +1692,6 @@ tl: sa 100x100) home location: 'Kinalalagyan ng Tahanan:' no home location: Hindi mo naipasok ang kinalalagyan ng tahanan mo. - latitude: 'Latitud:' - longitude: 'Longhitud:' update home location on click: Isapanahon ang kinalalagyan ng tahanan kapag pinindot ko ang ibabaw ng mapa? save changes button: Sagipin ang mga Pagbabago @@ -1966,7 +1959,6 @@ tl: centre_map: Igitna ang mapa dito redactions: edit: - description: Paglalarawan heading: Baguhin ang redaksiyon title: Baguhin ang redaksiyon index: @@ -1974,7 +1966,6 @@ tl: heading: Listahan ng mga redaksiyon title: Listahan ng mga redaksiyon new: - description: Paglalarawan heading: Ipasok ang kabatiran para sa bagong paghahanda ng isinulat upang mailathala title: Lumilikha ng bagong redaksiyon show: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e0a14f12d..93a968d0e 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -30,6 +30,7 @@ # Author: Rapsar # Author: Ruila # Author: Sadrettin +# Author: SaldırganSincap # Author: SalihB # Author: Sayginer # Author: Sezgin Ä°biş @@ -161,15 +162,25 @@ tr: title: Konu body: Gövde recipient: Alıcı + redaction: + title: Başlık + description: Açıklama report: category: Raporunuz için bir neden seçin details: Lütfen problemle ilgili daha fazla bilgi veriniz (zorunlu). user: + auth_provider: Kimlik Doğrulama Sağlayıcısı + auth_uid: Kimlik Doğrulama UIDsi email: E-posta + email_confirmation: E-posta Onayı + new_email: Yeni E-posta Adresi active: Etkin display_name: Görünen Ad - description: Açıklama - languages: Diller + description: Profil Açıklaması + home_lat: Enlem + home_lon: Boylam + languages: Tercih Edilen Diller + preferred_editor: Tercih Edilen Düzenleyici pass_crypt: Parola pass_crypt_confirmation: Parolayı Onayla help: @@ -178,6 +189,8 @@ tr: user_block: needs_view: Engel kaldırılmadan önce kullanıcının giriş yapması gerekiyor mu? + user: + new_email: (hiçbir zaman görüntülenmez) datetime: distance_in_words_ago: about_x_hours: @@ -2448,16 +2461,10 @@ tr:

    Katkıda bulunmaya başlamak için kaydolun. Hesabınızın onaylanması için size bir e-posta göndereceğiz.

    email address: 'E-posta Adresi:' confirm email address: E-posta Adresini Onayla - not_displayed_publicly_html: Adresiniz herkese açık olarak gösterilmiyor, daha - fazla bilgi için gizlilik - politikamıza bakınız. display name: 'Görünen Ad:' display name description: Herkes tarafından görünen ad. Bu adı istediği zaman 'tercihlerim' bölümünde değiştirebilirsin. external auth: 'Üçüncü Taraf Kimlik Doğrulaması:' - password: 'Parola:' - confirm password: 'Parolayı Onayla:' use external auth: 'Alternatif olarak, bir üçüncü parti uygulaması kullanarak oturum açın:' auth no password: Üçüncü taraf kimlik doğrulamasında bir parola gerekli değildir, @@ -2576,15 +2583,13 @@ tr: account: title: Hesabı düzenle my settings: Ayarlarım - current email address: 'Geçerli E-posta Adresi:' - new email address: 'Yeni E-posta Adresi:' - email never displayed publicly: (hiçbir zaman görüntülenmez) - external auth: 'Harici Kimlik Doğrulama:' + current email address: Geçerli E-posta Adresi + external auth: Harici Kimlik Doğrulama openid: link: https://wiki.openstreetmap.org/wiki/Tr:OpenID link text: bu nedir? public editing: - heading: 'Herkese açık düzenleme modu:' + heading: Herkese açık düzenleme modu enabled: Etkin. Anonim değil ve verileri düzenleyebilir. enabled link: https://wiki.openstreetmap.org/wiki/Tr:Anonymous_edits enabled link text: bu nedir? @@ -2602,7 +2607,7 @@ tr: işlem tersine çevrilemez ve tüm yeni kullanıcılar artık varsayılan olarak herkese açık olarak gösterilmektedir. contributor terms: - heading: 'Katılımcı Şartları:' + heading: Katılımcı Şartları agreed: Yeni katılımcı şartlarını kabul ettin. not yet agreed: Yeni katılımcı şartları kabul etmedin. review link text: Yeni Katkıda Bulunma Şartlarını incelemek ve kabul etmek @@ -2610,14 +2615,11 @@ tr: agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin. link: https://wiki.openstreetmap.org/wiki/Tr:Open_Database_License/Contributor_Terms link text: bu nedir? - profile description: 'Tanıtım:' - preferred languages: 'Tercih Edilen Diller:' - preferred editor: 'Tercih edilen harita düzenleyici:' - image: 'Resim:' + image: Resim gravatar: gravatar: Gravatar kullanın link: https://wiki.openstreetmap.org/wiki/Tr:Gravatar - link text: bu nedir? + what_is_gravatar: Gravatar nedir? disabled: Gravatar devre dışı bırakıldı. enabled: Gravatarınızın görüntüsü etkinleştirildi. new image: Resim ekle @@ -2625,10 +2627,8 @@ tr: delete image: Geçerli resim kaldır replace image: Geçerli resmi değiştir image size hint: (100x100 olan kare resimler daha iyi görünür) - home location: 'Konum:' + home location: Ev Konumu no home location: Konumunu girmedin. - latitude: 'Enlem:' - longitude: 'Boylam:' update home location on click: Haritada tıkladığımda konumum güncelleştirilsin mi? save changes button: Değişiklikleri Kaydet @@ -3044,7 +3044,6 @@ tr: centre_map: Haritayı buraya ortala redactions: edit: - description: Açıklama heading: Redaksiyonu düzenle title: Redaksiyonu düzenle index: @@ -3052,7 +3051,6 @@ tr: heading: Redaksiyonların listesi title: Redaksiyonların listesi new: - description: Açıklama heading: Yeni redaksiyon için bilgi giriniz title: Yeni redaksiyon oluşturma show: diff --git a/config/locales/tt.yml b/config/locales/tt.yml index e2b41d819..32068a1f2 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -79,6 +79,8 @@ tt: email: Электрон почтасы active: Актив description: Тасвир + home_lat: 'Киңлек:' + home_lon: 'Озынлык:' languages: Телләр pass_crypt: Серсүз help: @@ -692,7 +694,6 @@ tt: email address: 'Электрон почта адресы:' new: email address: 'Электрон почта адресы:' - password: 'Серсүз:' terms: continue: Дәвам итү decline: Кире кагу @@ -721,8 +722,6 @@ tt: link text: бу нәрсә? image: 'Сурәт:' new image: Сурәтне өстәү - latitude: 'Киңлек:' - longitude: 'Озынлык:' save changes button: Үзгәрешләрне саклау confirm: button: Раслау @@ -820,8 +819,6 @@ tt: query: relation: Мөнәсәбәт redactions: - edit: - description: Тасвирлама show: description: 'Тасвирлама:' user: 'Төзүче:' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 66265685e..daf54657f 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -155,23 +155,46 @@ uk: title: Тема body: Текст recipient: Одержувач + redaction: + title: Заголовок + description: Опис report: category: 'Оберіть причину вашої скарги:' details: Будь ласка, надайте більше подробиць (обов'язково). user: + auth_provider: Автентифікатор + auth_uid: Ідентифікатор автентифікації email: Ел. пошта + email_confirmation: Підтвердження адреси + new_email: Нова адреса електронної пошти active: Активний display_name: 'Прізвисько:' description: Опис - languages: Мови + home_lat: Широта + home_lon: Довгота + languages: Типові мови + preferred_editor: Типовий редактор pass_crypt: Пароль pass_crypt_confirmation: Підтвердьте пароль help: trace: tagstring: через кому user_block: + reason: Наведіть пояснення, чому учасника було заблоковано. Будь ласка, будьте + толерантні та дійте розумно, надаючи як можна більше інформації про причини + блокування. Пам’ятайте, що повідомлення буде доступне всім. Не всі учасники + розуміють жаргон спільноти, тому користуйтесь для пояснення простою мовою. needs_view: Дозволити користувачу входити в систему, перш, ніж блокування буде знято? + user: + email_confirmation: Ваша адреса не є загальнодоступною і не показується іншим, + ознайомтесь з правилами захисту персональних даних для отримання докладної + інформації. + new_email: |2- + + (ніколи не показується загальнодоступно) datetime: distance_in_words_ago: about_x_hours: @@ -336,6 +359,7 @@ uk: entry_html: Зв’язок %{relation_name} entry_role_html: Зв’язок %{relation_name} (як %{relation_role}) not_found: + title: Не знайдено sorry: На жаль, об’єкт „%{type}“ № %{id} не знайдено. type: node: точка @@ -344,6 +368,7 @@ uk: changeset: набір змін note: примітка timeout: + title: Час вичерпано sorry: На жаль, %{type} з ідентифікатором %{id}, має занадто багато даних, щоб їх отримати. type: @@ -476,7 +501,8 @@ uk: body: На жаль, запис чи коментар з id %{id} не знайдені. Перевірте правильність введення адреси. Можливо, посилання, за яким ви перейшли, хибне. diary_entry: - posted_by_html: 'Додано користувачем %{link_user} %{created}, мова: %{language_link}' + posted_by_html: 'Опубліковано учасником %{link_user} %{created}, мова: %{language_link}' + updated_at_html: В останнє оновлено %{updated}. comment_link: Коментувати reply_link: Надіслати повідомлення автору comment_count: @@ -1296,9 +1322,12 @@ uk: footer: Ви можете також прочитати коментар — %{readurl}, залишити свій — %{commenturl} або відповісти — %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Привіт, %{to_user}, header: '%{from_user} надіслав вам повідомлення через OpenStreetMap з темою %{subject}:' + header_html: '%{from_user} надіслав повідомлення через OpenStreetMap з темою + %{subject}:' footer_html: Ви також можете прочитати повідомлення в %{readurl} і ви можете відповісти на %{replyurl} friendship_notification: @@ -1851,7 +1880,7 @@ uk: bicycle_parking: Велопарковка toilets: Туалети richtext_area: - edit: Правити + edit: Редагувати preview: Попередній перегляд markdown_help: title_html: Оброблено kramdown @@ -1967,12 +1996,12 @@ uk: start_coordinates: 'Координати початку:' coordinates_html: '%{latitude}; %{longitude}' map: на мапі - edit: правити + edit: редагувати owner: 'Власник:' description: 'Опис:' tags: 'Теґи:' none: Нічого - edit_trace: Правити трек + edit_trace: Редагувати трек delete_trace: Вилучити цей трек trace_not_found: Трек не знайдено! visibility: 'Видимість:' @@ -1989,8 +2018,8 @@ uk: more: більше trace_details: Показати дані треку view_map: Перегляд Мапи - edit: правити - edit_map: Правити Мапу + edit: редагувати + edit_map: Редагувати Мапу public: ЗАГАЛЬНИЙ identifiable: ІДЕНТИФІКОВУВАНИЙ private: ПРИВАТНИЙ @@ -2073,7 +2102,7 @@ uk: new: title: Зареєструвати новий застосунок edit: - title: Правити данні вашого застосунка + title: Змінити дані вашого застосунку show: title: Подробиці OAuth для %{app_name} key: 'Позначки абонента:' @@ -2201,15 +2230,10 @@ uk:

    Зареєструйтесь, аби зробити свій внесок. Ми надішлемо вам лист для підтвердження вашого облікового запису.

    email address: 'Адреса ел. пошти:' confirm email address: 'Підтвердити адресу ел. пошти:' - not_displayed_publicly_html: Не показується загальнодоступно, див. нашу політику - конфіденційності, щоб отримати більше інформації display name: 'Прізвисько:' display name description: Ваше ім’я користувача, доступне всім. Ви можете змінити його потім у ваших налаштуваннях. external auth: 'Автентифікація через:' - password: 'Пароль:' - confirm password: 'Повторіть пароль:' use external auth: Або використовуйте, облікові записи з інших ресурсів для входу auth no password: Під час використання автентифікації через третю сторону пароль @@ -2329,10 +2353,6 @@ uk: title: Редагувати обліковий запис my settings: Налаштування current email address: 'Поточна адреса електронної пошти:' - new email address: 'Нова адреса електронної пошти:' - email never displayed publicly: |2- - - (ніколи не показується загальнодоступно) external auth: 'Зовнішня автентифікація:' openid: link: http://wiki.openstreetmap.org/wiki/Uk:OpenID @@ -2346,14 +2366,14 @@ uk: disabled link text: чому я не можу вносити зміни? public editing note: heading: Загальнодоступне редагування - html: На даний момент ваші редагування анонімні й ніхто не може відправляти - вам повідомлення або бачити ваше місце розташування. Щоб показати, що ви - редагували і дозволити людям зв'язатися з вами через веб-сайт, натисніть - на кнопку нижче. З переходом на API версії 0.6, тільки загальнодоступні - користувачі можуть правити мапу. (З'ясувати, + html: На цей час ваші редагування анонімні й ніхто не може відправляти вам + повідомлення або бачити ваше місце розташування. Щоб показати, що ви редагували + та дозволити людям зв’язатися з вами через веб-сайт, натисніть на кнопку + нижче. З переходом на API версії 0.6, тільки зареєстровані користувачі + можуть правити мапу. (З'ясувати, чому). + зазвичай тепер доступні для зв’язку. contributor terms: heading: 'Умови Співпраці:' agreed: Ви погодилися на нові Умови Співпраці. @@ -2364,14 +2384,10 @@ uk: Суспільного Надбання. link: http://wiki.openstreetmap.org/wiki/Uk:Open_Database_License/Contributor_Terms link text: що це? - profile description: 'Опис профілю:' - preferred languages: 'Бажані мови:' - preferred editor: 'Редактор:' image: 'Зображення:' gravatar: gravatar: Використовувати Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: Що це? disabled: Gravatar вимкнено. enabled: Показ Вашого Gravatar'а увімкнено. new image: Додати зображення @@ -2381,8 +2397,6 @@ uk: image size hint: (найкраще підходять квадратні зображення, принаймні 100х100) home location: 'Основне місце розташування:' no home location: Ви не позначили своє основне місце розташування. - latitude: 'Широта:' - longitude: 'Довгота:' update home location on click: Оновлювати моє місце розташування, коли я клацаю на мапу? save changes button: Зберегти зміни @@ -2511,7 +2525,7 @@ uk: перед тим як блокувати його. flash: 'Заблоковано користувача: %{name}.' update: - only_creator_can_edit: Тільки модератор, який створив це блокування, може правити + only_creator_can_edit: Тільки модератор, який створив це блокування, може змінювати його. success: Блокування оновлено. index: @@ -2566,7 +2580,7 @@ uk: created: Створено status: Стан show: Показувати - edit: Правити + edit: Редагувати revoke: Розблокувати! confirm: Ви впевнені? reason: 'Причина блокування:' @@ -2577,7 +2591,7 @@ uk: block: not_revoked: (не розблокований) show: Показати - edit: Правити + edit: Редагувати revoke: Розблокувати! blocks: display_name: Заблокований користувач @@ -2806,15 +2820,13 @@ uk: centre_map: Центрувати мапу тут redactions: edit: - description: Опис - heading: Правити редакцію - title: Правити редакцію + heading: Змінити редакцію + title: Змінити редакцію index: empty: Редакції для показу відсутні. heading: Перелік редакцій title: Перелік редакцій new: - description: Опис heading: Введіть інформацію для нової редакції title: Створення нової редакції show: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 34bbe75a3..31ef88ddd 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -11,6 +11,7 @@ # Author: Macofe # Author: Minh Nguyen # Author: Nemo bis +# Author: Nghiemtrongdai VN # Author: Nguyễn Mạnh An # Author: Ninomax # Author: Phjtieudoc @@ -132,14 +133,19 @@ vi: title: Tiêu đề body: Nội dung recipient: Người nhận + redaction: + description: Miêu tả report: category: Chọn lý do cho báo cáo của bạn details: Vui lòng cung cấp thêm chi tiết về vấn đề (yêu cầu). user: email: Thư điện tử + new_email: 'Địa chỉ Thư điện tử Mới:' active: Tích cực display_name: Tên Hiển thị description: Miêu tả + home_lat: 'Vĩ độ:' + home_lon: 'Kinh độ:' languages: Ngôn ngữ pass_crypt: Mật khẩu pass_crypt_confirmation: Xác nhận mật khẩu @@ -151,6 +157,8 @@ vi: nhiều chi tiết về trường hợp này. Nhớ rằng thôn báo này sẽ công khai. Xin hãy tránh thuật ngữ chuyên môn vì người dùng có thể không rành. needs_view: Người dùng có phải cần đăng nhập trước khi bỏ cấm được không? + user: + new_email: (không lúc nào hiện công khai) datetime: distance_in_words_ago: about_x_hours: @@ -519,6 +527,7 @@ vi: pylon: Cột tháp station: Trạm Cáp treo t-bar: T-Bar Lift + "yes": Đường trên không aeroway: aerodrome: Sân bay airstrip: Bãi hạ cánh @@ -527,12 +536,14 @@ vi: hangar: Nhà Máy bay helipad: Sân bay Trực thăng holding_position: Chỗ Dừng Máy bay + navigationaid: Hỗ trợ điều hướng hàng không parking_position: Chỗ Đậu Máy bay runway: Đường băng taxiway: Đường lăn terminal: Nhà ga Sân bay windsock: Ống gió amenity: + animal_boarding: Vườn bách thú animal_shelter: Trạm Bảo vệ Động vật arts_centre: Trung tâm Nghệ thuật atm: Máy Rút tiền Tự động @@ -569,6 +580,7 @@ vi: drinking_water: Vòi Nước uống driving_school: Trường Lái xe embassy: Tòa Đại sứ + events_venue: Địa điểm tổ chức sự kiện fast_food: Nhà hàng Ăn nhanh ferry_terminal: Trạm Phà fire_station: Trạm Cứu hỏa @@ -587,6 +599,7 @@ vi: library: Thư viện love_hotel: Khách sạn tình yêu marketplace: Chợ phiên + mobile_money_agent: Đại lý tiền di động monastery: Nhà tu money_transfer: Gửi Tiền motorcycle_parking: Chỗ Đậu Xe máy @@ -2257,16 +2270,10 @@ vi:

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

    email address: 'Địa chỉ Thư điện tử:' confirm email address: 'Xác nhận Địa chỉ Thư điện tử:' - not_displayed_publicly_html: Địa chỉ thư điện tử của bạn không được hiển thị - công khai (xem thêm chi tiết trong quy - định quyền riêng tư của chúng tôi) display name: 'Tên hiển thị:' display name description: Tên người dùng của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn. external auth: 'Xác minh qua Dịch vụ Bên thứ ba:' - password: 'Mật khẩu:' - confirm password: 'Xác nhận Mật khẩu:' use external auth: Hoặc đăng nhập qua dịch vụ bên thứ ba auth no password: Nếu xác minh qua dịch vụ bên thứ ba, bạn không cần nhập mật khẩu, nhưng một số công cụ hoặc máy chủ khác có thể vẫn yêu cầu mật khẩu. @@ -2385,8 +2392,6 @@ vi: title: Chỉnh sửa tài khoản my settings: Tùy chọn current email address: 'Địa chỉ Thư điện tử Hiện tại:' - new email address: 'Địa chỉ Thư điện tử Mới:' - email never displayed publicly: (không lúc nào hiện công khai) external auth: 'Xác minh Bên ngoài:' openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2417,14 +2422,10 @@ vi: phạm vi công cộng. link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms?uselang=vi link text: đây là gì? - profile description: 'Tự giới thiệu:' - preferred languages: 'Ngôn ngữ Ưu tiên:' - preferred editor: 'Trình vẽ Ưa thích:' image: 'Hình:' gravatar: gravatar: Sử dụng Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=vi - link text: đây là gì? disabled: Hình Gravatar của bạn đã bị tắt. enabled: Hình Gravatar của bạn đã bị kích hoạt. new image: Thêm hình @@ -2434,8 +2435,6 @@ vi: image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất) home location: 'Vị trí Nhà:' no home location: Bạn chưa định vị trí nhà. - latitude: 'Vĩ độ:' - longitude: 'Kinh độ:' update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản đồ? save changes button: Lưu các Thay đổi @@ -2851,7 +2850,6 @@ vi: centre_map: Tập trung bản đồ tại đây redactions: edit: - description: Miêu tả heading: Sửa đổi dãy ẩn title: Sửa đổi dãy ẩn index: @@ -2859,7 +2857,6 @@ vi: heading: Danh sách dãy ẩn title: Danh sách dãy ẩn new: - description: Miêu tả heading: Ghi thông tin của dãy ẩn mới title: Đang ẩn dãy phiên bản show: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index b85b1feaf..d1a0d9bb1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -174,14 +174,19 @@ zh-CN: title: 主题 body: 正文 recipient: 收件人 + redaction: + description: 描述 report: category: 选择您举报的原因 details: 请提供一些有关问题的更多详情（必填）。 user: email: 电子邮件 + new_email: 新电子邮件地址： active: 激活 display_name: 显示名称 description: 描述 + home_lat: 纬度： + home_lon: 经度： languages: 语言 pass_crypt: 密码 pass_crypt_confirmation: 确认密码 @@ -190,6 +195,8 @@ zh-CN: tagstring: 用逗号分隔 user_block: needs_view: 在清除这个封禁之前，是否需要用户先登录？ + user: + new_email: (从不公开显示) datetime: distance_in_words_ago: about_x_hours: @@ -1294,6 +1301,7 @@ zh-CN: level8: 市界(乡/镇/街道界) level9: 村界 level10: 郊区界(社区/行政村界) + level11: 邻里(小区)边界 types: cities: 城市 towns: 城镇 @@ -2202,13 +2210,9 @@ zh-CN:

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

    email address: 电子邮件地址： confirm email address: 确认电子邮件地址： - not_displayed_publicly_html: 你的电子邮件地址不会被公开展示，更多信息请查看请我们的隐私政策 display name: 显示名称： display name description: 你的公开展示的用户名。你可以稍后在设置中进行修改。 external auth: 第三方身份验证： - password: 密码： - confirm password: 确认密码： use external auth: 或者使用第三方服务登录 auth no password: 通过第三方身份验证，您不再需要密码，但一些额外工具或服务器可能仍然需要。 continue: 注册 @@ -2314,8 +2318,6 @@ zh-CN: title: 编辑账户 my settings: 我的设置 current email address: 当前电子邮件地址： - new email address: 新电子邮件地址： - email never displayed publicly: (从不公开显示) external auth: 外部身份验证： openid: link: https://wiki.openstreetmap.org/wiki/OpenID @@ -2339,14 +2341,10 @@ zh-CN: agreed_with_pd: 您也将您的编辑释于公有领域。 link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: 这是什么？ - profile description: 基本信息说明： - preferred languages: 首选语言： - preferred editor: 首选编辑器： image: 图像： gravatar: gravatar: 使用 Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: 这是什么？ disabled: Gravatar已禁用。 enabled: 您的Gravatar显示已启用。 new image: 添加图像 @@ -2356,8 +2354,6 @@ zh-CN: image size hint: (正方形图像，尺寸至少为100x100) home location: 住所位置： no home location: 您还没有输入您的住所位置。 - latitude: 纬度： - longitude: 经度： update home location on click: 点击地图时更新所在位置？ save changes button: 保存更改 make edits public button: 公开我所有的编辑 @@ -2737,7 +2733,6 @@ zh-CN: centre_map: 将此处置于地图中间 redactions: edit: - description: 描述 heading: 编辑修订 title: 编辑修订 index: @@ -2745,7 +2740,6 @@ zh-CN: heading: 修订列表 title: 修订列表 new: - description: 描述 heading: 请输入新修订的信息 title: 创建新修订 show: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index e0762993d..11f44eb17 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -156,15 +156,25 @@ zh-TW: title: 標題 body: 內文 recipient: 收件者 + redaction: + title: 標題 + description: 說明 report: category: 選擇您回報的原因 details: 請提供有關問題的更多些詳情（必需） user: + auth_provider: 認證提供方 + auth_uid: 認證 UID email: 電子郵件 + email_confirmation: 電子郵件確認 + new_email: 新的電子郵件地址 active: 開啟中 display_name: 顯示名稱 - description: 說明 - languages: 語言 + description: 基本資料說明 + home_lat: 緯度 + home_lon: 經度 + languages: 偏好的語言 + preferred_editor: 偏好編輯器 pass_crypt: 密碼 pass_crypt_confirmation: 確認密碼 help: @@ -173,6 +183,10 @@ zh-TW: user_block: reason: 使用者之所以被封鎖的理由。請盡量以平靜、合理的態度，來詳細地描述情況，另外請記住訊息是公開可見的。請注意，並非所有使用者都能了解社群術語，所以請嘗試使用較為通用的說法。 needs_view: 在清除這項封鎖之前是否需要使用者登入？ + user: + email_confirmation: 您的地址未公開顯示，請查看我們的隱私權政策來獲得更多資訊。 + new_email: (永遠不公開顯示) datetime: distance_in_words_ago: about_x_hours: @@ -2258,13 +2272,9 @@ zh-TW:

    請註冊以開始貢獻吧。我們將發出電子郵件以確認你的帳號。

    email address: 電子郵件地址： confirm email address: 確認電子郵件地址： - not_displayed_publicly_html: 您的地址未公開顯示，請看我們的隱私權政策來獲得更多訊息 display name: 顯示名稱： display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。 external auth: 第三方身份認證 - password: 密碼： - confirm password: 確認密碼： use external auth: 或者使用第三方服務登入 auth no password: 使用第三方認証無須填寫密碼，但部份額外工具或伺服器可能仍需要使用密碼。 continue: 註冊 @@ -2369,15 +2379,13 @@ zh-TW: account: title: 編輯帳號 my settings: 我的設定值 - current email address: 目前的電子郵件地址： - new email address: 新的電子郵件地址： - email never displayed publicly: (永遠不公開顯示) - external auth: 外部認證： + current email address: 目前的電子郵件地址 + external auth: 外部認證 openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: 這是什麼？ public editing: - heading: 公開編輯： + heading: 公開編輯 enabled: 已開啟。非匿名且可以編輯資料。 enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: 這是什麼？ @@ -2389,21 +2397,18 @@ zh-TW: API 的轉換，只有公開的使用者可以編輯地圖資料。（知道為什麼）。 contributor terms: - heading: 貢獻者條款： + heading: 貢獻者條款 agreed: 您已同意新的貢獻者條款。 not yet agreed: 您未同意新的貢獻者條款。 review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。 agreed_with_pd: 您亦同意將您的編輯放到公共領域 link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: 這是什麼？ - profile description: 基本資料描述： - preferred languages: 偏好的語言： - preferred editor: '偏好編輯器:' - image: 圖片： + image: 圖片 gravatar: gravatar: 使用 Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: 這是什麼？ + what_is_gravatar: 什麼是 Gravatar？ disabled: Gravatar已停用。 enabled: 您的Gravatar顯示功能已啟用。 new image: 加入圖片 @@ -2411,10 +2416,8 @@ zh-TW: delete image: 移除目前的圖片 replace image: 取代目前的圖片 image size hint: ' (方形圖片至少 100x100 的效果最好)' - home location: 家的位置： + home location: 家的位置 no home location: 您尚未輸入家的位置。 - latitude: 緯度： - longitude: 經度： update home location on click: 當我點選地圖時更新家的位置？ save changes button: 儲存變更 make edits public button: 將我所有的編輯設為公開 @@ -2790,7 +2793,6 @@ zh-TW: centre_map: 中央地圖在此 redactions: edit: - description: 說明 heading: 編輯修訂 title: 編輯修訂 index: @@ -2798,7 +2800,6 @@ zh-TW: heading: 修訂清單 title: 修訂清單 new: - description: 說明 heading: 輸入新增修訂資訊 title: 建立修訂中 show: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index 14e726ae9..45bbe4050 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -792,8 +792,6 @@ zh-hk: display name: 顯示名稱： display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。 external auth: 第三方身份認證： - password: 密碼： - confirm password: 確認密碼： auth no password: 啟用第三方認證後密碼並非必須，但一些額外的工具或伺服器可能仍需要使用密碼。 continue: 註冊 terms accepted: 感謝您接受新的貢獻條款！ diff --git a/config/routes.rb b/config/routes.rb index 8a1ea8846..97cedd965 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,8 +59,6 @@ OpenStreetMap::Application.routes.draw do get "trackpoints" => "api/tracepoints#index" - get "changes" => "api/changes#index" - get "user/:id" => "api/users#show", :id => /\d+/, :as => :api_user get "user/details" => "api/users#details" get "user/gpx_files" => "api/users#gpx_files" @@ -173,7 +171,7 @@ OpenStreetMap::Application.routes.draw do # omniauth get "/auth/failure" => "users#auth_failure" match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success - match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth + post "/auth/:provider" => "users#auth", :as => :auth # permalink get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink diff --git a/db/functions/Makefile b/db/functions/Makefile index a1259fc55..3fa4ae526 100644 --- a/db/functions/Makefile +++ b/db/functions/Makefile @@ -16,7 +16,7 @@ all: ${DESTDIR}/libpgosm.so clean: $(RM) ${DESTDIR}/*.so ${DESTDIR}/*.o -${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o ${DESTDIR}/maptile.o ${DESTDIR}/xid_to_int4.o +${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o ${DESTDIR}/xid_to_int4.o cc ${LDFLAGS} -o $@ $^ ${DESTDIR}/%.o: %.c diff --git a/db/functions/functions.sql b/db/functions/functions.sql index 4f1f7c716..5e3d4bcb3 100644 --- a/db/functions/functions.sql +++ b/db/functions/functions.sql @@ -42,33 +42,6 @@ END; $$ LANGUAGE plpgsql IMMUTABLE; --- maptile_for_point returns an integer representing the tile at the given zoom --- which contains the point (scaled_lon, scaled_lat). Note that the arguments --- are in the order (lat, lon), and should be scaled by 10^7. --- --- The maptile_for_point function is used only for grouping the results of the --- (deprecated?) /changes API call. Please don't use it for anything else, as --- it might go away in the future. -CREATE OR REPLACE FUNCTION maptile_for_point(scaled_lat int8, scaled_lon int8, zoom int4) - RETURNS int4 - AS $$ -DECLARE - lat CONSTANT DOUBLE PRECISION := scaled_lat / 10000000.0; - lon CONSTANT DOUBLE PRECISION := scaled_lon / 10000000.0; - zscale CONSTANT DOUBLE PRECISION := 2.0 ^ zoom; - pi CONSTANT DOUBLE PRECISION := 3.141592653589793; - r_per_d CONSTANT DOUBLE PRECISION := pi / 180.0; - x int4; - y int4; -BEGIN - -- straight port of the C code. see db/functions/maptile.c - x := floor((lon + 180.0) * zscale / 360.0); - y := floor((1.0 - ln(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / pi) * zscale / 2.0); - - RETURN (x << zoom) | y; -END; -$$ LANGUAGE plpgsql IMMUTABLE; - -- xid_to_int4 converts a PostgreSQL transaction ID (xid) to a 32-bit integer -- which can then be used to efficiently find rows which have changed between -- two given transactions. This is currently used by Osmosis to extract a diff --git a/db/functions/maptile.c b/db/functions/maptile.c deleted file mode 100644 index 358a3ba75..000000000 --- a/db/functions/maptile.c +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include -#include - -Datum -maptile_for_point(PG_FUNCTION_ARGS) -{ - double lat = PG_GETARG_INT64(0) / 10000000.0; - double lon = PG_GETARG_INT64(1) / 10000000.0; - int zoom = PG_GETARG_INT32(2); - double scale = pow(2, zoom); - double r_per_d = M_PI / 180; - unsigned int x; - unsigned int y; - - x = floor((lon + 180.0) * scale / 360.0); - y = floor((1 - log(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / M_PI) * scale / 2.0); - - PG_RETURN_INT32((x << zoom) | y); -} - -PG_FUNCTION_INFO_V1(maptile_for_point); - -/* - * To bind this into PGSQL, try something like: - * - * CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 - * AS '/path/to/rails-port/db/functions/libpgosm', 'maptile_for_point' - * LANGUAGE C STRICT; - * - * (without all the *s) - */ - -#ifdef PG_MODULE_MAGIC -PG_MODULE_MAGIC; -#endif diff --git a/db/structure.sql b/db/structure.sql index b5c4ec01d..89a62626e 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -128,31 +128,6 @@ CREATE TYPE public.user_status_enum AS ENUM ( ); --- --- Name: maptile_for_point(bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: - --- - -CREATE FUNCTION public.maptile_for_point(scaled_lat bigint, scaled_lon bigint, zoom integer) RETURNS integer - LANGUAGE plpgsql IMMUTABLE - AS $$ -DECLARE - lat CONSTANT DOUBLE PRECISION := scaled_lat / 10000000.0; - lon CONSTANT DOUBLE PRECISION := scaled_lon / 10000000.0; - zscale CONSTANT DOUBLE PRECISION := 2.0 ^ zoom; - pi CONSTANT DOUBLE PRECISION := 3.141592653589793; - r_per_d CONSTANT DOUBLE PRECISION := pi / 180.0; - x int4; - y int4; -BEGIN - -- straight port of the C code. see db/functions/maptile.c - x := floor((lon + 180.0) * zscale / 360.0); - y := floor((1.0 - ln(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / pi) * zscale / 2.0); - - RETURN (x << zoom) | y; -END; -$$; - - -- -- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: - -- diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index ad743ae36..e2cacfff3 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -52,7 +52,6 @@ sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql ################################################################################ #pushd db/functions #sudo -u vagrant make -#sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'maptile_for_point' LANGUAGE C ST#RICT" #sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'tile_for_point' LANGUAGE C STRICT" #sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'xid_to_int4' LANGUAGE C STRICT" #popd diff --git a/test/controllers/api/changes_controller_test.rb b/test/controllers/api/changes_controller_test.rb deleted file mode 100644 index 88d3c2e0e..000000000 --- a/test/controllers/api/changes_controller_test.rb +++ /dev/null @@ -1,106 +0,0 @@ -require "test_helper" - -module Api - class ChangesControllerTest < ActionDispatch::IntegrationTest - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/api/0.6/changes", :method => :get }, - { :controller => "api/changes", :action => "index" } - ) - end - - # MySQL and Postgres require that the C based functions are installed for - # this test to work. More information is available from: - # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions - # or by looking at the readme in db/README - def test_changes_simple - # create a selection of nodes - (1..5).each do |n| - create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => n, :lon => n) - end - # deleted nodes should also be counted - create(:node, :deleted, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6) - # nodes in the same tile won't change the total - create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6) - # nodes with a different timestamp should be ignored - create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7) - - travel_to Time.utc(2010, 4, 3, 10, 55, 0) do - get changes_path - assert_response :success - now = Time.now.getutc - hourago = now - 1.hour - assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do - assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do - assert_select "tile", :count => 0 - end - end - end - - travel_to Time.utc(2007, 1, 1, 0, 30, 0) do - get changes_path - assert_response :success - # print @response.body - # As we have loaded the fixtures, we can assume that there are some - # changes at the time we have frozen at - now = Time.now.getutc - hourago = now - 1.hour - assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do - assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do - assert_select "tile", :count => 6 - end - end - end - end - - def test_changes_zoom_invalid - zoom_to_test = %w[p -1 0 17 one two] - zoom_to_test.each do |zoom| - get changes_path(:zoom => zoom) - assert_response :bad_request - assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body) - end - end - - def test_changes_zoom_valid - 1.upto(16) do |zoom| - get changes_path(:zoom => zoom) - assert_response :success - # NOTE: there was a test here for the timing, but it was too sensitive to be a good test - # and it was annoying. - assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do - assert_select "changes", :count => 1 - end - end - end - - def test_changes_hours_invalid - invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :] - invalid.each do |hour| - get changes_path(:hours => hour) - assert_response :bad_request, "Problem with the hour: #{hour}" - assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body, "Problem with the hour: #{hour}.") - end - end - - def test_changes_hours_valid - 1.upto(24) do |hour| - get changes_path(:hours => hour) - assert_response :success - end - end - - def test_changes_start_end_invalid - get changes_path(:start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00") - assert_response :bad_request - assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body) - end - - def test_changes_start_end_valid - get changes_path(:start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00") - assert_response :success - end - end -end diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index 340d2494d..6170e3a48 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -73,10 +73,10 @@ class UserHelperTest < ActionView::TestCase def test_auth_button button = auth_button("google", "google") - assert_equal("\"Login", button) + assert_equal("\"Login", button) button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal("\"Login", button) + assert_equal("\"Login", button) end private diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index f331a4b98..138911bb1 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -243,7 +243,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -289,7 +289,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -328,7 +328,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -397,7 +397,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -442,7 +442,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -482,7 +482,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -549,7 +549,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -594,7 +594,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -632,7 +632,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -699,7 +699,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -744,7 +744,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -782,7 +782,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -849,7 +849,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -895,7 +895,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -933,7 +933,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -1001,7 +1001,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -1047,7 +1047,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -1085,7 +1085,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index b83b90acf..149875def 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -359,7 +359,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "openid", :openid_url => "http://localhost:1123/john.doe", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -380,7 +380,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -405,7 +405,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "openid", :openid_url => user.auth_uid, :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -429,7 +429,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "openid", :openid_url => "http://localhost:1123/fred.bloggs", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -452,7 +452,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -472,7 +472,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -496,7 +496,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -522,7 +522,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -545,7 +545,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "google", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -570,7 +570,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -590,7 +590,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -614,7 +614,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -638,7 +638,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "facebook", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -659,7 +659,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -679,7 +679,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -703,7 +703,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -727,7 +727,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -748,7 +748,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -768,7 +768,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -792,7 +792,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -816,7 +816,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") + post auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history") assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -837,7 +837,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -857,7 +857,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -881,7 +881,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! @@ -905,7 +905,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/login" - get auth_path(:provider => "wikipedia", :origin => "/login?referer=%2Fhistory", :referer => "/history") + 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! diff --git a/yarn.lock b/yarn.lock index 643d48d88..989f103fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -243,9 +243,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.3.1: - version "7.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" - integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" + integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.3.0"