From: Tom Hughes Date: Thu, 7 Oct 2021 16:45:07 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3300' X-Git-Tag: live~2137 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5966acc207874f3196a43700cb9306411c77fe47?hp=350ac303f167002a4edc0853259e8793e879c91d Merge remote-tracking branch 'upstream/pull/3300' --- diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..44b38323d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..6313b56c5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 32514771c..90bfaa8f9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2021-06-29 17:25:37 UTC using RuboCop version 1.18.0. +# on 2021-09-14 19:29:59 UTC using RuboCop version 1.21.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -14,13 +14,26 @@ require: - rubocop-rails - rubocop-rake -# Offense count: 510 +# Offense count: 524 # Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: Max: 270 +# Offense count: 62 +# Cop supports --auto-correct. +Lint/AmbiguousOperatorPrecedence: + Exclude: + - 'app/controllers/geocoder_controller.rb' + - 'app/models/user.rb' + - 'lib/bounding_box.rb' + - 'lib/osm.rb' + - 'lib/rich_text.rb' + - 'lib/short_link.rb' + - 'test/controllers/api/old_nodes_controller_test.rb' + - 'test/lib/short_link_test.rb' + # Offense count: 34 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: @@ -50,12 +63,12 @@ Lint/DuplicateBranch: - 'app/helpers/browse_tags_helper.rb' - 'lib/password_hash.rb' -# Offense count: 631 +# Offense count: 643 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: - Max: 235 + Max: 189 -# Offense count: 68 +# Offense count: 69 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. # IgnoredMethods: refine Metrics/BlockLength: @@ -69,14 +82,14 @@ Metrics/BlockNesting: # Offense count: 25 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 361 + Max: 337 -# Offense count: 56 +# Offense count: 58 # Configuration parameters: IgnoredMethods. Metrics/CyclomaticComplexity: Max: 25 -# Offense count: 703 +# Offense count: 716 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: Max: 179 @@ -86,37 +99,22 @@ Metrics/MethodLength: Metrics/ParameterLists: Max: 6 -# Offense count: 60 +# Offense count: 62 # Configuration parameters: IgnoredMethods. Metrics/PerceivedComplexity: Max: 26 -# Offense count: 519 +# Offense count: 528 Minitest/MultipleAssertions: - Max: 88 + Max: 54 -# Offense count: 4 +# Offense count: 3 Naming/AccessorMethodName: Exclude: - 'app/controllers/application_controller.rb' - 'app/helpers/title_helper.rb' - 'lib/osm.rb' -# Offense count: 21 -# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms. -Naming/InclusiveLanguage: - Exclude: - - 'app/controllers/sessions_controller.rb' - - 'app/controllers/users_controller.rb' - - 'app/helpers/browse_tags_helper.rb' - - 'app/views/api/capabilities/show.builder' - - 'app/views/confirmations/_resend_success_flash.html.erb' - - 'app/views/users/suspended.html.erb' - - 'config/environments/production.rb' - - 'config/initializers/canonical_rails.rb' - - 'config/initializers/config.rb' - - 'config/initializers/doorkeeper.rb' - # Offense count: 8 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. # NamePrefix: is_, has_, have_ @@ -200,7 +198,7 @@ Rake/Desc: - 'lib/tasks/subscribe_diary_authors.rake' - 'lib/tasks/subscribe_old_changesets.rake' -# Offense count: 597 +# Offense count: 602 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never diff --git a/Gemfile b/Gemfile index 6b1049ec7..75cb1054b 100644 --- a/Gemfile +++ b/Gemfile @@ -145,7 +145,7 @@ group :test do gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" - gem "rubocop-rails" + gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2 gem "rubocop-rake" gem "selenium-webdriver" gem "simplecov", :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 624d03d0b..2d679a751 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,23 +74,23 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.2) - autoprefixer-rails (10.3.1.0) + autoprefixer-rails (10.3.3.0) execjs (~> 2) - aws-eventstream (1.1.1) - aws-partitions (1.490.0) - aws-sdk-core (3.119.1) + aws-eventstream (1.2.0) + aws-partitions (1.510.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.49.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.99.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.103.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) better_errors (2.9.1) coderay (>= 1.0.0) @@ -106,7 +106,7 @@ GEM smart_properties binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.7.7) + bootsnap (1.9.1) msgpack (~> 1.0) bootstrap (4.5.3) autoprefixer-rails (>= 9.1.0) @@ -121,7 +121,7 @@ GEM bzip2-ffi (1.1.0) ffi (~> 1.0) cancancan (3.3.0) - canonical-rails (0.2.11) + canonical-rails (0.2.12) rails (>= 4.1, < 6.2) capybara (3.35.3) addressable @@ -151,27 +151,26 @@ GEM activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) docile (1.4.0) - doorkeeper (5.5.2) + doorkeeper (5.5.4) railties (>= 5) - doorkeeper-i18n (5.2.2) + doorkeeper-i18n (5.2.3) doorkeeper (>= 5.2) - dry-configurable (0.12.1) + dry-configurable (0.13.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5.0) - dry-container (0.8.0) + dry-core (~> 0.6) + dry-container (0.9.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) + dry-configurable (~> 0.13, >= 0.13.0) dry-core (0.7.1) concurrent-ruby (~> 1.0) - dry-equalizer (0.3.0) dry-inflector (0.2.1) dry-initializer (3.0.4) dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.7.0) + dry-schema (1.8.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) + dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-logic (~> 1.0) @@ -182,13 +181,12 @@ GEM dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.6.0) + dry-validation (1.7.0) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) - dry-schema (~> 1.5, >= 1.5.2) + dry-schema (~> 1.8, >= 1.8.0) erb_lint (0.1.1) activesupport better_html (~> 1.0.7) @@ -205,7 +203,7 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.7.0) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -224,8 +222,8 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - ffi (1.15.3) - ffi-libarchive (1.0.17) + ffi (1.15.4) + ffi-libarchive (1.1.3) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) @@ -241,7 +239,7 @@ GEM concurrent-ruby (~> 1.0) i18n-js (3.9.0) i18n (>= 0.6.6) - image_optim (0.30.0) + image_optim (0.31.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -264,7 +262,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.5.1) - jwt (2.2.3) + jwt (2.3.0) kgio (2.11.4) kramdown (2.3.1) rexml @@ -280,7 +278,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) maxminddb (0.1.22) method_source (1.0.0) mini_magick (4.11.0) @@ -292,7 +290,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.8) - nokogiri (1.12.3) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) oauth (0.4.7) @@ -340,14 +338,14 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.1) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.6.0) public_suffix (4.0.6) - puma (5.4.0) + puma (5.5.0) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -407,18 +405,18 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.19.1) + rubocop (1.22.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.12.0) parser (>= 3.0.1.1) - rubocop-minitest (0.15.0) + rubocop-minitest (0.15.1) rubocop (>= 0.90, < 2.0) rubocop-performance (1.11.5) rubocop (>= 1.7.0, < 2.0) @@ -446,7 +444,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.2) + secure_headers (6.3.3) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -457,7 +455,7 @@ GEM simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.3) - smart_properties (1.16.0) + smart_properties (1.16.3) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -467,13 +465,13 @@ GEM sprockets (>= 3.0.0) strong_migrations (0.7.8) activerecord (>= 5) - terser (1.1.5) + terser (1.1.7) execjs (>= 0.3.0, < 3) thor (1.1.0) tilt (2.0.10) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) @@ -562,7 +560,7 @@ DEPENDENCIES rubocop rubocop-minitest rubocop-performance - rubocop-rails + rubocop-rails (~> 2.11.3) rubocop-rake sanitize sassc-rails diff --git a/README.md b/README.md index b96a77671..8eb26bf27 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ number of dependencies for installation. For full details please see [INSTALL.md We're always keen to have more developers! Pull requests are very welcome. * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). -* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components. * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap). * There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. * IRC - there is the #osm-dev channel on irc.oftc.net. diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 018ce0096..769fbca47 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -42,6 +42,7 @@ class Ability can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application can [:index, :destroy], :oauth2_authorized_application can [:new, :show, :create, :destroy], :oauth2_authorization + can [:show], :dashboard can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry can [:make_friend, :remove_friend], Friendship can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0023286bf..e0eec7bda 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1096,47 +1096,11 @@ tr.turn:hover { /* Rules for the user profile page */ -#userinformation { - min-height: 100px; - .userinformation-inner { - float: left; - } - .user-description { - width: 100%; - clear: both; - } -} - -.admin-user-info small { - margin-bottom: $lineheight/2; - display: inline; - margin-right: $lineheight; -} - .contact-activity { margin-top: $lineheight; width: 100%; } -.activity-details p { - margin-left: 70px; - margin-bottom: 0; -} - -.users-show { - // Silly exception; remove when user page is redesigned. - .content-inner { - max-width: none; - } - p#no_home_location { - margin: $lineheight; - } - .user_thumbnail { - margin-top: $lineheight/4; - float: left; - } -} - /* Rules for the user map */ .content_map .leaflet-popup-content { @@ -1466,6 +1430,12 @@ img.user_image { margin-right: $lineheight; } +img.user_image_no_margins { + max-width: 100px; + max-height: 100px; + border: 1px solid $grey; +} + img.user_thumbnail { max-width: 50px; max-height: 50px; @@ -1473,6 +1443,12 @@ img.user_thumbnail { margin-right: $lineheight; } +img.user_thumbnail_no_margins { + max-width: 50px; + max-height: 50px; + border: 1px solid $grey; +} + img.user_thumbnail_tiny { width: auto; height: auto; @@ -1489,28 +1465,28 @@ abbr.geo { /* General styles for action lists / subnavs / pager navs */ -ul.secondary-actions { - font-style: normal; - margin-bottom: 0; - margin-left: 0; - padding: 0; - &.pager { - display: inline-block; - margin-right: 60px; - } - > li { - display: block; - float: left; - list-style: none; - border-left: 1px solid $grey; - padding-left: $lineheight/2; - margin-right: $lineheight/2; - &:first-child { - border-left: 0; - padding-left: 0; + +nav.secondary-actions { + margin-left: -11px; + overflow: hidden; + > ul { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-bottom: 0; + margin-left: -1px; + padding: 0; + &.pager { + display: inline-block; + margin-right: 60px; } - &:last-child { - margin-right: 0px; + > li { + flex-basis: auto; + list-style: none; + border-left: 1px solid $grey; + padding-left: $lineheight/2; + margin-right: $lineheight/2; + margin-bottom: $lineheight/8; } } } @@ -1574,6 +1550,17 @@ div.secondary-actions { } } +/* Create a single-line dl */ + +dl.dl-inline { + dt, dd { + display: inline-block; + } + dd { + margin-right: 1em; + } +} + /* Customise the background colour of striped tables */ .table-striped > tbody > tr:nth-child(2n+1) > td, diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb index 34627a118..63fda31bd 100644 --- a/app/controllers/api/changesets_controller.rb +++ b/app/controllers/api/changesets_controller.rb @@ -11,6 +11,8 @@ module Api before_action :require_public_data, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe] before_action :check_api_writable, :only => [:create, :update, :upload, :subscribe, :unsubscribe] before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :subscribe, :unsubscribe] + before_action :set_request_formats, :only => [:download] + around_action :api_call_handle_error around_action :api_call_timeout, :except => [:upload] @@ -122,35 +124,29 @@ module Api end end - # create changeset and user caches - changeset_cache = {} - user_display_name_cache = {} - - # create an osmChange document for the output - result = OSM::API.new.get_xml_doc - result.root.name = "osmChange" - # generate an output element for each operation. note: we avoid looking # at the history because it is simpler - but it would be more correct to # check these assertions. + @created = [] + @modified = [] + @deleted = [] + elements.each do |elt| - result.root << - if elt.version == 1 - # first version, so it must be newly-created. - created = XML::Node.new "create" - created << elt.to_xml_node(changeset_cache, user_display_name_cache) - elsif elt.visible - # must be a modify - modified = XML::Node.new "modify" - modified << elt.to_xml_node(changeset_cache, user_display_name_cache) - else - # if the element isn't visible then it must have been deleted - deleted = XML::Node.new "delete" - deleted << elt.to_xml_node(changeset_cache, user_display_name_cache) - end + if elt.version == 1 + # first version, so it must be newly-created. + @created << elt + elsif elt.visible + # must be a modify + @modified << elt + else + # if the element isn't visible then it must have been deleted + @deleted << elt + end end - render :xml => result.to_s + respond_to do |format| + format.xml + end end ## diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb index b2d755fe6..e758d559f 100644 --- a/app/controllers/api/tracepoints_controller.rb +++ b/app/controllers/api/tracepoints_controller.rb @@ -33,75 +33,11 @@ module Api # get all the points ordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[trackable identifiable] }).order("gpx_id DESC, trackid ASC, timestamp ASC") unordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[public private] }).order("gps_points.latitude", "gps_points.longitude", "gps_points.timestamp") - points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page).preload(:trace) - - doc = XML::Document.new - doc.encoding = XML::Encoding::UTF_8 - root = XML::Node.new "gpx" - root["version"] = "1.0" - root["creator"] = "OpenStreetMap.org" - root["xmlns"] = "http://www.topografix.com/GPX/1/0" - - doc.root = root - - # initialise these variables outside of the loop so that they - # stay in scope and don't get free'd up by the GC during the - # loop. - gpx_id = -1 - trackid = -1 - track = nil - trkseg = nil - anon_track = nil - anon_trkseg = nil - timestamps = false - - points.each do |point| - if gpx_id != point.gpx_id - gpx_id = point.gpx_id - trackid = -1 - - if point.trace.trackable? - track = XML::Node.new "trk" - doc.root << track - timestamps = true - - if point.trace.identifiable? - track << (XML::Node.new("name") << point.trace.name) - track << (XML::Node.new("desc") << point.trace.description) - track << (XML::Node.new("url") << url_for(:controller => "/traces", :action => "show", :display_name => point.trace.user.display_name, :id => point.trace.id)) - end - else - # use the anonymous track segment if the user hasn't allowed - # their GPX points to be tracked. - timestamps = false - if anon_track.nil? - anon_track = XML::Node.new "trk" - doc.root << anon_track - end - track = anon_track - end - end - - if trackid != point.trackid - if point.trace.trackable? - trkseg = XML::Node.new "trkseg" - track << trkseg - trackid = point.trackid - else - if anon_trkseg.nil? - anon_trkseg = XML::Node.new "trkseg" - anon_track << anon_trkseg - end - trkseg = anon_trkseg - end - end - - trkseg << point.to_xml_node(:print_timestamp => timestamps) - end + @points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page).preload(:trace) response.headers["Content-Disposition"] = "attachment; filename=\"tracks.gpx\"" - render :xml => doc.to_s + render :formats => [:gpx] end end end diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb new file mode 100644 index 000000000..540683d25 --- /dev/null +++ b/app/controllers/dashboards_controller.rb @@ -0,0 +1,14 @@ +class DashboardsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :set_locale + + authorize_resource :class => false + + before_action :check_database_readable + + def show + @user = current_user + end +end diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb index 99b8d00a3..a91457645 100644 --- a/app/helpers/open_graph_helper.rb +++ b/app/helpers/open_graph_helper.rb @@ -11,7 +11,7 @@ module OpenGraphHelper } safe_join(tags.map do |property, content| - tag(:meta, :property => property, :content => content) + tag.meta(:property => property, :content => content) end, "\n") end end diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 15231f4d0..c7516a51c 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -25,7 +25,7 @@ module UserRolesHelper end if image - svg_icon = tag("source", :srcset => image_path("#{image}.svg"), :type => "image/svg+xml") + svg_icon = tag.source(:srcset => image_path("#{image}.svg"), :type => "image/svg+xml") png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title) icon = tag.picture(svg_icon + png_icon) icon = link_to(icon, url, :method => :post, :confirm => confirm) if url diff --git a/app/models/concerns/object_metadata.rb b/app/models/concerns/object_metadata.rb deleted file mode 100644 index dcfde889c..000000000 --- a/app/models/concerns/object_metadata.rb +++ /dev/null @@ -1,43 +0,0 @@ -module ObjectMetadata - extend ActiveSupport::Concern - - def add_metadata_to_xml_node(el, osm, changeset_cache, user_display_name_cache) - el["changeset"] = osm.changeset_id.to_s - el["redacted"] = osm.redaction.id.to_s if osm.redacted? - el["timestamp"] = osm.timestamp.xmlschema - el["version"] = osm.version.to_s - el["visible"] = osm.visible.to_s - - if changeset_cache.key?(osm.changeset_id) - # use the cache if available - else - changeset_cache[osm.changeset_id] = osm.changeset.user_id - end - - user_id = changeset_cache[osm.changeset_id] - - if user_display_name_cache.key?(user_id) - # use the cache if available - elsif osm.changeset.user.data_public? - user_display_name_cache[user_id] = osm.changeset.user.display_name - else - user_display_name_cache[user_id] = nil - end - - unless user_display_name_cache[user_id].nil? - el["user"] = user_display_name_cache[user_id] - el["uid"] = user_id.to_s - end - end - - def add_tags_to_xml_node(el, tags) - tags.each do |tag| - tag_el = XML::Node.new("tag") - - tag_el["k"] = tag.k - tag_el["v"] = tag.v - - el << tag_el - end - end -end diff --git a/app/models/node.rb b/app/models/node.rb index 5e799c8d9..8bfac993b 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -27,7 +27,6 @@ class Node < ApplicationRecord include GeoRecord include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_nodes" diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 620cc24d2..81d8e331f 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -27,7 +27,6 @@ class OldNode < ApplicationRecord include GeoRecord include ConsistencyValidations - include ObjectMetadata self.table_name = "nodes" self.primary_keys = "node_id", "version" @@ -69,28 +68,6 @@ class OldNode < ApplicationRecord old_node end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "node" - el["id"] = node_id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - if visible? - el["lat"] = lat.to_s - el["lon"] = lon.to_s - end - - add_tags_to_xml_node(el, old_tags) - - el - end - def save_with_dependencies! save! diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 51aeb9c4c..d0a03ac25 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -22,7 +22,6 @@ class OldRelation < ApplicationRecord include ConsistencyValidations - include ObjectMetadata self.table_name = "relations" self.primary_keys = "relation_id", "version" @@ -88,31 +87,6 @@ class OldRelation < ApplicationRecord attr_writer :members, :tags - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "relation" - el["id"] = relation_id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - old_members.each do |member| - member_el = XML::Node.new "member" - member_el["type"] = member.member_type.to_s.downcase - member_el["ref"] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML - member_el["role"] = member.member_role.to_s - el << member_el - end - - add_tags_to_xml_node(el, old_tags) - - el - end - # Temporary method to match interface to relations def relation_members old_members diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 3260f2a1f..9acf8665d 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -22,7 +22,6 @@ class OldWay < ApplicationRecord include ConsistencyValidations - include ObjectMetadata self.table_name = "ways" self.primary_keys = "way_id", "version" @@ -86,23 +85,6 @@ class OldWay < ApplicationRecord attr_writer :nds, :tags - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "way" - el["id"] = way_id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - old_nodes.each do |nd| # FIXME: need to make sure they come back in the right order - node_el = XML::Node.new "nd" - node_el["ref"] = nd.node_id.to_s - el << node_el - end - - add_tags_to_xml_node(el, old_tags) - - el - end - # Temporary method to match interface to ways def way_nodes old_nodes diff --git a/app/models/relation.rb b/app/models/relation.rb index 365ea533e..25564940b 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -22,7 +22,6 @@ class Relation < ApplicationRecord include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_relations" diff --git a/app/models/trace.rb b/app/models/trace.rb index 0860d2b31..b3d87fc09 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -53,7 +53,7 @@ class Trace < ApplicationRecord def tagstring=(s) self.tags = if s.include? "," - s.split(/\s*,\s*/).reject { |tag| tag =~ /^\s*$/ }.collect do |tag| + s.split(/\s*,\s*/).grep_v(/^\s*$/).collect do |tag| tt = Tracetag.new tt.tag = tag tt diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb index 000f257b4..b3c37430d 100644 --- a/app/models/tracepoint.rb +++ b/app/models/tracepoint.rb @@ -31,12 +31,4 @@ class Tracepoint < ApplicationRecord validates :timestamp, :presence => true belongs_to :trace, :foreign_key => "gpx_id" - - def to_xml_node(print_timestamp: false) - el1 = XML::Node.new "trkpt" - el1["lat"] = lat.to_s - el1["lon"] = lon.to_s - el1 << (XML::Node.new("time") << timestamp.xmlschema) if print_timestamp - el1 - end end diff --git a/app/models/way.rb b/app/models/way.rb index 7bb82b281..724965ddf 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -22,7 +22,6 @@ class Way < ApplicationRecord include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_ways" diff --git a/app/views/api/changesets/download.xml.builder b/app/views/api/changesets/download.xml.builder new file mode 100644 index 000000000..1e400cd9f --- /dev/null +++ b/app/views/api/changesets/download.xml.builder @@ -0,0 +1,19 @@ +xml.instruct! :xml, :version => "1.0" + +xml.osmChange(OSM::API.new.xml_root_attributes) do |osm| + @created.each do |elt| + osm.create do |create| + create << render(elt) + end + end + @modified.each do |elt| + osm.modify do |modify| + modify << render(elt) + end + end + @deleted.each do |elt| + osm.delete do |delete| + delete << render(elt) + end + end +end diff --git a/app/views/api/tracepoints/index.gpx.builder b/app/views/api/tracepoints/index.gpx.builder new file mode 100644 index 000000000..291ef0d45 --- /dev/null +++ b/app/views/api/tracepoints/index.gpx.builder @@ -0,0 +1,79 @@ +xml.instruct! + +xml.gpx("version" => "1.0", + "creator" => "OpenStreetMap.org", + "xmlns" => "http://www.topografix.com/GPX/1/0") do + # initialise these variables outside of the loop so that they + # stay in scope and don't get free'd up by the GC during the + # loop. + gpx_id = -1 + trackid = -1 + tracks = [] + track = nil + trkseg = nil + anon_track = nil + anon_trkseg = nil + + @points.each do |point| + if gpx_id != point.gpx_id + gpx_id = point.gpx_id + trackid = -1 + + if point.trace.trackable? + track = {} + track["trksegs"] = [] + tracks << track + + if point.trace.identifiable? + track["name"] = point.trace.name + track["desc"] = point.trace.description + track["url"] = url_for(:controller => "/traces", :action => "show", :display_name => point.trace.user.display_name, :id => point.trace.id) + end + else + # use the anonymous track segment if the user hasn't allowed + # their GPX points to be tracked. + if anon_track.nil? + anon_track = {} + anon_track["trksegs"] = [] + tracks << anon_track + end + track = anon_track + end + end + + if trackid != point.trackid + if point.trace.trackable? + trkseg = [] + track["trksegs"] << trkseg + trackid = point.trackid + else + if anon_trkseg.nil? + anon_trkseg = [] + anon_track["trksegs"] << anon_trkseg + end + trkseg = anon_trkseg + end + end + + trkseg << point + end + + tracks.each do |trk| + xml.trk do + if trk.key?("name") + xml.name trk["name"] + xml.desc trk["desc"] + xml.url trk["url"] + end + trk["trksegs"].each do |trksg| + xml.trkseg do + trksg.each do |tracepoint| + xml.trkpt("lat" => tracepoint.lat.to_s, "lon" => tracepoint.lon.to_s) do + xml.time tracepoint.timestamp.xmlschema if tracepoint.trace.trackable? + end + end + end + end + end + end +end diff --git a/app/views/users/_contact.html.erb b/app/views/dashboards/_contact.html.erb similarity index 54% rename from app/views/users/_contact.html.erb rename to app/views/dashboards/_contact.html.erb index c7e10c060..7614c0c4d 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -4,21 +4,23 @@ :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) } %> -<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %> - <%= user_thumbnail contact %> -
-

+<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %> +

+ <%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %> +
+
+

<%= link_to contact.display_name, user_path(contact) %> <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> - (<%= t "users.show.m away", :count => (distance * 1000).round %>) + (<%= t ".m away", :count => (distance * 1000).round %>) <% else %> - (<%= t "users.show.km away", :count => distance.round %>) + (<%= t ".km away", :count => distance.round %>) <% end %> <% end %>

-

+

<% changeset = contact.changesets.first %> <% if changeset %> <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %> @@ -31,15 +33,17 @@ <% end %>

-
    -
  • <%= link_to t("users.show.send message"), new_message_path(contact) %>
    • -
  • - <% if current_user.is_friends_with?(contact) %> - <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% else %> - <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% end %> -
    • -
+
<% end %> diff --git a/app/views/users/_popup.html.erb b/app/views/dashboards/_popup.html.erb similarity index 100% rename from app/views/users/_popup.html.erb rename to app/views/dashboards/_popup.html.erb diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb new file mode 100644 index 000000000..9aa4abed4 --- /dev/null +++ b/app/views/dashboards/show.html.erb @@ -0,0 +1,65 @@ +<% content_for :heading do %> +

<%= t ".title" %>

+<% end %> + +
+ <% if current_user and @user.id == current_user.id %> +
+ <% if @user.home_lat.nil? or @user.home_lon.nil? %> +
+

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

+
+ <% else %> + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <% user_data = { + :lon => current_user.home_lon, + :lat => current_user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) + } %> + <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> + <% end %> + + <% friends = @user.friends %> + <% nearby = @user.nearby - friends %> +
+ +
+

<%= t ".my friends" %>

+ + <% if friends.empty? %> + <%= t ".no friends" %> + <% else %> + +
+ <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> +
+ <% end %> + +
+ +

<%= t ".nearby users" %>

+ + <% if nearby.empty? %> + <%= t ".no nearby users" %> + <% else %> + +
+ <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> +
+ <% end %> +
+ <% end %> +
diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 946c6ce17..4080b8f95 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -23,31 +23,33 @@ <%= render :partial => "location", :object => diary_entry %> <% end %> - +
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 80561cbbf..6803c761e 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -6,19 +6,21 @@ <% end %>

<%= @title %>

- + <% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index a20474b57..192b07614 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -90,6 +90,7 @@
+ <%= link_to t("users.show.my_dashboard"), dashboard_path, :class => "dropdown-item" %> <%= link_to inbox_messages_path, :class => "dropdown-item" do %> <%= t("users.show.my messages") %> <%= number_with_delimiter(current_user.new_messages.size) %> diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 7a0ca0ed7..816f90c70 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -45,6 +45,7 @@

<%= t "layouts.intro_text" %>

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

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index f495193a6..e127cc5b5 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -40,6 +40,7 @@

<%= t ".partners_title", :locale => @locale %>

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

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 44de2ef06..74e096dd1 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -44,14 +44,16 @@ <% if trace.inserted? %> - + <% end %> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index 8955852c1..b0b73c5a0 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -20,18 +20,20 @@ <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %> - + diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index 882eb27b1..8c89c80f3 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -3,10 +3,12 @@

<%= t(".heading_html", :name => link_to(@user_block.user.display_name, user_path(@user_block.user))) %>

- + <% end %> <%= bootstrap_form_for(@user_block) do |f| %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index d686bda10..03bcd3036 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -8,17 +8,19 @@ user_path(@user_block.user)), :block_by => link_to(@user_block.creator.display_name, user_path(@user_block.creator))) %> - + <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index caa7730cb..5aaeabb23 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,245 +1,202 @@ <% content_for :heading do %> -
- <%= user_image @user %> -
+
+
+ <%= user_image @user, :class => "user_image_no_margins" %> +
+

<%= @user.display_name %> <%= role_icons(@user) %>

<% if current_user and @user.id == current_user.id %> -
    -
  • - <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.changesets.size) %> -
    • -
  • - <%= link_to t(".my notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> - <%= number_with_delimiter(current_user.traces.size) %> -
    • -
  • - <%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %> - <%= number_with_delimiter(current_user.diary_entries.size) %> -
    • -
  • - <%= link_to t(".my comments"), diary_comments_path(current_user) %> -
    • -
  • - <%= link_to t(".my settings"), user_account_path(current_user) %> -
    • - - <% if current_user.blocks.exists? %> +
+ <% else %> -
    - -
  • - <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.changesets.size) %> -
    • -
  • - <%= link_to t(".notes"), user_notes_path(@user) %> -
    • -
  • - <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.traces.size) %> -
    • - - - -
  • - <%= link_to t(".send message"), new_message_path(@user) %> -
    • -
  • - <%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %> - <%= number_with_delimiter(@user.diary_entries.size) %> -
    • -
  • - <%= link_to t(".comments"), diary_comments_path(@user) %> -
    • -
  • - <% if current_user and current_user.is_friends_with?(@user) %> - <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> - <% elsif current_user %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> - <% else %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %> - <% end %> -
    • +
+ + <% end %> -

+

- <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %> - <% unless @user.terms_agreed %> - | - <%= t ".ct status" %> - <% if @user.terms_seen? -%> - <%= t ".ct declined" %> - <% else -%> - <%= t ".ct undecided" %> +
+
<%= t ".mapper since" %>
+
<%= l @user.creation_time.to_date, :format => :long %>
+ <% unless @user.terms_agreed %> +
<%= t ".ct status" %>
+
+ <% if @user.terms_seen? -%> + <%= t ".ct declined" %> + <% else -%> + <%= t ".ct undecided" %> + <% end -%> +
<% end -%> - <% end -%> +
-

-
- -
<%= @user.description.to_html %>
- - <% if current_user and @user.id == current_user.id %> -
- <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
- <% end %> -
+ <% if can?(:set_status, User) || can?(:destroy, User) %> + + <% end %> - <% if current_user and current_user.administrator? -%> - - <% end -%> - +
<% end %> -
- <% if current_user and @user.id == current_user.id %> -
- <% if @user.home_lat.nil? or @user.home_lon.nil? %> -
-

<%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %>

-
- <% else %> - <% content_for :head do %> - <%= javascript_include_tag "user" %> - <% end %> - <% user_data = { - :lon => current_user.home_lon, - :lat => current_user.home_lat, - :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) - } %> - <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> - <% end %> - - <% friends = @user.friends %> - <% nearby = @user.nearby - friends %> -
- -
-

<%= t ".my friends" %>

- - <% if friends.empty? %> - <%= t ".no friends" %> - <% else %> -
    -
  • <%= link_to t(".friends_changesets"), friend_changesets_path %>
    • -
  • <%= link_to t(".friends_diaries"), friends_diary_entries_path %>
    • -
-
- <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> -
- <% end %> - -
+
<%= @user.description.to_html %>
-

<%= t ".nearby users" %>

- - <% if nearby.empty? %> - <%= t ".no nearby users" %> - <% else %> -
    -
  • <%= link_to t(".nearby_changesets"), nearby_changesets_path %>
    • -
  • <%= link_to t(".nearby_diaries"), nearby_diary_entries_path %>
    • -
-
- <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %> -
- <% end %> -
- <% end %> -
+<% if current_user and @user.id == current_user.id %> +
+ <%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %> +
+<% end %> diff --git a/config/locales/af.yml b/config/locales/af.yml index 8a3f9d09c..718607c17 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -417,6 +417,19 @@ af: timeout: sorry: Jammer, die lys met opmerkings wat u versoek het, het te lank geneem om op te spoor. + dashboards: + contact: + km away: '%{count}km vêr' + m away: '%{count}m vêr' + popup: + your location: U ligging + nearby mapper: Nabygeleë karteerder + friend: Vriend + show: + no friends: U het nog geen vriende bygevoeg nie. + nearby users: Ander nabygeleë gebruikers + no nearby users: Daar is nog geen ander gebruikers wat sê dat hulle in die nabye + omgewing karteer nie. diary_entries: new: title: Nuwe dagboekinskrywing @@ -1877,12 +1890,6 @@ af: spam score: 'SPAM-telling:' description: Beskrywing user location: Ligging van gebruiker - no friends: U het nog geen vriende bygevoeg nie. - km away: '%{count}km vêr' - m away: '%{count}m vêr' - nearby users: Ander nabygeleë gebruikers - no nearby users: Daar is nog geen ander gebruikers wat sê dat hulle in die nabye - omgewing karteer nie. role: administrator: Hierdie gebruiker is 'n administrateur moderator: Hierdie gebruiker is 'n moderator @@ -1902,10 +1909,6 @@ af: unhide_user: Wys hierdie gebruiker delete_user: Skrap dié Gebruiker confirm: Bevestig - popup: - your location: U ligging - nearby mapper: Nabygeleë karteerder - friend: Vriend account: title: Redigeer rekening my settings: My instellings diff --git a/config/locales/aln.yml b/config/locales/aln.yml index eb0e0132f..7606ac259 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -177,6 +177,18 @@ aln: index: title: Changesets title_user: Changesets nga %{user} + dashboards: + contact: + km away: '%{count}km larg' + m away: '%{count}m larg' + popup: + your location: Vendi juej + nearby mapper: Hartues i aftërt + friend: Shoq + show: + no friends: Hala nuk ke shtue asni shoq. + nearby users: Shfrytëzuesit e tjer që jan afër + no nearby users: Hala nuk ka shfrytëzues që pranon hartimin e aftërt. diary_entries: new: title: Hyrja e re Ditari @@ -1169,11 +1181,6 @@ aln: spam score: 'Piket e Badihavgjive:' description: Përshkrimi user location: Veni i shfrytëzuesit - no friends: Hala nuk ke shtue asni shoq. - km away: '%{count}km larg' - m away: '%{count}m larg' - nearby users: Shfrytëzuesit e tjer që jan afër - no nearby users: Hala nuk ka shfrytëzues që pranon hartimin e aftërt. role: administrator: Ky shfrytëzues asht aministrator moderator: Ky shfrytëzues asht moderator @@ -1193,10 +1200,6 @@ aln: unhide_user: shfaqe kët shfrytzues delete_user: fshije kët shfrytzues confirm: Konfirmo - popup: - your location: Vendi juej - nearby mapper: Hartues i aftërt - friend: Shoq account: title: Ndrysho akountin my settings: Preferencat e mia diff --git a/config/locales/ar.yml b/config/locales/ar.yml index f730c863d..bbdeac735 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -433,6 +433,23 @@ ar: timeout: sorry: عذرا، لقد استغرقت قائمة تعليقات مجموعة التغييرات اللتي طلبتها وقتا طويلا لاستردادها. + dashboards: + contact: + km away: على بعد %{count}كم + m away: على بعد %{count}متر + popup: + your location: مكانك + nearby mapper: مخطط بالجوار + friend: صديق + show: + my friends: أصدقائي + no friends: لم تقم بإضافة أي أصدقاء بعد. + nearby users: مستخدمون آخرون قريبون + no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار. + friends_changesets: مجموعات تغييرات الأصدقاء + friends_diaries: مدخلات مدونات الأصدقاء + nearby_changesets: حزم تغييرات المستخدمين القريبين + nearby_diaries: إدخالات يوميات المستخدمين القريبين diary_entries: new: title: مدخلة يومية جديدة @@ -2107,6 +2124,8 @@ ar: المزيد. need_to_see_terms: تم تعليق دخولك إلى API مؤقتا. الرجاء تسجيل الدخول في واجهة الويب لعرض شروط المساهمة. أنت لا تحتاج إلى موافق،ة لكن يجب عرضها. + settings_menu: + account_settings: إعدادات الحساب oauth: authorize: title: السماح بالوصول إلى حسابك @@ -2267,12 +2286,6 @@ ar: spam score: 'نتيجة السخام:' description: الوصف user location: موقع المستخدم - my friends: أصدقائي - no friends: لم تقم بإضافة أي أصدقاء بعد. - km away: على بعد %{count}كم - m away: على بعد %{count}متر - nearby users: مستخدمون آخرون قريبون - no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار. role: administrator: هذا المستخدم إداري moderator: هذا المستخدم مشرف @@ -2293,15 +2306,7 @@ ar: unhide_user: أظهر هذا المستخدم delete_user: احذف هذا المستخدم confirm: تأكيد - friends_changesets: مجموعات تغييرات الأصدقاء - friends_diaries: مدخلات مدونات الأصدقاء - nearby_changesets: حزم تغييرات المستخدمين القريبين - nearby_diaries: إدخالات يوميات المستخدمين القريبين report: أبلغ عن هذا المستخدم - popup: - your location: مكانك - nearby mapper: مخطط بالجوار - friend: صديق account: title: عدل الحساب my settings: إعداداتي diff --git a/config/locales/arz.yml b/config/locales/arz.yml index cf5bad49c..9a54b84f2 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -150,6 +150,17 @@ arz: index: title: حزم التغييرات title_user: حزم التغييرات بواسطه %{user} + dashboards: + contact: + km away: على بعد %{count}كم + m away: على بعد %{count}متر + popup: + your location: موقعك + nearby mapper: مخطط بالجوار + show: + no friends: لم تقم بإضافه أى أصدقاء بعد. + nearby users: 'مستخدمين بالجوار:' + no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار. diary_entries: new: title: مدخله يوميه جديدة @@ -964,11 +975,6 @@ arz: created from: 'أُنشىء من:' description: الوصف user location: الموقع - no friends: لم تقم بإضافه أى أصدقاء بعد. - km away: على بعد %{count}كم - m away: على بعد %{count}متر - nearby users: 'مستخدمين بالجوار:' - no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار. role: administrator: هذا المستخدم إداري moderator: هذا المستخدم وسيط @@ -987,9 +993,6 @@ arz: unhide_user: أظهر هذا المستخدم delete_user: احذف هذا المستخدم confirm: أكّد - popup: - your location: موقعك - nearby mapper: مخطط بالجوار account: title: عدّل الحساب my settings: إعداداتي diff --git a/config/locales/ast.yml b/config/locales/ast.yml index ab34d740f..d9d02bc25 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -378,6 +378,23 @@ ast: timeout: sorry: Llevó demasiao tiempu baxar la llista de comentarios del conxuntu de cambeos que pidisti. + dashboards: + contact: + km away: a %{count}km de distancia + m away: a %{count}m de distancia + popup: + your location: El to allugamientu + nearby mapper: Mapeador próximu + friend: Amigu + show: + my friends: Los mios amigos + no friends: Entá nun amestasti dengún amigu. + nearby users: Otros usuarios próximos + no nearby users: Entá nun hai otros usuarios que tean mapeando cerca de ti. + friends_changesets: conxuntos de cambios de los amigos + friends_diaries: entraes de diariu de los amigos + nearby_changesets: conxuntos de cambios d'usuarios cercanos + nearby_diaries: entraes de diariu d'usuarios cercanos diary_entries: new: title: Nueva entrada del diariu @@ -2194,12 +2211,6 @@ ast: spam score: 'Puntuación de corréu puxarra:' description: Descripción user location: Allugamientu del usuariu - my friends: Los mios amigos - no friends: Entá nun amestasti dengún amigu. - km away: a %{count}km de distancia - m away: a %{count}m de distancia - nearby users: Otros usuarios próximos - no nearby users: Entá nun hai otros usuarios que tean mapeando cerca de ti. role: administrator: Esti usuariu ye alministrador moderator: Esti usuariu ye moderador @@ -2220,15 +2231,7 @@ ast: unhide_user: Amosar esti usuariu delete_user: Desaniciar esti usuariu confirm: Confirmar - friends_changesets: conxuntos de cambios de los amigos - friends_diaries: entraes de diariu de los amigos - nearby_changesets: conxuntos de cambios d'usuarios cercanos - nearby_diaries: entraes de diariu d'usuarios cercanos report: Informar d'esti usuariu - popup: - your location: El to allugamientu - nearby mapper: Mapeador próximu - friend: Amigu account: title: Editar la cuenta my settings: Les mios preferencies diff --git a/config/locales/az.yml b/config/locales/az.yml index feb24acf6..0e9ebe37a 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -254,6 +254,10 @@ az: timeout: sorry: Bağışlayın, tələb etdiyiniz dəyişikliklər dəstinin siyahısı, çıxarıla bilmək üçün cox böyükdür. + dashboards: + popup: + your location: Yerləşdiyin yer + friend: Dost diary_entries: new: title: Yeni Gündəlik Yazısı @@ -1100,9 +1104,6 @@ az: hide_user: Bu istifadəçini gizlət delete_user: bu istifadəçini sil confirm: Təsdiq et - popup: - your location: Yerləşdiyin yer - friend: Dost account: current email address: 'Hazırki E-Poçt Ünvanı:' openid: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 08524a67e..35fcff6e2 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1,9 +1,10 @@ -# Messages for Belarusian (TaraÅ¡kievica orthography) (беларуская (тарашкевіца)‎) +# Messages for Belarusian (TaraÅ¡kievica orthography) (беларуская (тарашкевіца)) # Exported from translatewiki.net # Export driver: phpyaml # Author: EugeneZelenko # Author: Jim-by # Author: Macofe +# Author: Nieszczarda2 # Author: Red Winged Duck # Author: Renessaince # Author: Wizardist @@ -103,6 +104,7 @@ be-Tarask: language: Мова doorkeeper/application: name: Назва + scopes: Дазволы friend: user: Удзельнік friend: Сябар @@ -284,6 +286,11 @@ be-Tarask: title_comment: Набор зьменаў %{id} - %{comment} way: nodes: Вузлы + nodes_count: + one: '%{count} пункт' + few: '%{count} пункты' + many: '%{count} пунктаў' + other: '%{count} пунктаў' relation: members: Удзельнікі members_count: @@ -359,6 +366,23 @@ be-Tarask: timeout: sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для атрыманьня. + dashboards: + contact: + km away: '%{count}км ад Вас' + m away: '%{count}м ад Вас' + popup: + your location: Вашае месцазнаходжаньне + nearby mapper: Бліжэйшы стваральнік мапаў + friend: Сябар + show: + no friends: Пакуль што Вы не дадалі нікога ў сябры. + nearby users: Іншыя бліжэйшыя карыстальнікі + no nearby users: Няма іншых карыстальнікаў, якія прызнаюць, што займаюцца складаньнем + мапы каля Вас. + friends_changesets: наборы зьменаў сяброў + friends_diaries: запісы сяброўскіх дзёньнікаў + nearby_changesets: наборы зьменаў суседніх удзельнікаў + nearby_diaries: запісы дзёньнікаў суседніх удзельнікаў diary_entries: new: title: Новы запіс у дзёньніку @@ -1093,6 +1117,10 @@ be-Tarask: вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу ‘OpenStreetMap’), на opendatacommons.org і, пры неабходнасьці, на www.creativecommons.org. + credit_3_1_html: Фрагмэнты мапы ў “стандартным стылі” на www.openstreetmap.org + - гэта прадукт OpenStreetMap Foundation з выкарыстаньнем дадзеных OpenStreetMap + згодна з Open Database ліцэнзіяй. Пры выкарыстанні гэтага стылю мапы патрабуецца + такая ж спасылка, як і для дадзеных Open Database. more_title_html: Даведацца болей more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне на нас на старонцы ліцэнзіі @@ -1109,8 +1137,9 @@ be-Tarask: CC BY), а таксама земляў Форарльбэрг і Тыроль (на ўмовах CC BY AT з дапаўненьнямі). contributors_au_html: |- - Аўстралія: Утрымлівае зьвесткі пра прыгарады ад - Аўстралійскага бюро статыстыкі. + Аўстралія: Уключана ці распрацавана з выкарыстаньнем адміністрацыйных граніцаў © + Geoscape Australia + ліцэнзаваных Аўстралійскаю супольнасьцю паводле міжнароднай ліцэнзіі Creative Commons Attribution 4.0 (CC BY 4.0). contributors_ca_html: |- Канада: Утрымлівае зьвесткі GeoBase®, GeoGratis (© Дэпартамэнта прыродных рэсурсаў @@ -1454,12 +1483,6 @@ be-Tarask: spam score: 'Адзнака спаму:' description: Апісаньне user location: Меcцазнаходжаньне ўдзельніка - no friends: Пакуль што Вы не дадалі нікога ў сябры. - km away: '%{count}км ад Вас' - m away: '%{count}м ад Вас' - nearby users: Іншыя бліжэйшыя карыстальнікі - no nearby users: Няма іншых карыстальнікаў, якія прызнаюць, што займаюцца складаньнем - мапы каля Вас. role: administrator: Гэты карыстальнік зьяўляецца адміністратарам moderator: Гэты карыстальнік зьяўляецца мадэратарам @@ -1479,14 +1502,6 @@ be-Tarask: unhide_user: Паказаць гэтага ўдзельніка delete_user: Выдаліць гэтага ўдзельніка confirm: Пацьвердзіць - friends_changesets: наборы зьменаў сяброў - friends_diaries: запісы сяброўскіх дзёньнікаў - nearby_changesets: наборы зьменаў суседніх удзельнікаў - nearby_diaries: запісы дзёньнікаў суседніх удзельнікаў - popup: - your location: Вашае месцазнаходжаньне - nearby mapper: Бліжэйшы стваральнік мапаў - friend: Сябар account: title: Рэдагаваньне рахунку my settings: Мае налады diff --git a/config/locales/be.yml b/config/locales/be.yml index 332d13249..ea12eb8f4 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -414,6 +414,24 @@ be: title_particular: 'Абмеркаванне пакета правак OpenStreetMap #%{changeset_id}' timeout: sorry: Прабачце, спіс пакетаў правак, што Вы запыталі, занадта вялікі для сцягвання. + dashboards: + contact: + km away: '%{count} км ад вас' + m away: '%{count} м ад Вас' + popup: + your location: Ваша месцазнаходжанне + nearby mapper: Карыстальнік + friend: Сябар + show: + my friends: Мае сябры + no friends: Вы пакуль не дадалі нікога ў сябры. + nearby users: 'Карыстальнікі паблізу:' + no nearby users: Пакуль што няма карыстальнікаў, якія пазначылі сваё месцазнаходжанне + паблізу. + friends_changesets: наборы зменаў сяброў + friends_diaries: запісы дзёньнікаў сяброў + nearby_changesets: наборы зменаў удзельнікаў паблізу + nearby_diaries: запісы дзённікаў карыстальнікаў паблізу diary_entries: new: title: Новы запіс дзённіку @@ -2216,13 +2234,6 @@ be: spam score: 'Адзнака спаму:' description: Апісанне user location: Месцазнаходжанне - my friends: Мае сябры - no friends: Вы пакуль не дадалі нікога ў сябры. - km away: '%{count} км ад вас' - m away: '%{count} м ад Вас' - nearby users: 'Карыстальнікі паблізу:' - no nearby users: Пакуль што няма карыстальнікаў, якія пазначылі сваё месцазнаходжанне - паблізу. role: administrator: Гэты карыстальнік з'яўляецца адміністратарам moderator: Гэты карыстальнік з'яўляецца мадэратарам @@ -2243,15 +2254,7 @@ be: unhide_user: Паказаць гэтага карыстальніка delete_user: Выдаліць гэтага карыстальніка confirm: Пацвердзіць - friends_changesets: наборы зменаў сяброў - friends_diaries: запісы дзёньнікаў сяброў - nearby_changesets: наборы зменаў удзельнікаў паблізу - nearby_diaries: запісы дзённікаў карыстальнікаў паблізу report: Паскардзіцца на гэтага карыстальніка - popup: - your location: Ваша месцазнаходжанне - nearby mapper: Карыстальнік - friend: Сябар account: title: Правіць рахунак my settings: Мае настройкі diff --git a/config/locales/bg.yml b/config/locales/bg.yml index a6f3e359e..baf3b593f 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1,6 +1,7 @@ # Messages for Bulgarian (български) # Exported from translatewiki.net # Export driver: phpyaml +# Author: BennyZ2304 # Author: DCLXVI # Author: Kareyac # Author: Lyubomirv @@ -391,6 +392,19 @@ bg: timeout: sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда твърде дълго. + dashboards: + contact: + km away: '%{count} км от вас' + m away: '%{count} м от вас' + popup: + your location: Моето местоположение + nearby mapper: Картографи в близост + friend: Приятел + show: + my friends: Моите приятели + no friends: Все още нямате добавени приятели. + nearby users: Други потребители в близост + no nearby users: Все още няма други потребители, които картографират в близост. diary_entries: new: title: Нова публикация в дневника @@ -556,6 +570,7 @@ bg: loading_dock: Товарна рампа marketplace: Пазар monastery: Манастир + money_transfer: Паричен превод motorcycle_parking: Паркинг за мотоцикли music_school: Музикално училище nightclub: Нощен клуб @@ -641,6 +656,7 @@ bg: warehouse: Склад "yes": Сграда club: + sport: Спортен клуб "yes": Клуб craft: blacksmith: Ковач @@ -662,6 +678,7 @@ bg: access_point: Тчока за достъп ambulance_station: Станция за линейки defibrillator: Дефибрилатор + fire_extinguisher: Пожарогасител landing_site: Място за аварийно приземяване phone: Телефон за спешни повиквания water_tank: Цистерна за спешни случаи @@ -780,6 +797,7 @@ bg: miniature_golf: Мини-голф nature_reserve: Природен резерват park: Парк + picnic_table: Маса за излет pitch: Спортна площадка playground: Детска площадка resort: Курорт @@ -1174,8 +1192,8 @@ bg: intro_text: OpenStreetMap е карта на света създадена от хора като вас, за свободно ползване и под отворен лиценз. intro_2_create_account: Създаване на сметка - hosting_partners_html: Хостингът е предоставен от %{ucl}, %{bytemark} и други - %{partners}. + hosting_partners_html: Хостингът се поддържа от %{ucl}, %{fastly}, %{bytemark} + и други %{partners}. partners_ucl: UCL partners_bytemark: Bytemark partners_partners: партньори @@ -1257,10 +1275,22 @@ bg: confirm: heading: Проверете електронна си поща introduction_1: Изпратихме ви писмо за потвърждаване. + press confirm button: Натиснете копчето за потвърждение отдолу, за да активирате + профила си. button: Потвърждаване + success: Профилът е потвърден, благодарим за регистрацията! + already active: Този профил вече е бил потвърден. + unknown token: Този код за потвърждение е изтекъл или не съществува. + reconfirm_html: Ако искате отново да изпратим съобщението за потвърждение, натиснете тук. + confirm_resend: + failure: Потребителят %{name} не е открит. confirm_email: heading: Потвърдете смяната на електронната поща + press confirm button: Натиснете копчето отдолу, за да потвърдите новата си електронна + поща. button: Потвърждаване + success: Промяната на електронна поща е потвърдена! messages: inbox: title: Входящи @@ -1342,8 +1372,15 @@ bg: heading: Смени Парола за %{user} reset: Нулиране на парола flash changed: Паролата е променена успешно. + preferences: + show: + title: Предпочитания + preferred_languages: Предпочитани езици + edit: + cancel: Отказ profiles: edit: + cancel: Отказ image: Изображение gravatar: gravatar: Използване на Gravatar @@ -1357,6 +1394,9 @@ bg: no home location: Не сте избрали своето местоположение. update home location on click: Променяне на моето местоположение при избиране от картата + update: + success: Профилът е обновен. + failure: Неуспешно обновление на профила. sessions: new: title: Влизане @@ -1408,6 +1448,7 @@ bg: shared: markdown_help: headings: Заглавия + link: Препратка text: Текст image: Изображение alt: Алтернативен текст @@ -1459,6 +1500,7 @@ bg: edit: not_public: Не сте посочили вашите редакции да бъдат публични. user_page_link: Потребителска страница + anon_edits_link_text: Разберете защо е така. id_not_configured: iD не е настроен export: title: Изнасяне @@ -1786,6 +1828,7 @@ bg: my profile: Профил my settings: Настройки my comments: Моите коментари + my_preferences: Предпочитания blocks on me: Блокирани от мен blocks by me: Блокирани от мен send message: Изпратете съобщение @@ -1806,31 +1849,24 @@ bg: spam score: 'Оценка за спам:' description: Описание user location: Местоположение - my friends: Моите приятели - no friends: Все още нямате добавени приятели. - km away: '%{count} км от вас' - m away: '%{count} м от вас' - nearby users: Други потребители в близост - no nearby users: Все още няма други потребители, които картографират в близост. role: administrator: Този потребител е администратор moderator: Този потребител е модератор grant: administrator: Позволи администраторски достъп moderator: Позволи модераторски достъп + block_history: Активни блокирания + moderator_history: Блокирания comments: Коментари create_block: Блокиране на този потребител activate_user: Активирай този Потребител deactivate_user: Деактивирай този Потребител confirm_user: Потвърди този Потребител hide_user: Скрий този Потребител + unhide_user: Разкрий този потребител delete_user: Изтриване на този потребител confirm: Потвърдете report: Докладване на потребителя - popup: - your location: Моето местоположение - nearby mapper: Картографи в близост - friend: Приятел account: title: Промяна на профил my settings: Моите настройки @@ -1865,6 +1901,10 @@ bg: one: Страница %{page} (%{first_item} от %{items}) other: Страница %{page} (%{first_item}-%{last_item} от %{items}) summary_no_ip_html: '%{name} създадено на %{date}' + hide: Скрий избраните потребители + empty: Не са открити съвпадащи профили + suspended: + support: поддръжка user_role: grant: confirm: Потвърждаване @@ -1873,6 +1913,11 @@ bg: user_blocks: not_found: back: Обратно към индекс + new: + back: Виж всички блокирания + edit: + title: Промяна на блокирането на %{name} + heading_html: Промяна на блокирането на %{name} revoke: revoke: Анулиране! helper: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 6c2579579..edde5f7c6 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -415,6 +415,14 @@ bn: index: title_all: ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্যের আলোচনা title_particular: 'ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্য #%{changeset_id} আলোচনা' + dashboards: + popup: + your location: আপনার অবস্থান + friend: বন্ধু + show: + my friends: আমার বন্ধুগণ + no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি। + nearby users: কাছাকাছি অন্য ব্যবহারকারী diary_entries: new: title: নতুন দিনলিপির ভুক্তি @@ -1628,9 +1636,6 @@ bn: email address: 'ই-মেইল ঠিকানা:' description: বিবরণ user location: ব্যবহারকারীর অবস্থান - my friends: আমার বন্ধুগণ - no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি। - nearby users: কাছাকাছি অন্য ব্যবহারকারী block_history: সক্রিয় বাধাসমূহ moderator_history: প্রদত্ত বাধাগুলি comments: মন্তব্যসমূহ @@ -1642,9 +1647,6 @@ bn: unhide_user: এই ব্যবহাকারীকে দেখান delete_user: এই ব্যবহাকারীকে অপসারণ করুন confirm: নিশ্চিত করুন - popup: - your location: আপনার অবস্থান - friend: বন্ধু account: title: অ্যাকাউন্ট সম্পাদনা করুন my settings: আমার সেটিংস diff --git a/config/locales/br.yml b/config/locales/br.yml index f08509bcc..34f9b23a0 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -450,6 +450,24 @@ br: title_particular: 'Kaozeadenn hollad cheñchamantoù #%{changeset_id} OpenStreetMap' timeout: sorry: Ho tigarez, re hir eo adtapout ar roll evezhiadennoù ho peus goulennet. + dashboards: + contact: + km away: war-hed %{count} km + m away: war-hed %{count} m + popup: + your location: Ho lec'hiadur + nearby mapper: Kartennour en ardremez + friend: Mignon + show: + edit_your_profile: Aozañ ho profil + my friends: Ma mignoned + no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh. + nearby users: 'Implijerien all tost deoc''h :' + no nearby users: N'eus implijer ebet all en ardremez c'hoazh. + friends_changesets: Strolladoù kemmoù graet gant mignoned + friends_diaries: Enmonedoù deizlevr ar vignoned + nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro + nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro diary_entries: new: title: Enmoned nevez en deizlevr @@ -1617,7 +1635,7 @@ br: flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ? preferences: show: - title: Ma penndibaboù + title: Ma fenndibaboù preferred_editor: Aozer karetañ preferred_languages: 'Yezhoù gwellañ karet :' edit_preferences: Kemmañ ar penndibaboù @@ -2421,7 +2439,7 @@ br: my profile: Ma frofil my settings: ma arventennoù my comments: ma evezhiadennoù - my_preferences: Ma penndibaboù + my_preferences: Ma fenndibaboù blocks on me: Stankadurioù evidon blocks by me: stankadurioù graet ganin edit_profile: Aozañ ar profil @@ -2443,13 +2461,6 @@ br: spam score: 'Notenn evit ar strob :' description: Deskrivadur user location: Lec'hiadur an implijer - edit_your_profile: Aozañ ho profil - my friends: Ma mignoned - no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh. - km away: war-hed %{count} km - m away: war-hed %{count} m - nearby users: 'Implijerien all tost deoc''h :' - no nearby users: N'eus implijer ebet all en ardremez c'hoazh. role: administrator: Ur merour eo an implijer-mañ moderator: Un habaskaer eo an implijer-mañ @@ -2470,15 +2481,7 @@ br: unhide_user: Diguzhat an implijer-mañ delete_user: Dilemel an implijer-mañ confirm: Kadarnaat - friends_changesets: Strolladoù kemmoù graet gant mignoned - friends_diaries: Enmonedoù deizlevr ar vignoned - nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro - nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro report: Disklêriañ an implijer-mañ - popup: - your location: Ho lec'hiadur - nearby mapper: Kartennour en ardremez - friend: Mignon account: title: Aozañ ar gont my settings: Ma arventennoù diff --git a/config/locales/bs.yml b/config/locales/bs.yml index c02030fe7..dac8de0e7 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -250,6 +250,23 @@ bs: timeout: sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za preuzimanje. + dashboards: + contact: + km away: korisnik udaljen %{count}km + m away: '%{count}m daleko' + popup: + your location: VaÅ¡a lokacija + nearby mapper: Obližnji maper + friend: Prijatelj + show: + no friends: Niste dodali nijednog prijatelja. + nearby users: Drugi obližnji korisnici + no nearby users: JoÅ¡ uvijek nema drugih korisnika koji ucrtavaju na kartu u + blizini. + friends_changesets: promjena spiska prijatelja + friends_diaries: unosi u dnevnik prijatelja + nearby_changesets: promjene spiska obližnjih korisnika + nearby_diaries: unosi u dnevnik obližnjih korisnika diary_entries: new: title: Novi unos u dnevnik @@ -1502,12 +1519,6 @@ bs: spam score: 'Spam ocjena:' description: Opis user location: Lokacija boraviÅ¡ta korisnika - no friends: Niste dodali nijednog prijatelja. - km away: korisnik udaljen %{count}km - m away: '%{count}m daleko' - nearby users: Drugi obližnji korisnici - no nearby users: JoÅ¡ uvijek nema drugih korisnika koji ucrtavaju na kartu u - blizini. role: administrator: Ovaj korisnik je administrator moderator: Ovaj korisnik je moderator @@ -1528,14 +1539,6 @@ bs: unhide_user: Otkrij ovog korisnika delete_user: ObriÅ¡i ovog korisnika confirm: Potvrditi - friends_changesets: promjena spiska prijatelja - friends_diaries: unosi u dnevnik prijatelja - nearby_changesets: promjene spiska obližnjih korisnika - nearby_diaries: unosi u dnevnik obližnjih korisnika - popup: - your location: VaÅ¡a lokacija - nearby mapper: Obližnji maper - friend: Prijatelj account: title: Urediti korisnički račun my settings: Moja podeÅ¡avanja diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 1c5630b67..8c964cf39 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -11,6 +11,7 @@ # Author: Eduardo Martinez # Author: El libre # Author: Fitoschido +# Author: Galactic Thrasher # Author: Gemmaa # Author: Grondin # Author: Jaumeortola @@ -199,7 +200,7 @@ ca: sobre la situació, recordeu que el missatge serà visible públicament. Tingueu en compte que no tots els usuaris comprenen l'argot de la comunitat, així que intenteu utilitzar termes comuns. - needs_view: L'usuari necessita connectar-se abans que aquest blocatge es suprimeixi? + needs_view: L'usuari necessita connectar-se abans que aquest blocatge se suprimeixi? user: email_confirmation: La vostra adreça no es mostrarà públicament (vegeu la nostra open data d'OpenStreetMap® estan publicades sota la llicència de base de dades oberta (ODbL) per la ® són dades obertes, publicades sota la Open Data + Commons Open Database License (ODbL) per la Fundació OpenStreetMap (OSMF). intro_2_html: "Sou lliure de copiar, distribuir, comunicar públicament i fer obres derivades de les nostres dades, sempre que especifiqueu que són obra @@ -1917,7 +1939,7 @@ ca: lectors a openstreetmap.org (potser indicant l'adreça completa d'OpenStreetMap), a opendatacommons.org i, si s'escau, a creativecommons.org. credit_3_1_html: "Les tessel·les de mapa en “standard style” a - www.openstreetmap.org són un producte de \nl'OpenStreetMap Foundation usant + www.openstreetmap.org són un producte de \nla FundacióOpenStreetMap usant dades de l'OpenStreetMap \nsota llicència Open Database License. Si useu aquestes tessel·les, afegiu la següent atribució:\n“Base map and data from OpenStreetMap and OpenStreetMap Foundation”." @@ -1929,7 +1951,7 @@ ca: title: Exemple d'atribució d'autoria more_title_html: Saber-ne més more_1_html: |- - Per a més informació sobre com utilitzar les nostres dades i com atribuir-ne l'autorita, visiteu la pàgina de llicència de la OSMF. more_2_html: Encara que les dades d'OpenStreetMap són dades obertes, no podem oferir una API gratuïta a tercers. Vegeu la política @@ -1944,21 +1966,21 @@ ca: Wien (sota CC BY), el Land Voralberg i el Land Tirol (sota CC - BY AT amb correccions.' + BY AT amb correccions).' contributors_au_html: 'Austràlia: Conté dades de PSMA Autralia Limited publicades per Commonwealth of Australia sota els termes de CC BY 4.0.' contributors_ca_html: 'Canadà: conté dades de GeoBase ®, - GeoGratis (© Departament de Recursos Naturals de Canadà), CanVec (© Departament - de Recursos Naturals de Canadà) i StatCan (Divisió de Geografia, Institut - d''Estadística de Canadà).' + GeoGratis (© Departament de Recursos Naturals del Canadà), CanVec (© Departament + de Recursos Naturals del Canadà) i StatCan (Divisió de Geografia, Institut + d''Estadística del Canadà).' contributors_fi_html: 'Finlàndia: Conté dades de la base de dades topogràfica del National Land Survey of Finland i d''altres bases de dades sota la llicència NLSFI.' contributors_fr_html: |- França: conté dades de la - Direction Générale des Impôts. + Direction Générale des Impôts. contributors_nl_html: 'Països Baixos: Conté © dades d''Automotive Navigation Data (AND), 2007 (www.and.com)' contributors_nz_html: 'Nova Zelanda: Conté dades de @@ -1967,17 +1989,17 @@ ca: de Topografia i Cartografia i del Ministeri d''Agricultura, Silvicultura i Alimentació (informació pública d''Eslovènia).' contributors_es_html: |- - Spain: Conté dades de l'Institut Geogràfic Nacional espanyol(IGN) i del Sistema Cartgràfic Nacional (SCNE) + Espanya: Conté dades de l'Institut Geogràfic Nacional espanyol(IGN) i del Sistema Cartogràfic Nacional (SCNE) amb llicència per a reutilització sota CC BY 4.0. contributors_za_html: |- Sud-àfrica: conté dades del Chief Directorate: National Geo-Spatial Information, drets d'autor reservats per l'estat. - contributors_gb_html: 'Regne Unit: Conté dades del Ordnance + contributors_gb_html: 'Regne Unit: Conté dades de l''Ordnance Survey © Drets d''autor de la Corona i de la base de dades 2010-19.' contributors_footer_1_html: |- Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes de l'OpenStreetMap, visiteu la pàgina dedicada als Col·laboradors del wiki d'OSM. + href="https://wiki.openstreetmap.org/wiki/Contributors">Col·laboradors del wiki d'OSM. contributors_footer_2_html: La inclusió de dades a l'OpenStreetMap no implica que el proveïdor original de les dades dona suport a l'OpenStreetMap, proporciona cap garantia o accepta cap responsabilitat. @@ -1990,7 +2012,7 @@ ca: que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si us plau aneu a la pàgina web dedicada al Procediment per eliminar dades protegides pels drets d'autor o empleneu aquest formulari en línia.. + href="https://dmca.openstreetmap.org/">formulari en línia. trademarks_title_html: Marques registrades trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map» són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes @@ -2014,7 +2036,7 @@ ca: els vostres canvis. Podeu configurar les modificacions com a públiques a la vostra %{user_page}. user_page_link: pàgina d'usuari - anon_edits_link_text: Llegeix aquí perquè. + anon_edits_link_text: Llegeix aquí per què. id_not_configured: iD no s'ha configurat no_iframe_support: El vostre navegador no és compatible amb iframes HTML, que són necessàries per a aquesta funcionalitat. @@ -2027,13 +2049,13 @@ ca: map_image: Imatge de mapa (mostra una capa estàndard) embeddable_html: HTML incrustable licence: Llicència - export_details_html: Les dades d'OpenStreetMap són publicades sota el termes + export_details_html: Les dades d'OpenStreetMap són publicades sota els termes de la Open Data Commons Open Database License (ODbL). too_large: advice: 'Si l''exportació anterior falla, proveu-ho amb alguna de les fonts incloses a la llista següent:' - body: Aquesta zona és massa gran per ser exportada com a dades XML d'OpenStreetMap. + body: Aquesta zona és massa gran per a ser exportada com a dades XML d'OpenStreetMap. Feu zoom, seleccioneu una àrea més petita o useu una de les següents fonts per descarregar quantitats grans de dades. planet: @@ -2112,7 +2134,7 @@ ca: de llistes de correu temàtiques i regionals. forums: title: Fòrums - description: Preguntes i debats per als que prefereixen un estil d'interfície + description: Preguntes i debats per als qui prefereixen un estil d'interfície de tauler d'anuncis. irc: title: IRC @@ -2125,7 +2147,7 @@ ca: url: https://welcome.openstreetmap.org/ title: Per a organitzacions description: Ets amb una organització que vol usar OpenStreetMap? Troba el - que et cal saber a la nostra estoreta de benviguda. + que et cal saber al nostre espai de benvinguda. wiki: url: https://wiki.openstreetmap.org/ title: Wiki d'OpenStreetMap @@ -2150,7 +2172,7 @@ ca: to: A where_am_i: On és això? where_am_i_title: Descriu la localització actual fent servir el motor de cerca - submit_text: Vés-hi + submit_text: Ves-hi reverse_directions_text: Inverteix la direcció key: table: @@ -2251,9 +2273,9 @@ ca: o una via, com ara el nom d'un restaurant o la velocitat màxima d'una carretera. rules: title: Normes - paragraph_1_html: "L'OpenStreetMap té poques les regles formals però esperem + paragraph_1_html: "L'OpenStreetMap té poques les regles formals, però esperem que tots els participants col·laborin i es comuniquin amb la comunitat. - Si voler dur a terme\naltres activitats que no siguin l'edició manual, llegiu + Si voleu dur a terme\naltres activitats que no siguin l'edició manual, llegiu i seguiu les directrius d' \nImportació i \nEdició Automàtica." @@ -2262,12 +2284,12 @@ ca: paragraph_1_html: "OpenStreetMap té diversos recursos per a conèixer aquest projecte, per a plantejar i respondre preguntes, i per a debatre i documentar de forma col·laborativa qüestions de cartografia. \nAjuda. - Ets amb una organització que vol usar OpenStreetMap?Fes - un cop d'ull a la nostra estoreta de benviguda." + Ets amb una organització que vol usar OpenStreetMap?Doneu + un cop d'ull a la nostra zona de benvinguda." start_mapping: Comença a editar el mapa add_a_note: title: No tens temps per editar? Escriu una nota - paragraph_1_html: Si només voleu fer una petita modificació però no disposeu + paragraph_1_html: Si només voleu fer una petita modificació, però no disposeu del temps per registrar-vos i aprendre a editar, deixeu una nota al mapa. paragraph_2_html: 'Només cal que us dirigiu almapa i cliqueu la icona de la nota: . Això afegirà @@ -2279,7 +2301,7 @@ ca: public: Públic (mostrat a la llista de traces i com a punts anònims no ordenats) trackable: Traçable (només compartit com a punts anònims ordenats segons marques temporals) - identifiable: Identificable (mostrat a la llista de traes i com a punts identificables + identifiable: Identificable (mostrat a la llista de traces i com a punts identificables ordenats segons marques temporals) new: upload_trace: Pujar traça GPS @@ -2296,10 +2318,10 @@ ca: upload_failed: No s'ha pogut carregar el GPX. Un administrador ha estat alertat de l'error. Proveu-ho de nou traces_waiting: - one: Teniu %{count} traça esperant en cua per a pujar. Espereu a que aquesta + one: Teniu %{count} traça esperant en cua per a pujar. Espereu que aquesta traça acabi abans de pujar-ne més, per tal de no blocar la cua per a altres usuaris. - other: Teniu %{count} traces esperant en cua per a pujar. Espereu a que aquestes + other: Teniu %{count} traces esperant en cua per a pujar. Espereu que aquestes traces acabin abans de pujar-ne més, per tal de no blocar la cua per a altres usuaris. edit: @@ -2395,7 +2417,7 @@ ca: web per obtenir més informació. need_to_see_terms: El vostre accés a l'API està suspès temporalment. Inicieu sessió a la interfície web per veure les condicions de col·laboració. No cal - cal que les accepteu, però sí que les llegiu. + que les accepteu, però sí que les llegiu. settings_menu: account_settings: Paràmetres del compte oauth1_settings: Paràmetres OAuth 1 @@ -2444,7 +2466,7 @@ ca: show: title: Detalls OAuth per %{app_name} key: 'Clau de consumidor:' - secret: 'Pregunta secret del consumidor:' + secret: 'Pregunta secreta del consumidor:' url: 'URL del testimoni de sol·licitud:' access_url: 'URL del testimoni d''accés:' authorize_url: 'Autoritzeu URL:' @@ -2495,7 +2517,7 @@ ca: new: title: Registra una aplicació nova edit: - title: Editeu la vostre aplicació + title: Editeu la vostra aplicació show: edit: Edita delete: Esborra @@ -2539,7 +2561,7 @@ ca: header: Lliure i editable html: |-

A diferència d'altres mapes, OpenStreetMap el crea gent com vós i qualsevol persona el pot modificar, actualitzar, descarregar i usar.

-

Registreu-vos i comenceu a col·laborar. Us enviarem un e-mail per confirmar el vostre compte.

+

Registreu-vos i comenceu a col·laborar. Us enviarem un e-mail per a confirmar el vostre compte.

email address: 'Adreça de correu:' confirm email address: 'Confirmeu l''adreça de correu electrònic:' display name: 'Nom que es mostrarà:' @@ -2560,8 +2582,8 @@ ca: contributor_terms_explain: Aquest acord regula els termes de les vostres contribucions actuals i futures. read_ct: He llegit les condicions de col·laboració anteriors i hi estic d'acord - tou_explain_html: Aquestes %{tou_link} regulen l'us del lloc web i altres infraestructures - propocionades per l'OSFM. Cliqueu l'enllaç, llegiu el text i accpteu-lo. + tou_explain_html: Aquestes %{tou_link} regulen l'ús del lloc web i altres infraestructures + proporcionades per l'OSFM. Cliqueu l'enllaç, llegiu el text i accepteu-lo. read_tou: He llegit i accepto les condicions d'us consider_pd: A més de tot l'anterior, accepto que les meves contribucions siguin de domini públic @@ -2615,22 +2637,13 @@ ca: ct status: 'Termes de col·laboració:' ct undecided: No decidit ct declined: Rebutjat - latest edit: 'Darrer edició fa (%{ago}):' + latest edit: 'Darrera edició fa (%{ago}):' email address: 'Adreça de correu:' created from: 'Creat a partir de:' status: 'Estat:' - spam score: 'Puntuació Spam:' + spam score: 'Puntuació de contingut brossa:' description: Descripció user location: Ubicació de l'usuari - no_home_location_html: '%{edit_profile_link} i establiu la ubicació de casa - vostra per veure usuaris propers.' - edit_your_profile: Editeu el vostre perfil - my friends: Les meves amistats - no friends: Encara no has afegit cap amic. - km away: '%{count}km de distància' - m away: '%{count}m de distància' - nearby users: Altres usuaris propers - no nearby users: Cap usuari manifesta cartografiar a prop. role: administrator: Aquest usuari és administrador moderator: Aquest usuari és moderador @@ -2651,15 +2664,7 @@ ca: unhide_user: No amaguis aquest usuari delete_user: Suprimeix aquest usuari confirm: Confirma - friends_changesets: conjunts de canvis dels vostres amics - friends_diaries: entrades de diari dels vostres amics - nearby_changesets: conjunts de canvis d'usuaris propers - nearby_diaries: entrades de diari d'usuaris propers report: Denuncieu aquest usuari - popup: - your location: La vostra ubicació - nearby mapper: Cartògraf proper - friend: Amic account: title: Edita el compte my settings: Preferències @@ -2699,7 +2704,7 @@ ca: save changes button: Desa els canvis make edits public button: Fes totes les meves modificacions públiques flash update success confirm needed: Informació de l'usuari ha actualitzat correctament. - Comproveu el vostre correu per confirmar la vostra adreça de correu electrònic + Comproveu el vostre correu per a confirmar la vostra adreça de correu electrònic nova. flash update success: Informació de l'usuari ha actualitzat correctament. set_home: @@ -2744,7 +2749,7 @@ ca: Utilitzant el formulari de sota. option_2: |- Si ja teniu un compte, podeu iniciar sessió al vostre compte - utilitzant el vostre nom d'usuari i contrasenya i, a continuació associar el compte amb el ID a la configuració d'usuari. + utilitzant el vostre nom d'usuari i contrasenya i, a continuació associar el compte amb l'ID a la configuració d'usuari. user_role: filter: not_a_role: La cadena `%{role}' no és un rol vàlid. @@ -2757,8 +2762,8 @@ ca: heading: Confirmi la concessió de rol are_you_sure: Esteu segur que voleu concedir el paper "%{role}" a l'usuari "%{name}"? confirm: Confirma - fail: Podria concedeix paper "%{role}" a l'usuari "%{name}". Si us plau, comproveu - que l'usuari i el paper són vàlids. + fail: No s'ha pogut concedir el rol "%{role}" a l'usuari "%{name}". Comproveu + que l'usuari i el rol són vàlids. revoke: title: Confirmar revocació de rol heading: Confirmar revocació de rol @@ -2795,8 +2800,8 @@ ca: create: try_contacting: Si us plau, intentar contactar-se amb l'usuari abans de blocatge d'ells i donar-los un termini raonable per respondre. - try_waiting: Si us plau tracti de donar l'usuari d'un termini raonable per respondre - abans de blocatge d'ells. + try_waiting: Mireu de donar a l'usuari un termini raonable per respondre abans + de bloquejar-lo. flash: Crear un bloc a l'usuari %{name}. update: only_creator_can_edit: Només el moderador que ha creat aquest bloc pot editar-lo. @@ -2804,11 +2809,11 @@ ca: index: title: Blocs de l'usuari heading: Llista de quadres de l'usuari - empty: No hi ha blocs s'han fet encara. + empty: Encara no s'ha fet cap bloc. revoke: title: Revocació de bloc en %{block_on} heading_html: Revocació de bloc en %{block_on} %{block_by} - time_future: Aquest bloc va a acabar en %{time}. + time_future: Aquest blocatge acabarà en %{time}. past: Aquest blocatge va acabar a %{time} i ara no es pot revocar. confirm: Esteu segur que voleu revocar aquest bloc? revoke: Revoca! @@ -2842,7 +2847,7 @@ ca: blocks_by: title: Blocs %{name} heading_html: Llista de blocs %{name} - empty: '%{name} no ha fet cap blocs encara.' + empty: '%{name} no ha fet cap bloc encara.' show: title: '%{block_on} blocat per %{block_by}' heading_html: '%{block_on} blocat per %{block_by}' @@ -2869,8 +2874,8 @@ ca: status: Estat revoker_name: Revocat per showing_page: Pàgina %{page} - next: Endavant » - previous: « Enrere + next: Següent » + previous: « Anterior notes: index: title: Notes enviades o comentades per %{user} @@ -2898,10 +2903,10 @@ ca: scale: 'Escala:' image_dimensions: La imatge mostrarà la capa estàndard a %{width} x %{height} download: Descàrrega - short_url: URL curta + short_url: URL curt include_marker: Inclou el marcador center_marker: Centra el mapa al marcador - paste_html: Engnaxa l'HTML per inserir-ho a un lloc web + paste_html: Enganxa l'HTML per inserir-ho a un lloc web view_larger_map: Mostra un mapa més gran only_standard_layer: Només la capa estàndard es pot exportar com a imatge embed: @@ -2946,7 +2951,7 @@ ca: opnvkarte: Tessel·les cortesia de MeMoMaps hotosm: L'estil de les tessel·les fet per Humanitarian OpenStreetMap Team hostatjat per OpenStreetMap - France + França site: edit_tooltip: Modifica el mapa edit_disabled_tooltip: Augmenteu el zoom per modificar el mapa @@ -2955,7 +2960,7 @@ ca: map_notes_zoom_in_tooltip: Feu zoom per veure les notes del mapa map_data_zoom_in_tooltip: Feu zoom per veure les dades del mapa queryfeature_tooltip: Consulta característiques - queryfeature_disabled_tooltip: Apropeu-vos per consultar característiques + queryfeature_disabled_tooltip: Apropeu-vos per a consultar característiques changesets: show: comment: Comentari @@ -2965,7 +2970,7 @@ ca: unhide_comment: mostrar notes: new: - intro: Heu trobat un error o bé hi falta res? Informeu-ne a d'altres col·laboradors + intro: Heu trobat un error o bé hi falta res? Informeu-ne a altres col·laboradors per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta i escriviu-hi una anotació per tal de descriure el problema. advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa, @@ -3055,7 +3060,7 @@ ca: stay_roundabout_without_exit: Segueix a la rotonda - %{name} start_without_exit: Comença a %{name} destination_without_exit: Arriba a la destinació. - against_oneway_without_exit: Anar en contra-direcció a %{name} + against_oneway_without_exit: Anar contra direcció a %{name} end_oneway_without_exit: Fi del sentit únic a %{name} roundabout_with_exit: A la rotonda, agafar la sortida %{exit} a %{name} roundabout_with_exit_ordinal: A la rotonda agafeu la sortida %{exit} cap a @@ -3116,7 +3121,7 @@ ca: not_empty: La redacció no és buida. Si us plau, desfeu totes les versions que pertanyen a aquesta redacció abans de destruir-la. flash: Redacció suprimida - error: Ha hagut un error en suprimir aquesta redacció. + error: Hi ha hagut un error en suprimir aquesta redacció. validations: leading_whitespace: té un espai en blanc davant trailing_whitespace: té un espai en blanc al final diff --git a/config/locales/ce.yml b/config/locales/ce.yml index e272a6f3c..d32c4a4ab 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -341,6 +341,11 @@ ce: index: title_all: OpenStreetMap тӀехь дина нисдарийн дийцар title_particular: 'OpenStreetMap #%{changeset_id} тӀехь дина нисдарийн дийцар' + dashboards: + popup: + friend: ДоттагӀ + show: + my friends: ДоттагӀий diary_entries: new: title: Керла дӀайаздар дневник чохь @@ -955,10 +960,7 @@ ce: spam score: 'Спаман маххадор:' description: Цуьнах лаьцна user location: Декъашхо волу/йолу меттиг - my friends: ДоттагӀий report: Хаамбе хӀокху декъашхох - popup: - friend: ДоттагӀ account: current email address: 'Карара электронан поштан адрес:' openid: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index facaaba6f..a78363fc0 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1,6 +1,7 @@ # Messages for Czech (čeÅ¡tina) # Exported from translatewiki.net # Export driver: phpyaml +# Author: AlesFiala2002 # Author: Bilbo # Author: Bilykralik16 # Author: Chmee2 @@ -8,6 +9,7 @@ # Author: DemonioCZ # Author: DoubyCz # Author: Dvorapa +# Author: Fraxinus.cs # Author: H4nek # Author: Ilimanaq29 # Author: JAn Dudík @@ -479,6 +481,28 @@ cs: timeout: sorry: Omlouváme se, ale vámi požadované komentáře k sadě změn se načítaly příliÅ¡ dlouho. + dashboards: + contact: + km away: '%{count} km' + m away: '%{count} m' + popup: + your location: VaÅ¡e poloha + nearby mapper: Nedaleký uživatel + friend: Přítel + show: + title: Moje nástěnka + no_home_location_html: '%{edit_profile_link} a nastavte si domovskou lokaci, + abyste viděli uživatele ve vaÅ¡em okolí.' + edit_your_profile: Upravte si profil + my friends: Moji přátelé + no friends: Zatím jste nepřidali žádné přátele. + nearby users: Další uživatelé poblíž + no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko + vás. + friends_changesets: sady změn přátel + friends_diaries: záznamy v denících přátel + nearby_changesets: sady změn uživatelů poblíž + nearby_diaries: záznamy v denících uživatelů poblíž diary_entries: new: title: Nový záznam do deníku @@ -814,6 +838,7 @@ cs: window_construction: Konstrukce oken winery: Vinařství "yes": Řemeslná dílna + crossing: Přechod emergency: access_point: Přístupový bod ambulance_station: StanoviÅ¡tě záchranné služby @@ -1069,6 +1094,7 @@ cs: hill: Kopec hot_spring: Horké prameny island: Ostrov + isthmus: Pevninská šíje land: Země marsh: Mokřina moor: VřesoviÅ¡tě @@ -1083,10 +1109,13 @@ cs: sand: Písčiny scree: Osyp scrub: RumiÅ¡tě + shingle: Oblázky spring: Pramen stone: Kámen strait: Úžina tree: Strom + tree_row: Alej + tundra: Tundra valley: Údolí volcano: Sopka water: Vodní plocha @@ -1483,8 +1512,10 @@ cs: intro_text: OpenStreetMap je mapa světa, vytvořená lidmi jako vy a volně využitelná pod otevřenou licencí. intro_2_create_account: Vytvořit uživatelský účet - hosting_partners_html: Hosting podporují %{ucl}, %{bytemark}, a další %{partners}. + hosting_partners_html: Hosting podporují %{ucl}, %{fastly}, %{bytemark} a další + %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partneři tou: Podmínky užití @@ -1945,10 +1976,9 @@ cs: Nebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na creativecommons.org. credit_3_1_html: "Mapové dlaždice ve “standardním stylu” na www.openstreetmap.org - jsou \nvytvořeny OpenStreetMap Foundation s pomocí OpenStreetMap dat \npod - Open Database License. Pokud používáte tyto dlaždice, použijte\nnásledující - uvedení zdroje:\n“Podkladová mapa a data od OpenStreetMap a OpenStreetMap - Foundation”." + jsou \nvytvořeny organizací OpenStreetMap Foundation s pomocí dat z OpenStreetMap + \npod licencí Open Database License. Při používání tohoto stylu mapy je + vyžadováno uvedení stejného zdroje jako u mapových dat." credit_4_html: |- U interaktivní elektronické mapy by autorství mělo být uvedeno v rohu mapy. Příklad: @@ -1971,8 +2001,11 @@ cs: BY), země Vorarlbersko a země Tyrolsko (pod CC BY AT s dodatky).' - contributors_au_html: 'Austrálie: Obsahuje data předměstí - založená na datech Australského statistického úřadu.' + contributors_au_html: 'Austrálie: Zahrnuje nebo využívá Administrative + Boundaries © Geoscape + Australia, které Commonwealth of Australia poskytuje za podmínek licence Creative + Commons Uveďte původ 4.0 Mezinárodní (CC BY 4.0).' contributors_ca_html: 'Kanada: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics @@ -2153,7 +2186,7 @@ cs: desktop_html: Potlatch můžete stále používat stažením desktopové aplikace pro Mac a Windows. id_html: Nebo si můžete jako preferovaný editor nastavit iD, které běží ve webovém - prohlížeči tak, jak dříve fungoval Potlatch. Nastavení + prohlížeči tak, jak dříve fungoval Potlatch. Preference můžete změnit zde. sidebar: search_results: Výsledky hledání @@ -2410,6 +2443,7 @@ cs: do webového rozhraní a přečtěte si Podmínky pro přispěvatele. Nemusíte je odsouhlasit, musíte si je ale zobrazit. settings_menu: + account_settings: Nastavení účtu oauth1_settings: Nastavení OAuth 1 oauth2_applications: Aplikace OAuth 2 oauth2_authorizations: Autorizace OAuth 2 @@ -2612,6 +2646,7 @@ cs: my settings: Moje nastavení my comments: Moje komentáře my_preferences: Moje preference + my_dashboard: Moje nástěnka blocks on me: Moje zablokování blocks by me: Zablokování mnou edit_profile: Upravit profil @@ -2633,16 +2668,6 @@ cs: spam score: 'Spam skóre:' description: Popis user location: Poloha uživatele - no_home_location_html: '%{edit_profile_link} a nastavte si domovskou lokaci, - abyste viděli uživatele ve vaÅ¡em okolí.' - edit_your_profile: Upravte si profil - my friends: Moji přátelé - no friends: Zatím jste nepřidali žádné přátele. - km away: '%{count} km' - m away: '%{count} m' - nearby users: Další uživatelé poblíž - no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko - vás. role: administrator: Tento uživatel je správce moderator: Tento uživatel je moderátor @@ -2663,15 +2688,7 @@ cs: unhide_user: Zobrazit tohoto uživatele delete_user: Odstranit tohoto uživatele confirm: Potvrdit - friends_changesets: sady změn přátel - friends_diaries: záznamy v denících přátel - nearby_changesets: sady změn uživatelů poblíž - nearby_diaries: záznamy v denících uživatelů poblíž report: Nahlásit tohoto uživatele - popup: - your location: VaÅ¡e poloha - nearby mapper: Nedaleký uživatel - friend: Přítel account: title: Upravit účet my settings: Moje nastavení diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 496926d72..963ec0bf0 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -308,6 +308,22 @@ cy: index: title_all: Trafodaeth OpenStreetMa o'r setiau-newid title_particular: 'Trafodaeth OpenStreetMap set-newid #%{changeset_id}' + dashboards: + contact: + km away: '%{count}km i ffwrdd' + m away: '%{count}m i ffwrdd' + popup: + your location: Eich lleoliad + nearby mapper: Mapiwr gerllaw + friend: Cyfaill + show: + no friends: Nid ydych wedi ychwanegu cyfaill eto. + nearby users: Defnyddwyr eraill gerllaw + no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto. + friends_changesets: setiau-newid eich cyfeillion + friends_diaries: cofnodion dyddiaduron cyfeillion + nearby_changesets: setiau-newid gerllaw + nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw diary_entries: new: title: Cofnod Dyddiadur Newydd @@ -1455,11 +1471,6 @@ cy: status: 'Statws:' description: Disgrifiad user location: Lleoliad defnyddiwr - no friends: Nid ydych wedi ychwanegu cyfaill eto. - km away: '%{count}km i ffwrdd' - m away: '%{count}m i ffwrdd' - nearby users: Defnyddwyr eraill gerllaw - no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto. role: administrator: Mae'r defnyddiwr hwn yn weinyddwr. moderator: Mae'r defnyddiwr hwn yn gymedrolwr. @@ -1472,14 +1483,6 @@ cy: unhide_user: Datguddio'r Defnyddiwr delete_user: Dileu'r Defnyddiwr confirm: Cadarnhau - friends_changesets: setiau-newid eich cyfeillion - friends_diaries: cofnodion dyddiaduron cyfeillion - nearby_changesets: setiau-newid gerllaw - nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw - popup: - your location: Eich lleoliad - nearby mapper: Mapiwr gerllaw - friend: Cyfaill account: title: Golygu'r cyfrif my settings: Fy ngosodiadau diff --git a/config/locales/da.yml b/config/locales/da.yml index 38ae01445..fd77974b9 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1,6 +1,7 @@ # Messages for Danish (dansk) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Antonla # Author: Brufnus # Author: Christian List # Author: Dargelf @@ -446,6 +447,24 @@ da: timeout: sorry: Desværre tog det for lang tid at indlæse kommentarerne til ændringssættet du har bedt om. + dashboards: + contact: + km away: '%{count}km væk' + m away: '%{count}m væk' + popup: + your location: Din position + nearby mapper: Bruger i nærheden + friend: Ven + show: + my friends: Mine venner + no friends: Du har ikke tilføjet nogle venner endnu. + nearby users: 'Andre brugere i nærheden:' + no nearby users: Der er ingen andre brugere der har angivet at de kortlægger + i nærheden. + friends_changesets: venners ændringssæt + friends_diaries: venners blogindlæg + nearby_changesets: ændringssæt af brugere i nærheden + nearby_diaries: blogindlæg af brugere i nærheden diary_entries: new: title: Nyt blogindlæg @@ -774,6 +793,7 @@ da: window_construction: Vinduessnedker winery: VingÃ¥rd "yes": HÃ¥ndsværksbutik + crossing: Fodgængerfelt emergency: access_point: Redningspunkt ambulance_station: Ambulancestation @@ -990,12 +1010,12 @@ da: telescope: Teleskop tower: TÃ¥rn utility_pole: Elmast - wastewater_plant: Affaldsfabrik + wastewater_plant: Vandrensningsanlæg watermill: Vandmølle water_tap: Vandaftapning water_tower: VandtÃ¥rn water_well: Brønd - water_works: Vandanlæg + water_works: Vandværk windmill: Vindmølle works: Fabrik "yes": Menneskeskabt @@ -1029,6 +1049,7 @@ da: hill: Bakke hot_spring: Varm kilde island: Ø + isthmus: Landtange land: Land marsh: Marsk moor: Bjerghede @@ -1043,10 +1064,13 @@ da: sand: Sand scree: Klint scrub: Krat + shingle: Stenstrand spring: Kilde stone: Sten strait: Sund tree: Træ + tree_row: Trærække + tundra: Tundra valley: Dal volcano: Vulkan water: Vand @@ -1444,8 +1468,10 @@ da: intro_text: OpenStreetMap er et kort over verden, skabt af folk som dig og gratis at bruge under en Ã¥ben licens. intro_2_create_account: Opret en brugerkonto - hosting_partners_html: Driften støttes af %{ucl}, %{bytemark} og andre %{partners}. + hosting_partners_html: Driften støttes af %{ucl}, %{fastly}, %{bytemark} og andre + %{partners}. partners_ucl: University College London + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partnere tou: VilkÃ¥r for anvendelse @@ -2539,13 +2565,6 @@ da: spam score: 'Spambedømmelse:' description: Beskrivelse user location: Brugerposition - my friends: Mine venner - no friends: Du har ikke tilføjet nogle venner endnu. - km away: '%{count}km væk' - m away: '%{count}m væk' - nearby users: 'Andre brugere i nærheden:' - no nearby users: Der er ingen andre brugere der har angivet at de kortlægger - i nærheden. role: administrator: Denne bruger er en administrator moderator: Denne bruger er en moderator @@ -2566,15 +2585,7 @@ da: unhide_user: Skjul ikke længere denne bruger delete_user: Slet denne bruger confirm: Bekræft - friends_changesets: venners ændringssæt - friends_diaries: venners blogindlæg - nearby_changesets: ændringssæt af brugere i nærheden - nearby_diaries: blogindlæg af brugere i nærheden report: Rapporter denne bruger - popup: - your location: Din position - nearby mapper: Bruger i nærheden - friend: Ven account: title: Rediger konto my settings: Mine indstillinger diff --git a/config/locales/de.yml b/config/locales/de.yml index fd7247a51..366c14e2d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -509,6 +509,28 @@ de: timeout: sorry: Leider ist die Liste der Kommentare der Änderungssätze, die du angefordert hast, für den Abruf zu lang. + dashboards: + contact: + km away: '%{count} km entfernt' + m away: '%{count} m entfernt' + popup: + your location: Standort + nearby mapper: Mapper in der Nähe + friend: Freund + show: + title: Meine Übersichtsseite + no_home_location_html: '%{edit_profile_link} und leg deine Heimatort fest, um + Benutzer in der Nähe zu sehen.' + edit_your_profile: Bearbeite dein Profil + my friends: Meine Freunde + no friends: Du hast noch keine Freunde hinzugefügt. + nearby users: Mapper in der Nähe + no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner + Nähe angegeben haben. + friends_changesets: Änderungssätze deiner Freunde + friends_diaries: Blogs deiner Freunde + nearby_changesets: Änderungssätze von Benutzern in der Nähe + nearby_diaries: Blogs von Benutzern in der Nähe diary_entries: new: title: Neuer Blogeintrag @@ -843,6 +865,7 @@ de: window_construction: Fensterbauer winery: Weingut "yes": Handwerksgeschäft + crossing: Überquerung emergency: access_point: Zugangspunkt ambulance_station: Rettungswache @@ -1098,6 +1121,7 @@ de: hill: Hügel hot_spring: Heiße Quelle island: Insel + isthmus: Isthmus land: Land marsh: Marsch moor: Moor @@ -1112,10 +1136,13 @@ de: sand: Sand scree: Geröll scrub: Buschland + shingle: Geröll spring: Quelle stone: Findling strait: Meerenge tree: Baum + tree_row: Baumreihe + tundra: Tundra valley: Tal volcano: Vulkan water: Wasser @@ -1518,9 +1545,10 @@ de: intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir und frei verwendbar unter einer offenen Lizenz. intro_2_create_account: Erstelle ein Benutzerkonto - hosting_partners_html: Das Hosting wird von %{ucl}, %{bytemark} und anderen %{partners} - unterstützt. + hosting_partners_html: Das Hosting wird von %{ucl}, %{fastly}, %{bytemark} und + anderen %{partners} unterstützt. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: Partnern tou: Nutzungsbedingungen @@ -2043,8 +2071,11 @@ de: BY AT), des Landes Vorarlberg und des Landes Tirol (lizenziert gemäß CC BY AT samt Erweiterungen zur Lizenz).' - contributors_au_html: 'Australien: Enthält Daten zu Siedlungen, - die auf Daten des Australian Bureau of Statistics basieren.' + contributors_au_html: |- + Australien: Eingebunden oder entwickelt unter Verwendung von administrativen Grenzen © + Geoscape Australia + lizenziert durch den Commonwealth of Australia unter + Creative Commons Attribution 4.0 International Lizenz (CC BY 4.0). contributors_ca_html: 'Kanada: Enthält Daten von GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) und StatCan (Geography @@ -2708,6 +2739,7 @@ de: my settings: Einstellungen my comments: Meine Kommentare my_preferences: Meine Benutzereinstellungen + my_dashboard: Meine Übersichtsseite blocks on me: Erhaltene Sperren blocks by me: Vergebene Sperren edit_profile: Profil bearbeiten @@ -2729,16 +2761,6 @@ de: spam score: 'Spam-Bewertung:' description: Beschreibung user location: Standort des Benutzers - no_home_location_html: '%{edit_profile_link} und leg deine Heimatort fest, um - Benutzer in der Nähe zu sehen.' - edit_your_profile: Bearbeite dein Profil - my friends: Meine Freunde - no friends: Du hast noch keine Freunde hinzugefügt. - km away: '%{count} km entfernt' - m away: '%{count} m entfernt' - nearby users: Mapper in der Nähe - no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner - Nähe angegeben haben. role: administrator: Dieser Benutzer ist ein Administrator moderator: Dieser Benutzer ist ein Moderator @@ -2759,15 +2781,7 @@ de: unhide_user: Benutzer nicht mehr verstecken delete_user: Benutzer löschen confirm: Bestätigen - friends_changesets: Änderungssätze deiner Freunde - friends_diaries: Blogs deiner Freunde - nearby_changesets: Änderungssätze von Benutzern in der Nähe - nearby_diaries: Blogs von Benutzern in der Nähe report: Diesen Benutzer melden - popup: - your location: Standort - nearby mapper: Mapper in der Nähe - friend: Freund account: title: Benutzerkonto bearbeiten my settings: Einstellungen diff --git a/config/locales/diq.yml b/config/locales/diq.yml index 1c416e268..e5d2db786 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -288,6 +288,14 @@ diq: title_friend: Qeydê vurnayışê embazan title_nearby: Nezdıra vurriyayışê setê karberi load_more: Tayêna bar ke + dashboards: + contact: + km away: '%{count} km duriyo' + m away: '%{count} metre nezdiyo' + popup: + your location: Heruna mı + nearby mapper: Xeritoğo emıryan + friend: Embaz diary_entries: new: title: Roceko newe definayış @@ -1023,8 +1031,6 @@ diq: status: 'Weziyet:' description: Şınasnayış user location: Heruna karberi - km away: '%{count} km duriyo' - m away: '%{count} metre nezdiyo' role: administrator: |- Na karber administratora
@@ -1049,10 +1055,6 @@ diq: unhide_user: nê karberi menımnê delete_user: nê karberi esternê confirm: Tesdiq ke - popup: - your location: Heruna mı - nearby mapper: Xeritoğo emıryan - friend: Embaz account: title: Hesabi bıvurne my settings: Eyarê mı diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 248b4c430..ee290903f 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -288,6 +288,22 @@ dsb: load_more: Wěcej zacytaś timeout: sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež sy póžedał, wótwołaś. + dashboards: + contact: + km away: '%{count} km zdalony' + m away: '%{count} m zdalony' + popup: + your location: Twójo městno + nearby mapper: Kartěrowaŕ w bliskosći + friend: Pśijaśel + show: + no friends: Hyšći njejsy žednych pśijaśelow pśidał. + nearby users: Druge wužywarje w bliskosći + no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći. + friends_changesets: Sajźby změnow twójich pśijaśelow + friends_diaries: dnjownikowe zapiski pśijaśelow + nearby_changesets: sajźby změnow wužywarjow w bliskosći + nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći diary_entries: new: title: Nowy zapisk dnjownika @@ -404,6 +420,7 @@ dsb: bench: Ławka bicycle_parking: Zmakanišćo za kólasa bicycle_rental: Pśepóžycarnja kólasow + bicycle_repair_station: Kólaso pórěźaŕnja biergarten: Piwowa zagroda brothel: Bordel bureau_de_change: Zaměnjarnja @@ -496,10 +513,13 @@ dsb: residential: Bydleńske twarjenje retail: Twarjenje drobnego wikowanja school: Šulske twarjenje + static_caravan: bydleński wóz terrace: Terasa train_station: Dwórnišćo university: Uniwersitne twarjenje "yes": Twarjenje + craft: + carpenter: twaŕć emergency: phone: Słup za nuzowe zawołanje highway: @@ -721,7 +741,7 @@ dsb: bakery: Pjakarnja beauty: Parfimerija beverages: Piśowy mark - bicycle: Wobchod za kólasa + bicycle: Kólasaŕnja books: Knigłarnja boutique: Butika butcher: Rěznik @@ -1416,6 +1436,7 @@ dsb: private: Priwatny pśistup destination: Jano za pśigranicujucych construction: Drogi w twari + bicycle_shop: Kólasaŕnja welcome: title: Witaj! introduction_html: Witaj k OpenstreetMap, lichej a wobźěłujobnej kórśe swěta. @@ -1688,11 +1709,6 @@ dsb: spam score: 'Spamowe gódnośenje:' description: Wopisanje user location: Wužywarske městno - no friends: Hyšći njejsy žednych pśijaśelow pśidał. - km away: '%{count} km zdalony' - m away: '%{count} m zdalony' - nearby users: Druge wužywarje w bliskosći - no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći. role: administrator: Toś ten wužywaŕ jo administrator moderator: Toś ten wužywaŕ jo moderator @@ -1713,14 +1729,6 @@ dsb: unhide_user: toś togo wužiwarja pokazaś delete_user: toś togo wužywarja lašowaś confirm: Wobkšuśiś - friends_changesets: Sajźby změnow twójich pśijaśelow - friends_diaries: dnjownikowe zapiski pśijaśelow - nearby_changesets: sajźby změnow wužywarjow w bliskosći - nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći - popup: - your location: Twójo městno - nearby mapper: Kartěrowaŕ w bliskosći - friend: Pśijaśel account: title: Konto wobźěłaś my settings: Móje nastajenja @@ -1967,6 +1975,13 @@ dsb: comment: Komentar edit_help: Pśesuń kórtu do městna, kótarež coš wobźěłaś, powětš tam a klikni pótom how. + directions: + engines: + fossgis_osrm_bike: Kólaso (OSRM) + fossgis_osrm_car: Awto (OSRM) + fossgis_osrm_foot: Pěšy (OSRM) + graphhopper_bicycle: Kólaso (GraphHopper) + graphhopper_foot: Pěšy (GraphHopper) redactions: edit: heading: Redakciju wobźěłaś diff --git a/config/locales/el.yml b/config/locales/el.yml index 534676fd1..682e1d818 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -55,6 +55,9 @@ el: client_application: create: Εγγραφή update: Ενημέρωση + doorkeeper_application: + create: Εγγραφή + update: Ενημέρωση redaction: create: Δημιουργία παράλειψης update: Αποθήκευση παράλειψης @@ -68,7 +71,7 @@ el: errors: messages: invalid_email_address: δεν φαίνεται να είναι έγκυρη διεύθυνση ηλ. ταχυδρομείου - email_address_not_routable: Δεν είναι δρομολογητέο + email_address_not_routable: δεν είναι δρομολογητέο models: acl: Λίστα ελέγχου πρόσβασης changeset: Ομάδα αλλαγών @@ -107,9 +110,18 @@ el: way_tag: Ετικέτα διαδρομής attributes: client_application: - name: Όνομα (Υποχρεωτικό) + name: Όνομα (απαιτείται) + url: URL κύριας εφαρμογής (απαιτείται) callback_url: URL Επανάκλησης support_url: URL Υποστήριξης + allow_read_prefs: ανάγνωση των προτιμήσεων χρήστη + allow_write_prefs: τροποποίηση των προτιμήσεων χρήστη + allow_write_diary: δημιουργία καταχωρήσεων ημερολογίου, σχόλια και δημιουργία + φίλων + allow_write_api: τροποποίηση του χάρτη + allow_read_gpx: ανάγνωση των προσωπικών ιχνών GPS + allow_write_gpx: μεταφόρτωση ιχνών GPS + allow_write_notes: τροποποίηση σημειώσεων diary_comment: body: Κύριο μέρος diary_entry: @@ -118,6 +130,11 @@ el: latitude: Γεωγραφικό πλάτος longitude: Γεωγραφικό μήκος language: Γλώσσα + doorkeeper/application: + name: Όνομα + redirect_uri: Ανακατεύθυνση URIs + confidential: Έμπιστη εφαρμογή; + scopes: Άδειες friend: user: Χρήστης friend: Φίλος @@ -136,27 +153,36 @@ el: message: sender: Αποστολέας title: Θέμα - body: Κύριο μέρος + body: Κύριο σώμα recipient: Παραλήπτης redaction: + title: Τίτλος description: Περιγραφή report: + category: Επιλέξτε μια αιτία για την αναφορά σας details: Παρακαλούμε παράσχετε περισσότερες λεπτομέρειες σχετικά με το πρόβλημα (απαιτείται). user: + auth_provider: Πάροχος αυθεντικοποίησης + auth_uid: UID αυθεντικοποίησης email: Ηλεκτρονικό ταχυδρομείο - email_confirmation: Επιβεβαίωση διεύθυνσης ηλεκτρονικού ταχυδρομείου - new_email: Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου + email_confirmation: Επιβεβαίωση διεύθυνσης email + new_email: Νέα διεύθυνση email active: Ενεργό display_name: Εμφάνιση ονόματος description: Περιγραφή προφίλ home_lat: Γεωγραφικό πλάτος home_lon: Γεωγραφικό μήκος languages: Προτιμώμενες γλώσσες - preferred_editor: Προτιμώμενο πρόγραμμα επεξεργασίας + preferred_editor: Προτιμώμενος επεξεργαστής pass_crypt: Κωδικός pass_crypt_confirmation: Επιβεβαίωση κωδικού help: + doorkeeper/application: + confidential: Η εφαρμογή θα χρησιμοποιηθεί όπου το μυστικό πελάτη μπορεί να + κρατηθεί έμπιστο (οι εγγενείς εφαρμογές κινητών και οι εφαρμογές μονής σελίδας + δεν είναι έμπιστες) + redirect_uri: Χρήση μίας σειράς ανά URI trace: tagstring: διαχωρισμένο με κόμμα user_block: @@ -167,6 +193,10 @@ el: γι' αυτό προσπαθήστε να χρησιμοποιήσετε απλούς και κατανοητούς όρους. needs_view: Πρέπει ο χρήστης να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή; user: + email_confirmation: Η διεύθυνση σας δεν προβάλλεται δημόσια, για περισσότερες + πληροφορίες δείτε την πολιτική + ιδιωτικότητας μας. new_email: (να μην εμφανίζεται ποτέ δημόσια) datetime: distance_in_words_ago: @@ -182,7 +212,7 @@ el: almost_x_years: one: σχεδόν ένα χρόνο πριν other: σχεδόν %{count} χρόνια πριν - half_a_minute: μισό λεπτό πριν + half_a_minute: πριν μισό λεπτό less_than_x_seconds: one: λιγότερο από ένα δευτερόλεπτο πριν other: λιγότερο από %{count} δευτερόλεπτα πριν @@ -213,7 +243,7 @@ el: default: Προεπιλογή (τώρα είναι %{name}) id: name: iD - description: iD (επεξεργαστής εντός του περιηγητή) + description: iD (επεξεργαστής εντός περιηγητή) remote: name: Απομακρυσμένος έλεγχος description: Απομακρυσμένος έλεγχος (JOSM, Potlatch, Merkaartor) @@ -301,6 +331,9 @@ el: title_html: 'Διαδρομή: %{name}' history_title_html: 'Ιστορικό διαδρομής: %{name}' nodes: Κόμβοι + nodes_count: + one: '%{count} κόμβος' + other: '%{count} κόμβοι' also_part_of_html: one: τμήμα της διαδρομής %{related_ways} other: τμήμα των διαδρομών %{related_ways} @@ -331,6 +364,7 @@ el: changeset: ομάδα αλλαγών note: σημείωση timeout: + title: Σφάλμα λήξης χρόνου sorry: Λυπάμαι, τα δεδομένα για το %{type} με αναγνωριστικό %{id}, χρειάστηκαν πολύ χρόνο για να ανακτηθούν. type: @@ -395,7 +429,7 @@ el: no_edits: (χωρίς επεξεργασίες) view_changeset_details: Προβολή λεπτομερειών αλλαγών changesets: - id: Αναγνωριστικό + id: ID saved_at: Αποθηκεύτηκε στις user: Χρήστης comment: Σχόλιο @@ -406,8 +440,8 @@ el: title_friend: Αλλαγές από τους φίλους μου title_nearby: Αλλαγές από κοντινούς χρήστες empty: Δε βρέθηκαν αλλαγές. - empty_area: Δε βρέθηκαν αλλαγές σε αυτήν την περιοχή. - empty_user: Δεν υπάρχουν αλλαγές από αυτόν τον χρήστη. + empty_area: Χωρίς αλλαγές σε αυτήν την περιοχή. + empty_user: Χωρίς αλλαγές από αυτόν τον χρήστη. no_more: Δεν βρέθηκαν άλλες αλλαγές. no_more_area: Δεν υπάρχουν άλλες αλλαγές για αυτήν την περιοχή. no_more_user: Δεν υπάρχουν άλλες αλλαγές από αυτόν τον χρήστη. @@ -427,6 +461,28 @@ el: timeout: sorry: Μας συγχωρείτε, η λίστα των σχολίων της ομάδας αλλαγών που ζητήσατε, χρειάστηκε πολύ χρόνο για να ανακτηθεί. + dashboards: + contact: + km away: '%{count}km μακριά' + m away: '%{count}m μακριά' + popup: + your location: Η τοποθεσία σας + nearby mapper: Κοντινός χαρτογράφος + friend: Φίλος + show: + title: Το ταμπλό μου + no_home_location_html: '%{edit_profile_link} και βάλτε την τοποθεσία σας για + να δείτε κοντινούς χρήστες.' + edit_your_profile: Επεξεργαστείτε το προφίλ σας + my friends: Οι φίλοι μου + no friends: Δεν έχετε προσθέσει φίλους ακόμα. + nearby users: Άλλοι κοντινοί χρήστες + no nearby users: Δεν υπάρχουν άλλοι χρήστες που δήλωσαν ότι χαρτογραφούν κοντά + σας προς το παρόν. + friends_changesets: ομάδες αλλαγών φίλων + friends_diaries: καταχωρήσεις ημερολογίου φίλων + nearby_changesets: ομάδες αλλαγών από κοντινούς χρήστες + nearby_diaries: καταχωρήσεις ημερολογίου από κοντινούς χρήστες diary_entries: new: title: Νέα καταχώρηση ημερολογίου @@ -442,7 +498,7 @@ el: new: Νέα καταχώρηση ημερολογίου new_title: Σύνταξη νέας καταχώρησης στο ημερολόγιό μου my_diary: Το ημερολόγιό μου - no_entries: Δε βρέθηκαν καταχωρήσεις στο ημερολόγιο + no_entries: Χωρίς καταχωρήσεις ημερολογίου recent_entries: Πρόσφατες καταχωρήσεις ημερολογίου older_entries: Παλιότερες καταχωρήσεις newer_entries: Νεότερες καταχωρήσεις @@ -499,11 +555,17 @@ el: comments: has_commented_on: Ο %{display_name} έχει σχολιάσει στις ακόλουθες καταχωρήσεις ημερολογίου + no_comments: Χωρίς σχόλια ημερολογίου post: Καταχώρηση when: Πότε comment: Σχόλιο newer_comments: Νεότερα σχόλια older_comments: Παλαιότερα σχόλια + doorkeeper: + flash: + applications: + create: + notice: Η εφαρμογή καταχωρήθηκε. friendships: make_friend: heading: Προσθήκη του %{user} ως φίλου; @@ -511,6 +573,8 @@ el: success: Ο %{name} είναι τώρα φίλος σου! failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη %{name} ως φίλου. already_a_friend: Είστε ήδη φίλοι με τον χρήστη %{name}. + limit_exceeded: Έκανες πολλούς φίλους τελευταία. Παρακαλώ περίμενε λίγο πριν + προσπαθήσεις να κάνεις περισσότερους φίλους. remove_friend: heading: Αφαίρεση φίλου %{user}; button: Αφαίρεση φίλου @@ -563,6 +627,7 @@ el: bench: Πάγκος bicycle_parking: Στάθμευση ποδηλάτων bicycle_rental: Ενοικίαση ποδηλάτων + bicycle_repair_station: Σταθμός επισκευής ποδηλάτου biergarten: Υπαίθρια μπυραρία blood_bank: Τράπεζα αίματος boat_rental: Ενοικίαση σκαφών @@ -581,6 +646,7 @@ el: clock: Ρολόι college: Κολέγιο community_centre: Κοινοτικό κέντρο + conference_centre: Συνεδριακό κέντρο courthouse: Δικαστήριο crematorium: Κρεματόριο dentist: Οδοντίατρος @@ -600,11 +666,13 @@ el: hospital: Νοσοκομείο hunting_stand: Κυνηγητικό κιόσκι ice_cream: Παγωτό + internet_cafe: Ίντερνετ καφέ kindergarten: Νηπιαγωγείο language_school: Φροντιστήριο ξένων γλωσσών library: Βιβλιοθήκη marketplace: Αγορά monastery: Μοναστήρι + money_transfer: Μεταφορά χρημάτων motorcycle_parking: Χώρος στάθμευσης μοτοσικλετών music_school: Ωδείο nightclub: Νυχτερινό κέντρο @@ -612,6 +680,7 @@ el: parking: Χώρος στάθμευσης parking_entrance: Είσοδος χώρου στάθμευσης parking_space: Χώρος στάθμευσης + payment_terminal: Τερματικό πληρωμών pharmacy: Φαρμακείο place_of_worship: Τόπος λατρείας police: Αστυνομία @@ -620,6 +689,7 @@ el: prison: Φυλακή pub: Παμπ public_bath: Δημόσιο λουτρό + public_bookcase: Δημόσια βιβλιοθήκη public_building: Δημόσιο κτίριο recycling: Σημείο ανακύκλωσης restaurant: Εστιατόριο @@ -636,11 +706,13 @@ el: toilets: Τουαλέτες townhall: Δημαρχείο university: Πανεπιστήμιο + vehicle_inspection: Επιθεώρηση οχήματος vending_machine: Μηχάνημα αυτόματης πώλησης veterinary: Κτηνιατρική Χειρουργική village_hall: Αίθουσα χωριού waste_basket: Καλάθι απορριμμάτων waste_disposal: Διάθεση αποβλήτων + waste_dump_site: Χώρος απόρριψης απορριμάτων water_point: Σημείο ανεφοδιασμού νερού boundary: administrative: Διοικητικό όριο @@ -655,35 +727,50 @@ el: viaduct: Κοιλαδογέφυρα "yes": Γέφυρα building: + apartment: Διαμέρισμα apartments: Διαμερίσματα + barn: Σταύλος + bungalow: Μπάνγκαλοου + cabin: Καμπίνα chapel: Παρεκκλήσι church: Εκκλησία + civic: Πολιτικό κτήριο + college: Πανεπιστημιακό κτήριο commercial: Εμπορικό κτίριο construction: Κτίριο υπό κατασκευή dormitory: Κοιτώνας farm: Αγροικία farm_auxiliary: Βοηθητική αγροικία garage: Γκαράζ + garages: Γκαράζ greenhouse: Θερμοκήπιο + hangar: Υπόστεγο αεροσκαφών hospital: Κτήριο Νοσοκομείου hotel: Ξενοδοχείο house: Σπίτι + hut: Καλύβα industrial: Βιομηχανικό Κτήριο kindergarten: Κτίριο νηπιαγωγείου office: Κτήριο Γραφείων public: Δημόσιο κτήριο residential: Πολυκατοικία + retail: Κτήριο λιανικής school: Σχολικό Κτήριο + static_caravan: Τροχόσπιτο + temple: Κτήριο ναού train_station: Κτίριο Σιδηροδρομικού Σταθμού university: Κτήριο Πανεπιστημίου warehouse: Αποθήκη "yes": Κτίριο + club: + sport: Αθλητικός σύλλογος craft: beekeeper: Μελισσοκόμος blacksmith: Σιδηρουργός brewery: Ζυθοποιείο carpenter: Ξυλουργός electrician: Ηλεκτρολόγος + electronics_repair: Επισκευή ηλεκτρονικών gardener: Κηπουρός handicraft: Χειροκατασκευές painter: Ζωγράφος @@ -691,8 +778,10 @@ el: plumber: Υδραυλικός shoemaker: Τσαγκάρης tailor: Ράφτης + winery: Οινοποιείο "yes": Κατάστημα τεχνών emergency: + access_point: Σημείο Πρόσβασης ambulance_station: Σταθμός ασθενοφόρων assembly_point: Σημείο συγκέντρωσης defibrillator: Απινιδωτής @@ -741,6 +830,7 @@ el: tertiary: Τριτεύων δρόμος tertiary_link: Τριτεύων δρόμος track: Χωματόδρομος + traffic_mirror: Καθρέφτης κυκλοφορίας traffic_signals: Σήματα κυκλοφορίας trunk: Εθνική οδός trunk_link: Εθνική οδός @@ -748,11 +838,14 @@ el: unclassified: Αταξινόμητη οδός "yes": Δρόμος historic: + aircraft: Ιστορικό αεροσκάφος archaeological_site: Αρχαιολογικός χώρος + bomb_crater: Ιστορικός κρατήρας βόμβας battlefield: Πεδίο μάχης boundary_stone: Συνοριακή στήλη building: Ιστορικό κτίριο bunker: Οχυρό + cannon: Ιστορικό κανόνι castle: Κάστρο church: Εκκλησία city_gate: Είσοδος της πόλης @@ -800,6 +893,7 @@ el: quarry: Λατομείο railway: Σιδηρόδρομος recreation_ground: Χώρος αναψυχής + religious: Θρησκευτικό έδαφος reservoir: Ταμιευτήρας reservoir_watershed: Δεξαμενή απορροής υδάτων residential: Κατοικημένη περιοχή @@ -811,6 +905,7 @@ el: beach_resort: Παραθαλάσσιο θέρετρο bird_hide: Καταφύγιο πουλιών common: Κοινόχρηστη γη + dance: Αίθουσα χωρού dog_park: Πάρκο σκύλων firepit: Λάκκος Φωτιάς fishing: Αλιευτική περιοχή @@ -824,6 +919,7 @@ el: miniature_golf: Μίνι γκολφ nature_reserve: Καταφύγιο της φύσης park: Πάρκο + picnic_table: Τραπέζι πικνικ pitch: Γήπεδο αθλητισμού playground: Παιδική χαρά recreation_ground: Χώρος αναψυχής @@ -838,7 +934,9 @@ el: "yes": Ψυχαγωγία man_made: adit: Οριζόντια είσοδος σε ορυχείο + advertising: Διαφήμιση antenna: Κεραία + avalanche_protection: Προστασία χιονοστιβάδας beacon: φάρος beehive: Κυψέλη breakwater: Κυματοθραύστης @@ -854,6 +952,7 @@ el: groyne: Φράγμα kiln: Καμίνι lighthouse: Φάρος + manhole: Ανθρωποθυρίδα mast: Κατάρτι mine: Ορυχείο mineshaft: Φρεάτιο ορυχείου @@ -861,13 +960,17 @@ el: petroleum_well: Γεώτρηση Πετρελαίου pier: Αποβάθρα pipeline: Αγωγός + pumping_station: Αντλιοστάσιο silo: Σιλό + snow_cannon: Κανόνι χιονιού + snow_fence: Χιονοφράχτης storage_tank: Δεξαμενή αποθήκευσης surveillance: Επιτήρηση telescope: Τηλεσκόπιο tower: Πύργος wastewater_plant: Μονάδα επεξεργασίας λυμάτων watermill: Νερόμυλος + water_tap: Βρύση water_tower: Πύργος νερού water_well: Πηγάδι water_works: Έργα Υδάτων @@ -900,6 +1003,7 @@ el: heath: Ακαλλιέργητη γη hill: Λόφος island: Νησί + isthmus: Ισθμός land: Ξηρά marsh: Βάλτος moor: Δέστρα @@ -918,6 +1022,8 @@ el: stone: Πέτρα strait: Πορθμός tree: Δέντρο + tree_row: Σειρά δέντρων + tundra: Τούνδρα valley: Κοιλάδα volcano: Ηφαίστειο water: Νερό @@ -941,6 +1047,10 @@ el: lawyer: Δικηγόρος logistics: Λογιστικό γραφείο ngo: Γραφείο ΜΚΟ + notary: Συμβολαιογράφος + religion: Θρησκευτικό γραφείο + research: Ερευνητικό γραφείο + tax_advisor: Φορολογικός σύμβουλος telecommunication: Γραφείο τηλεπικοινωνιών travel_agent: Ταξιδιωτικό πρακτορείο "yes": Γραφείο @@ -1024,6 +1134,8 @@ el: convenience: Παντοπωλείο copyshop: Κατάστημα φωτοαντιγράφων cosmetics: Κατάστημα καλλυντικών + curtain: Κατάστημα κουρτίνων + dairy: Κατάστημα γαλακτοκομικών deli: Ντελικατέσεν department_store: Πολυκατάστημα discount: Εκπτωτικό κατάστημα @@ -1031,7 +1143,9 @@ el: dry_cleaning: Στεγνό καθάρισμα e-cigarette: Κατάστημα ηλεκτρονικών τσιγάρων electronics: Κατάστημα ηλεκτρονικών + erotic: Κατάστημα ερωτικών ειδών estate_agent: Κτηματομεσίτης + fabric: Κατάστημα υφασμάτων farm: Γεωργικά εφόδια fashion: Κατάστημα μόδας fishing: Κατάστημα ειδών αλιείας @@ -1059,14 +1173,19 @@ el: lottery: Λοταρία mall: Εμπορικό κέντρο massage: Μασάζ + medical_supply: Κατάστημα ιατρικών προμηθειών mobile_phone: Κατάστημα κινητής τηλεφωνίας motorcycle: Κατάστημα μοτοσικλετών + motorcycle_repair: Κατάστημα επισκευής μοτοσυκλετών music: Κατάστημα μουσικής + musical_instrument: Μουσικά όργανα newsagent: Πρακτορείο εφημερίδων + nutrition_supplements: Συμπληρώματα διατροφής optician: Οπτικός organic: Κατάστημα οργανικών τροφίμων outdoor: Υπαίθριο κατάστημα paint: Χρωματοπωλείο + pastry: Ζαχαροπλαστείο pawnbroker: Ενεχυροδανειστής perfumery: Αρωματοπωλείο pet: Κατάστημα κατοικίδιων @@ -1086,6 +1205,7 @@ el: vacant: Κενό κατάστημα variety_store: Κατάστημα ποικιλιών video: Κατάστημα βίντεο + wholesale: Κατάστημα χονδρικής wine: Κατάστημα κρασιών "yes": Κατάστημα tourism: @@ -1134,12 +1254,15 @@ el: "yes": Κανάλι admin_levels: level2: Σύνορα χώρας + level3: Σύνορο περιοχής level4: Σύνορο πολιτείας level5: Σύνορο περιοχής level6: Σύνορο κομητείας + level7: Σύνορο δήμου level8: Σύνορο πόλης level9: Σύνορο χωριού level10: Σύνορο προαστίου + level11: Σύνορο γειτονιάς types: cities: Πόλεις towns: Κωμοπόλεις @@ -1279,9 +1402,10 @@ el: intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης. intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη - hosting_partners_html: Η λειτουργία υποστηρίζεται από %{ucl}, %{bytemark}, και - άλλους %{partners}. + hosting_partners_html: Η φιλοξενία υποστηρίζεται από %{ucl}, %{fastly}, %{bytemark}, + και άλλους %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: συνεργάτες tou: Όροι χρήσης @@ -1309,12 +1433,21 @@ el: hi: Γεια σας %{to_user}, header: 'Ο %{from_user} έχει σχολιάσει την καταχώριση ημερολογίου στο OpenStreetMap με θέμα %{subject}:' + header_html: 'Ο %{from_user} έχει σχολιάσει την καταχώριση ημερολογίου στο OpenStreetMap + με θέμα %{subject}:' footer: Μπορείτε επίσης να διαβάσετε το σχόλιο στο %{readurl} και μπορείτε να σχολιάσετε στο %{commenturl} ή να στείλετε μήνυμα στον συγγραφέα στο %{replyurl} + footer_html: Μπορείτε επίσης να διαβάσετε το σχόλιο στο %{readurl} και μπορείτε + να σχολιάσετε στο %{commenturl} ή να στείλετε μήνυμα στον συγγραφέα στο %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Γεια σας %{to_user}, header: 'Ο χρήστης %{from_user} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap με θέμα %{subject}:' + header_html: 'Ο χρήστης %{from_user} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap + με θέμα %{subject}:' + footer: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} και να στείλετε + μήνυμα στον συγγραφέα στο %{replyurl} footer_html: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} και να στείλετε μήνυμα στον συγγραφέα στο %{replyurl} friendship_notification: @@ -1322,7 +1455,9 @@ el: subject: '[OpenStreetMap] Ο χρήστης %{user} σας πρόσθεσε ως φίλο' had_added_you: Ο χρήστης %{user} σας πρόσθεσε ως φίλο στο OpenStreetMap. see_their_profile: Μπορείτε να δείτε το προφίλ του στο %{userurl}. + see_their_profile_html: Μπορείτε να δείτε το προφίλ του στο %{userurl}. befriend_them: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}. + befriend_them_html: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}. gpx_failure: hi: Γεια σας %{to_user}, failed_to_import: 'Απέτυχε η εισαγωγή. Το σφάλμα είναι:' @@ -1435,6 +1570,7 @@ el: inbox: title: Εισερχόμενα my_inbox: Τα εισερχόμενα μου + my_outbox: Τα εξερχόμενα μου messages: Έχετε %{new_messages} και %{old_messages} new_messages: one: '%{count} νέο μήνυμα' @@ -1469,6 +1605,8 @@ el: body: Λυπάμαι δεν υπάρχει μήνυμα με αυτό το αναγνωριστικό. outbox: title: Εξερχόμενα + my_inbox: Τα εισερχόμενα μου + my_outbox: Τα εξερχόμενα μου messages: one: Έχετε %{count} απεσταλμένο μήνυμα other: Έχετε %{count} απεσταλμένα μηνύματα @@ -1521,12 +1659,30 @@ el: reset: Επαναφορά συνθηματικού flash changed: Το συνθηματικό σας άλλαξε! flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL; + preferences: + show: + title: Οι προτιμήσεις μου + preferred_editor: Προτιμώμενος επεξεργαστής + preferred_languages: Προτιμώμενες γλώσσες + edit_preferences: Επεξεργασία προτιμήσεων + edit: + title: Επεξεργασία προτιμίσεων + save: Ενημέρωση προτιμήσεων + cancel: Ακύρωση + update: + failure: Δεν μπόρεσαν να ενημερωθούν οι προτιμήσεις. + update_success_flash: + message: Οι προτιμήσεις ενημερώθηκαν. profiles: edit: + title: Επεξεργασία προφίλ + save: Ενημέρωση προφίλ + cancel: Ακύρωση image: Εικόνα gravatar: gravatar: Χρήση Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Τί είναι το Gravatar; disabled: 'Το Gravatar έχει απενεργοποιηθεί:' enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας. new image: Προσθήκη εικόνας @@ -1538,6 +1694,9 @@ el: no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας. update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον χάρτη; + update: + success: Το προφίλ ενημερώθηκε. + failure: Δεν μπόρεσε να ενημερωθεί το προφίλ. sessions: new: title: Είσοδος @@ -1594,6 +1753,20 @@ el: title: Αποσύνδεση heading: Αποσύνδεση από το OpenStreetMap logout_button: Αποσύνδεση + shared: + markdown_help: + unordered: Αταξινόμητη λίστα + ordered: Ταξινομημένη λίστα + first: Πρώτο στοιχείο + second: Δεύτερο στοιχείο + link: Σύνδεσμος + text: Κείμενο + image: Εικόνα + alt: Εναλ. κείμενο + url: URL + richtext_field: + edit: Επεξεργασία + preview: Προεπισκόπηση site: about: next: Επόμενη @@ -2116,6 +2289,7 @@ el: ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη σελίδα wiki. upload_trace: Αποστολή ίχνους + all_traces: Όλα τα ίχνη destroy: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή make_public: @@ -2180,6 +2354,11 @@ el: flash: Ανακαλέσατε την αδειοδότηση για το %{application}. permissions: missing: Δεν έχετε επιτρέψει την πρόσβαση εφαρμογής σε αυτήν την λειτουργία + scopes: + write_api: Τροποποίηση του χάρτη + read_gpx: Ανάγνωση προσωπικών ιχνών GPS + write_gpx: Μεταφόρτωση ιχνών GPS + write_notes: Τροποποίηση σημειώσεων oauth_clients: new: title: Καταχώρηση νέας εφαρμογής @@ -2221,6 +2400,28 @@ el: flash: Οι πληροφορίες του πελάτη ενημερώθηκαν με επιτυχία destroy: flash: Η εγγραφή της εφαρμογής πελάτη καταστράφηκε + oauth2_applications: + index: + new: Καταχώρηση νέας εφαρμογής + name: Όνομα + permissions: Άδειες + application: + edit: Επεξεργασία + delete: Διαγραφή + confirm_delete: Διαγραφή αυτής της εφαρμογής; + new: + title: Καταχώρηση νέας εφαρμογής + edit: + title: Επεξεργασία της εφαρμογής σας + show: + edit: Επεξεργασία + delete: Διαγραφή + confirm_delete: Διαγραφή αυτής της εφαρμογής; + client_id: ID πελάτη + client_secret: Μυστικό πελάτη + client_secret_warning: Σιγουρευτείτε ότι θα αποθηκεύσετε αυτό το μυστικό - δεν + θα είναι προσβάσιμο ξανά + permissions: Άδειες users: new: title: Εγγραφή @@ -2296,8 +2497,11 @@ el: my profile: Το Προφίλ Μου my settings: Οι Ρυθμίσεις Μου my comments: Τα Σχόλιά Μου + my_preferences: Οι προτιμήσεις μου + my_dashboard: Το ταμπλό μου blocks on me: Φραγές σε Εμένα blocks by me: Φραγές από Εμένα + edit_profile: Επεξεργασία προφίλ send message: Αποστολή Μηνύματος diary: Ημερολόγιο edits: Επεξεργασίες @@ -2316,13 +2520,6 @@ el: spam score: 'Σκορ Spam:' description: Περιγραφή user location: Τοποθεσία χρήστη - my friends: Οι φίλοι μου - no friends: Δεν έχετε προσθέσει φίλους ακόμα. - km away: '%{count}χλμ μακριά' - m away: '%{count}μ μακριά' - nearby users: Άλλοι κοντινοί χρήστες - no nearby users: Δεν υπάρχουν άλλοι χρήστες που δήλωσαν ότι χαρτογραφούν κοντά - σας προς το παρόν. role: administrator: Αυτός ο χρήστης είναι διαχειριστής moderator: Αυτός ο χρήστης είναι συντονιστής @@ -2343,15 +2540,7 @@ el: unhide_user: Επανεμφάνιση αυτού του λογαριασμού Χρήστη delete_user: Διαγραφή αυτού του Χρήστη confirm: Επιβεβαίωση - friends_changesets: ομάδες αλλαγών φίλων - friends_diaries: καταχωρήσεις ημερολογίου φίλων - nearby_changesets: ομάδες αλλαγών από κοντινούς χρήστες - nearby_diaries: καταχωρήσεις ημερολογίου από κοντινούς χρήστες report: Αναφορά αυτού του χρήστη - popup: - your location: Η τοποθεσία σας - nearby mapper: Κοντινός χαρτογράφος - friend: Φίλος account: title: Επεξεργασία λογαριασμού my settings: Οι ρυθμίσεις μου @@ -2416,6 +2605,7 @@ el: suspended: title: Ο Λογαριασμός έχει Ανασταλεί heading: Ο Λογαριασμός έχει Ανασταλεί + support: υποστήριξη body_html: |-

Λυπάμαι, ο λογαριασμός σας έχει αυτόματα ανασταλεί λόγω @@ -2572,6 +2762,7 @@ el: title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user} heading: σημειώσεις του %{user} subheading_html: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user} + no_notes: Χωρίς σημειώσεις id: Αναγνωριστικό creator: Δημιουργός description: Περιγραφή @@ -2678,12 +2869,12 @@ el: directions: ascend: Ανάβαση engines: - fossgis_osrm_bike: Με ποδήλατο (OSRM) + fossgis_osrm_bike: Ποδήλατο (OSRM) fossgis_osrm_car: Αυτοκίνητο (OSRM) - fossgis_osrm_foot: Με τα πόδια (OSRM) + fossgis_osrm_foot: Πόδια (OSRM) graphhopper_bicycle: Ποδήλατο (GraphHopper) - graphhopper_car: Με τα πόδια (GraphHopper) - graphhopper_foot: Με τα πόδια (GraphHopper) + graphhopper_car: Αυτοκίνητο (GraphHopper) + graphhopper_foot: Πόδια (GraphHopper) descend: Κατάβαση directions: Οδηγίες distance: Απόσταση diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 4be9b4510..c29c3be4e 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -422,6 +422,22 @@ en-GB: timeout: sorry: Sorry, the list of changeset comments you requested took too long to retrieve. + dashboards: + contact: + km away: '%{count}km away' + m away: '%{count}m away' + popup: + your location: Your location + nearby mapper: Nearby mapper + friend: Friend + show: + no friends: You have not added any friends yet. + nearby users: Other nearby users + no nearby users: There are no other users who admit to mapping nearby yet. + friends_changesets: friends' changesets + friends_diaries: friends' diary entries + nearby_changesets: nearby user changesets + nearby_diaries: nearby user diary entries diary_entries: new: title: New Diary Entry @@ -2112,11 +2128,6 @@ en-GB: spam score: 'Spam Score:' description: Description user location: User location - no friends: You have not added any friends yet. - km away: '%{count}km away' - m away: '%{count}m away' - nearby users: Other nearby users - no nearby users: There are no other users who admit to mapping nearby yet. role: administrator: This user is an administrator moderator: This user is a moderator @@ -2137,14 +2148,6 @@ en-GB: unhide_user: Unhide this User delete_user: Delete this User confirm: Confirm - friends_changesets: friends' changesets - friends_diaries: friends' diary entries - nearby_changesets: nearby user changesets - nearby_diaries: nearby user diary entries - popup: - your location: Your location - nearby mapper: Nearby mapper - friend: Friend account: title: Edit account my settings: My settings diff --git a/config/locales/en.yml b/config/locales/en.yml index 9d280bf02..7a2aba1aa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -416,6 +416,26 @@ en: title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" timeout: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + dashboards: + contact: + km away: "%{count}km away" + m away: "%{count}m away" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" + show: + title: My Dashboard + no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." + edit_your_profile: Edit your profile + my friends: My friends + no friends: You have not added any friends yet. + nearby users: "Other nearby users" + no nearby users: "There are no other users who admit to mapping nearby yet." + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" diary_entries: new: title: New Diary Entry @@ -747,6 +767,7 @@ en: window_construction: "Window Construction" winery: "Winery" "yes": "Craft Shop" + crossing: "Crossing" emergency: access_point: "Access Point" ambulance_station: "Ambulance Station" @@ -1002,6 +1023,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -1016,10 +1038,13 @@ en: sand: "Sand" scree: "Scree" scrub: "Scrub" + shingle: "Shingle" spring: "Spring" stone: "Stone" strait: "Strait" tree: "Tree" + tree_row: "Tree Row" + tundra: "Tundra" valley: "Valley" volcano: "Volcano" water: "Water" @@ -1420,8 +1445,9 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" + partners_fastly: "Fastly" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" tou: "Terms of Use" @@ -1838,9 +1864,8 @@ en: credit_3_1_html: | The map tiles in the “standard style” at www.openstreetmap.org are a Produced Work by the OpenStreetMap Foundation using OpenStreetMap data - under the Open Database License. If you are using these tiles please use - the following attribution: - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + under the Open Database License. When using this map style, the same attribution is + required as for the map data. credit_4_html: | For a browsable electronic map, the credit should appear in the corner of the map. For example: @@ -1869,10 +1894,10 @@ en: Land Vorarlberg and Land Tirol (under CC BY AT with amendments). contributors_au_html: | - Australia: Contains data sourced from - PSMA Australia Limited + Australia: Incorporates or developed using Administrative Boundaries © + Geoscape Australia licensed by the Commonwealth of Australia under - CC BY 4.0. + Creative Commons Attribution 4.0 International licence (CC BY 4.0). contributors_ca_html: | Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -2491,6 +2516,7 @@ en: my settings: My Settings my comments: My Comments my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me edit_profile: Edit Profile @@ -2512,14 +2538,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." - edit_your_profile: Edit your profile - my friends: My friends - no friends: You have not added any friends yet. - km away: "%{count}km away" - m away: "%{count}m away" - nearby users: "Other nearby users" - no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2540,15 +2558,7 @@ en: unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" - nearby_changesets: "nearby user changesets" - nearby_diaries: "nearby user diary entries" report: Report this User - popup: - your location: "Your location" - nearby mapper: "Nearby mapper" - friend: "Friend" account: title: "Edit account" my settings: My Settings diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 37e31eb19..b25f545a4 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -444,6 +444,27 @@ eo: timeout: sorry: BedaÅ­rinde daÅ­ris tro longe por akiri la petitan liston de komentoj pri ŝanĝaro. + dashboards: + contact: + km away: '%{count} km for' + m away: '%{count} m for' + popup: + your location: Via loko + nearby mapper: Proksima uzanto + friend: Amiko + show: + title: Mia panelo + no_home_location_html: '%{edit_profile_link} kaj agordu vian hejmlokon por vidi + proksimajn uzantojn.' + edit_your_profile: Redaktu vian profilon + my friends: Miaj amikoj + no friends: Vi ne aldonis iun amikon ankoraÅ­. + nearby users: Plej proksimaj uzantoj + no nearby users: Neniu alia uzanto, kiu deklaris mapigadon en tiu ĉi areo. + friends_changesets: ŝanĝaroj de amikoj + friends_diaries: afiŝoj en taglibroj de amikoj + nearby_changesets: ŝanĝaroj de proksimuloj + nearby_diaries: afiŝoj en taglibroj de proksimuloj diary_entries: new: title: Nova taglibra afiŝo @@ -778,6 +799,7 @@ eo: window_construction: Laborejo de fenestr-faristo winery: Vinejo "yes": Metiejo + crossing: Trapasejo emergency: access_point: Vivsava rekonebla signo ambulance_station: Ambulanca stacio @@ -1033,6 +1055,7 @@ eo: hill: Monteto hot_spring: Tervarma akvofonto island: Insulo + isthmus: Istmo land: Tero marsh: Aluvia grundo moor: Arbustetaro @@ -1047,10 +1070,13 @@ eo: sand: Sabla tereno scree: Rokfalaĵo scrub: Arbustaro + shingle: Sablega tereno spring: Akvofonto stone: Roko strait: Markolo tree: Arbo + tree_row: Arb-vico + tundra: Tundro valley: Valo volcano: Vulkano water: Akvejo @@ -1445,9 +1471,10 @@ eo: intro_text: OpenStreetMap estas mapo de la mondo, kreata de homoj kiel vi, kaj libere uzebla laÅ­ malferma permesilo. intro_2_create_account: Krei konton - hosting_partners_html: Retgastigo estas subtenata de %{ucl}, %{bytemark} kaj aliaj - %{partners}. + hosting_partners_html: Retgastigo estas subtenata de %{ucl}, %{fastly}, %{bytemark} + kaj aliaj %{partners}. partners_ucl: University College London + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: kunlaborantoj tou: Uzkondiĉoj @@ -1897,9 +1924,10 @@ eo: eble meti ligilojn (ekz. en paperaj mapoj), ni sugestas direkti viajn legantojn al openstreetmap.org (eble meti plenan retadreson), al opendatacommons.org kaj (se necesas) al creativecommons.org. - credit_3_1_html: |- - La map-kaheloj kaj la stilo “norma” ĉe www.openstreetmap.org estas la produktaĵo de la Fondaĵo OpenStreetMap uzante OpenStreetMap-datumojn laÅ­ la permesilo Open Database License. Por uzi tiujn ĉi map-kahelojn necesas enmeti la jenan atribuon: - “Baza mapo kaj datumoj de OpenStreetMap kaj Fondaĵo OpenStreetMap”. + credit_3_1_html: La map-kaheloj kaj la stilo “norma” ĉe www.openstreetmap.org + estas la produktaĵo de la Fondaĵo OpenStreetMap uzante OpenStreetMap-datumojn + laÅ­ la permesilo Open Database License. Por uzi tiujn ĉi map-kahelojn necesas + enmeti la saman atribuon kiel por la map-datumoj. credit_4_html: |- En esploreblaj elektronikaj mapoj, la aÅ­torecon povas esti montrata ĉe la angulo de mapo. Ekzemplo: @@ -1923,10 +1951,11 @@ eo: AÅ­strujo: enhavas datumojn el Stadt Wien (laÅ­ CC BY), Land Vorarlberg kaj Land Tirol (laÅ­ CC BY AT kun postaj ŝanĝoj). - contributors_au_html: 'AÅ­stralio: enhavas datumojn el PSMA Australia - Limited kunhavigataj de Komunejo de AÅ­stralio laÅ­ la permesilo CC - BY 4.0.' + contributors_au_html: 'AÅ­stralio: enhavas datumojn pri administraj + limoj liveritaj de Geoscape + Australia rajtigitaj de la Komunejo de AÅ­stralio laÅ­ la permesilo Krea Komunaĵo + Atribuite 4.0 Tutmonda (CC BY 4.0).' contributors_ca_html: |- Kanado: enhavas datumojn el GeoBase®, GeoGratis (© Department of Natural @@ -2569,7 +2598,8 @@ eo: my profile: Profilo my settings: Agordoj my comments: Miaj komentoj - my_preferences: Miaj preferoj + my_preferences: Preferoj + my_dashboard: Panelo blocks on me: Blokas min blocks by me: Blokitaj de mi edit_profile: Redakti profilon @@ -2591,15 +2621,6 @@ eo: spam score: 'Trudmesaĝa poentaro:' description: Priskribo user location: Loko de uzanto - no_home_location_html: '%{edit_profile_link} kaj agordu vian hejmlokon por vidi - proksimajn uzantojn.' - edit_your_profile: Redaktu vian profilon - my friends: Miaj amikoj - no friends: Vi ne aldonis iun amikon ankoraÅ­. - km away: '%{count} km for' - m away: '%{count} m for' - nearby users: Plej proksimaj uzantoj - no nearby users: Neniu alia uzanto, kiu deklaris mapigadon en tiu ĉi areo. role: administrator: Ĉi tiu uzanto estas administranto moderator: Ĉi tiu uzanto estas kontrolanto @@ -2620,18 +2641,10 @@ eo: unhide_user: Malkaŝi ĉi tiun uzanton delete_user: Forigi ĉi tiun uzanton confirm: Konfirmi - friends_changesets: ŝanĝaroj de amikoj - friends_diaries: afiŝoj en taglibroj de amikoj - nearby_changesets: ŝanĝaroj de proksimuloj - nearby_diaries: afiŝoj en taglibroj de proksimuloj report: Raporti tiun ĉi uzanton - popup: - your location: Via loko - nearby mapper: Proksima uzanto - friend: Amiko account: title: Redakti konton - my settings: Agordoj + my settings: Miaj agordoj current email address: Aktuala retpoŝta adreso external auth: Ekstera aÅ­tentigo openid: diff --git a/config/locales/es.yml b/config/locales/es.yml index c44e612a4..724f03439 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -15,6 +15,7 @@ # Author: Csbotero # Author: DannyS712 # Author: Dcapillae +# Author: Destinid10 2 # Author: Dgstranz # Author: Egofer # Author: Ejegg @@ -60,6 +61,7 @@ # Author: Peter17 # Author: Pompilos # Author: Remux +# Author: Reverse88 # Author: Rodhos # Author: Rodm23 # Author: Rodney Araujo @@ -501,6 +503,27 @@ es: timeout: sorry: Lo sentimos, la lista de comentarios del conjunto de cambios que solicitó tardó demasiado en recuperarse. + dashboards: + contact: + km away: '%{count} km de distancia' + m away: '%{count} m de distancia' + popup: + your location: Su ubicación + nearby mapper: Mapeadores cercanos + friend: Amigo + show: + title: Mi tablero + no_home_location_html: '%{edit_profile_link} y establece tu ubicación de origen + para ver los usuarios cercanos.' + edit_your_profile: Edita tu perfil + my friends: Mis amigos + no friends: No has añadido ningún amigo aún. + nearby users: Otros usuarios cercanos + no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad. + friends_changesets: conjuntos de cambios realizados por amigos + friends_diaries: entradas de diarios de amigos + nearby_changesets: conjuntos de cambios de los usuarios cercanos + nearby_diaries: entradas de diarios de usuarios cercanos diary_entries: new: title: Nueva entrada en el diario @@ -836,6 +859,7 @@ es: window_construction: Construcción de ventanas winery: Bodega "yes": Tienda de artesanía + crossing: Cruce emergency: access_point: Punto de acceso ambulance_station: Base de ambulancias @@ -1052,7 +1076,7 @@ es: telescope: Telescopio tower: Torre utility_pole: Poste de servicios públicos - wastewater_plant: Planta de tratamiento de aguas + wastewater_plant: Depuradora de aguas residuales watermill: Molino hidráulico water_tap: Llave de agua water_tower: Torre de agua @@ -1091,6 +1115,7 @@ es: hill: Colina hot_spring: Fuente termal island: Isla + isthmus: Istmo land: Tierra marsh: Marisma moor: Páramo @@ -1109,6 +1134,8 @@ es: stone: Piedra strait: Estrecho tree: Árbol + tree_row: Fila de Árboles + tundra: Tundra valley: Valle volcano: Volcán water: Agua @@ -1510,6 +1537,7 @@ es: hosting_partners_html: El alojamiento es apoyado por %{ucl}, %{bytemark}, y otros %{partners}. partners_ucl: UCL + partners_fastly: Rápido partners_bytemark: Bytemark Hosting partners_partners: socios tou: Términos de uso @@ -2206,9 +2234,9 @@ es: para su uso en un navegador web. desktop_html: Aún puede utilizarse Potlatch mediante la descarga de la aplicación de escritorio para Mac y Windows. - id_html: Alternativamente, puede poner su editor predeterminado a iD, el que + id_html: Alternativamente, puede poner su editor predeterminado a iD, el que se ejecuta en su navegador como hizo Potlatch anteriormente. Cambie - la configuración de usuario aquí. + sus preferencias aquí. sidebar: search_results: Resultados de la búsqueda close: Cerrar @@ -2465,6 +2493,7 @@ es: sesión en la web para ver los Términos de colaborador. No es necesario aceptarlos, pero debe conocerlos. settings_menu: + account_settings: Configuración de la cuenta oauth1_settings: Otras configuraciones oauth2_applications: Aplicaciones de OAuth 2 oauth2_authorizations: Autorizaciones de OAuth 2 @@ -2668,6 +2697,7 @@ es: my settings: Mi configuración my comments: Mis comentarios my_preferences: Mis preferencias + my_dashboard: Mi tablero blocks on me: Bloqueos sobre mí blocks by me: Bloqueados por mí edit_profile: Editar perfil @@ -2689,12 +2719,6 @@ es: spam score: 'Puntuación de spam:' description: Descripción user location: Ubicación del usuario - my friends: Mis amigos - no friends: No has añadido ningún amigo aún. - km away: '%{count} km de distancia' - m away: '%{count} m de distancia' - nearby users: Otros usuarios cercanos - no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad. role: administrator: Este usuario es un administrador moderator: Este usuario es un moderador @@ -2715,15 +2739,7 @@ es: unhide_user: Mostrar este usuario delete_user: Eliminar este usuario confirm: Confirmar - friends_changesets: conjuntos de cambios realizados por amigos - friends_diaries: entradas de diarios de amigos - nearby_changesets: conjuntos de cambios de los usuarios cercanos - nearby_diaries: entradas de diarios de usuarios cercanos report: Denunciar a este usuario - popup: - your location: Su ubicación - nearby mapper: Mapeadores cercanos - friend: Amigo account: title: Editar cuenta my settings: Mis preferencias diff --git a/config/locales/et.yml b/config/locales/et.yml index f3642ad2b..4783719ce 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -97,7 +97,7 @@ et: language: Keel doorkeeper/application: name: Nimi - redirect_uri: Ümber suunatud URI-d + redirect_uri: Ümbersuunamise URI-d confidential: Konfidentsiaalne rakendus? scopes: Õigused friend: @@ -398,6 +398,28 @@ et: index: title_all: OpenStreetMapi muudatuskogumi arutelu title_particular: 'OpenStreetMapi muudatuskogumi #%{changeset_id} arutelu' + dashboards: + contact: + km away: '%{count} kilomeetri kaugusel' + m away: '%{count} meetri kaugusel' + popup: + your location: Sinu asukoht + nearby mapper: Lähedaloevad kaardistajad + friend: Sõber + show: + title: Minu andmelaud + no_home_location_html: '%{edit_profile_link} ja määra enda asukoht, et näha + ümberkaudseid kasutajaid.' + edit_your_profile: Muuda profiili + my friends: Minu sõbrad + no friends: Sa ei ole lisanud veel ühtegi sõpra. + nearby users: Teised lähedal asuvad kasutajad + no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad + läheduses. + friends_changesets: sõprade muudatuskogumid + friends_diaries: sõprade päevikusissekanded + nearby_changesets: lähedalasuvate kasutajate muudatuskogumid + nearby_diaries: lähedalasuvate kasutajate päevikusissekanded diary_entries: new: title: Uus päeviku sissekanne @@ -464,7 +486,7 @@ et: title: OpenStreetMapi päevikusissekanded description: Hiljutised OpenStreetMapi kasutajate päevikusissekanded comments: - has_commented_on: '%{display_name} on kommenteerinud järgnevaid päeviku sissekandeid' + has_commented_on: '%{display_name} on kommenteerinud järgmiseid päeviku sissekandeid' no_comments: Päeviku kommentaarid puuduvad. post: Postitus when: Millal @@ -538,6 +560,7 @@ et: hospital: Haigla hunting_stand: Jahikantsel ice_cream: Jäätis + internet_cafe: Internetikohvik kindergarten: Lasteaed language_school: Keeltekool library: Raamatukogu @@ -547,6 +570,7 @@ et: nightclub: Ööklubi nursing_home: Hooldekodu parking: Parkimisplats + parking_space: Parkimiskoht pharmacy: Apteek place_of_worship: Pühapaik police: Politsei @@ -573,6 +597,7 @@ et: national_park: Rahvuspark bridge: aqueduct: Akvedukt + boardwalk: Laudtee suspension: Rippsild swing: Pöördsild viaduct: Viadukt @@ -985,7 +1010,8 @@ et: intro_text: OpenStreetMap on maailma kaart, mille on loonud inimesed nagu sina ja seda võib vabalt kasutada avatud litsentsi tingimustel. intro_2_create_account: loo oma konto - hosting_partners_html: Majutust toetavad %{ucl}, %{bytemark} ja teised %{partners}. + hosting_partners_html: Majutust toetavad %{ucl}, %{fastly}, %{bytemark} ja teised + %{partners}. partners_ucl: UCL partners_bytemark: Bytemark Hosting partners_partners: partnerid @@ -1212,8 +1238,25 @@ et: reset: Lähtesta parool flash changed: Sinu parool on muudetud. flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i. + preferences: + show: + title: Minu eelistused + preferred_editor: Eelistatav redaktor + preferred_languages: Eelistatavad keeled + edit_preferences: Muuda eelistusi + edit: + title: Eelistuste muutmine + save: Uuenda eelistusi + cancel: Loobu + update: + failure: Eelistusi ei õnnestunud uuendada. + update_success_flash: + message: Eelistused uuendatud. profiles: edit: + title: Profiili muutmine + save: Uuenda profiili + cancel: Loobu image: Pilt gravatar: gravatar: Kasuta Gravatari @@ -1226,6 +1269,9 @@ et: home location: Kodu asukoht no home location: Sa pole oma kodu asukohta märkinud. update home location on click: Kas uuendan kodu asukohta, kui klõpsan kaardil? + update: + success: Profiil uuendatud. + failure: Profiili ei õnnestunud uuendada. sessions: new: title: Sisselogimine @@ -1382,11 +1428,11 @@ et: aadressidele openstreetmap.org (võimalik, et laiendades teksti "OpenStreetMap" täisaadressiks), opendatacommons.org ja kui vaja, siis ka aadressile creativecommons.org. - credit_3_1_html: "Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org - on\nlitsentsi Open Database License alla kuuluvatest andmetest loodud teos,\nmille - autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane,\nsiis palun - omista need autorile järgmiselt: \n“Aluskaart ja andmed OpenStreetMapist - ja OpenStreetMap Foundationilt”." + credit_3_1_html: |- + Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org on + litsentsi Open Database License alla kuuluvatest andmetest loodud teos, + mille autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane, + siis tuleb need autorile omistada samamoodi nagu kaardiandmed. credit_4_html: |- Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas. Näiteks: @@ -1412,11 +1458,11 @@ et: BY tingimustel),\nVorarlbergi liidumaast ja\nTirooli liidumaast (CC BY AT tingimustel koos õiendustega)." - contributors_au_html: "Austraalia: Sisaldab andmeid, mille - allikas on \nPSMA - Australia Limited\nja mille kasutust lubab Austraalia Ühendus litsentsi - \nCC BY - 4.0 tingimustel." + contributors_au_html: "Austraalia: Sisaldab andmeid või on + tuletatud andmetest, mille allikas on \nGeoscape + Australia\nja mille kasutust lubab Austraalia Ühendus rahvusvahelise + litsentsi \n\"Autorile + viitamine 4.0\" (CC BY 4.0) tingimustel." contributors_ca_html: |- Kanada: Sisaldab andmekogude GeoBase®, GeoGratis (© Kanada loodusvarade @@ -1811,6 +1857,7 @@ et: sisse veebiliidese kaudu, et näha kaastöötingimusi. Sa ei pea nendega nõustuma, kuid sa pead neid vaatama. settings_menu: + account_settings: Konto sätted oauth1_settings: OAuth 1 sätted oauth2_applications: OAuth 2 rakendused oauth2_authorizations: OAuth 2 volitused @@ -1909,7 +1956,9 @@ et: delete: Kustuta confirm_delete: Kas kustutad selle rakenduse? permissions: Õigused - redirect_uris: Ümber suunatud URI-d + redirect_uris: Ümbersuunamise URI-d + not_found: + sorry: Seda rakendust kahjuks ei leitud. oauth2_authorized_applications: index: title: Minu volitatud rakendused @@ -1976,10 +2025,13 @@ et: my notes: Minu märkused my messages: Minu sõnumid my profile: Minu profiil - my settings: Minu seadistused + my settings: Minu sätted my comments: Minu kommentaarid + my_preferences: Minu eelistused + my_dashboard: Minu andmelaud blocks on me: Saadud blokeeringud blocks by me: Minu seatud blokeeringud + edit_profile: Muuda profiili send message: Saada sõnum diary: Päevik edits: Muudatused @@ -1998,13 +2050,6 @@ et: spam score: 'Rämpsposti tulemus:' description: Kirjeldus user location: Kasutaja asukoht - my friends: Minu sõbrad - no friends: Sa ei ole lisanud veel ühtegi sõpra. - km away: '%{count} kilomeetri kaugusel' - m away: '%{count} meetri kaugusel' - nearby users: Teised lähedal asuvad kasutajad - no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad - läheduses. role: administrator: See kasutaja on administraator moderator: See kasutaja on moderaator @@ -2025,18 +2070,10 @@ et: unhide_user: Muuda see kasutaja nähtavaks delete_user: Kustuta see kasutaja confirm: Kinnita - friends_changesets: sõprade muudatuskogumid - friends_diaries: sõprade päevikusissekanded - nearby_changesets: lähedalasuvate kasutajate muudatuskogumid - nearby_diaries: lähedalasuvate kasutajate päevikusissekanded report: Teata sellest kasutajast - popup: - your location: Sinu asukoht - nearby mapper: Lähedaloevad kaardistajad - friend: Sõber account: title: Konto muutmine - my settings: Minu seaded + my settings: Minu sätted current email address: Praegune e-posti aadress external auth: Väline autentimine openid: @@ -2110,9 +2147,8 @@ et: option_1: |- Kui oled esimest korda OpenStreetMapis, siis loo palun uus kasutajakonto, täites allpool oleva vormi. - option_2: Kui sul juba on kasutajakonto, saad enda kontole siseneda, kasutades - oma kasutajatunnust ja parooli ning seejärel siduda kasutaja seadetes konto - oma ID-ga. + option_2: Kui sul juba on kasutajakonto, saad sisse logida, kasutades oma kasutajanime + ja parooli ning siduda seejärel kasutajasätetes konto oma ID-ga. user_role: filter: not_a_role: String `%{role}' ei ole kehtiv roll. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 4a115e68b..65187c697 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -387,6 +387,23 @@ eu: timeout: sorry: Barkatu, zuk eskatutako aldaketen zerrenda berreskuratzeko denbora gehiegi behar izan da. + dashboards: + contact: + km away: '%{count} km-tara' + m away: '%{count} m-tara' + popup: + your location: Zure kokapena + nearby mapper: Hurbileko mapeatzaileak + friend: Laguna + show: + my friends: Nire lagunak + no friends: Oraindik ez duzu lagunik gehitu. + nearby users: Gertuko beste erabiltzaile batzuk + no nearby users: Ez dago oraindik hurbileko mapa editatzea onartzen duen erabiltzailerik. + friends_changesets: Lagunen aldaketak + friends_diaries: Lagunen eguneroko sarrerak + nearby_changesets: inguruko erabiltzaileen aldaketak + nearby_diaries: inguruko erabiltzaileen eguneroko sarrerak diary_entries: new: title: Eguneroko Sarrera Berria @@ -2277,12 +2294,6 @@ eu: spam score: 'Spam Puntuazioa:' description: Deskribapen user location: Lankidearen kokapena - my friends: Nire lagunak - no friends: Oraindik ez duzu lagunik gehitu. - km away: '%{count} km-tara' - m away: '%{count} m-tara' - nearby users: Gertuko beste erabiltzaile batzuk - no nearby users: Ez dago oraindik hurbileko mapa editatzea onartzen duen erabiltzailerik. role: administrator: Lankide hau administratzailea da moderator: Lankide hau moderatzailea da @@ -2303,15 +2314,7 @@ eu: unhide_user: Erabiltzaile honen ezkutaketa kendu delete_user: Erabiltzaile hau ezabatu confirm: Berretsi - friends_changesets: Lagunen aldaketak - friends_diaries: Lagunen eguneroko sarrerak - nearby_changesets: inguruko erabiltzaileen aldaketak - nearby_diaries: inguruko erabiltzaileen eguneroko sarrerak report: Salatu erabiltzaile hau - popup: - your location: Zure kokapena - nearby mapper: Hurbileko mapeatzaileak - friend: Laguna account: title: Kontua aldatu my settings: Nire aukerak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index d1c4aa34f..bb2dc2dee 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -11,6 +11,7 @@ # Author: Baqeri # Author: Dalba # Author: Danialbehzadi +# Author: Darafsh # Author: Dr jackie # Author: Ebraminio # Author: FarsiNevis @@ -192,7 +193,7 @@ fa: user_block: reason: |- این دلیل مسدودشدن کاربر است. لطفاً خونسرد و منطقی باشید و هرچه می‌توانید به‌شکل جزئی‌تر اوضاع را شرح دهید. همچنین توجه داشته باشید که پیام شما به‌طور عمومی قابل مشاهده است. - در نظر داشته باشید که همهٔ کاربران اصطلاحات تخصصی جامعه را نمی‌فهمند، لطفاً سعی کنید واژه‌هایی که استفاده می‌کنید غیرتخصصی باشد. + در نظر داشته باشید که همهٔ کاربران اصطلاحات تخصصی جامعه را نمی‌فهمند، لطفاً سعی کنید واژه‌هایی که استفاده می‌کنید غیرتخصصی باشند. needs_view: آیا قبل از پاک‌شدن این مسدودی، کاربر باید وارد حساب کاربری شود؟ user: email_confirmation: آدرس شما به صورت عمومی نمایش داده نمی شود ، برای اطلاعات @@ -463,6 +464,27 @@ fa: timeout: sorry: شوربختانه بازیابی نظرات بستهٔ تغییر که درخواست نموده‌اید، خیلی طولانی شد. + dashboards: + contact: + km away: ‏%{count} کیلومتر فاصله + m away: ‏%{count} متر فاصله + popup: + your location: مکان شما + nearby mapper: نقشه‌کش نزدیک + friend: دوست + show: + title: پیشخوان من + no_home_location_html: '%{edit_profile_link} و موقعیت خانهٔ خود را تنظیم کنید + تا کاربران نزدیک را ببینید.' + edit_your_profile: ویرایش پروفایل + my friends: دوستان من + no friends: هنوز هیچ دوستی اضافه نکرده‌اید + nearby users: دیگر کاربران نزدیک + no nearby users: در این حوالی هیچ کاربری نقشه ترسیم نکرده است + friends_changesets: بسته‌های تغییر دوستان + friends_diaries: روزنوشت‌های دوستان + nearby_changesets: ویرایش‌های کاربران نزدیک + nearby_diaries: روزنوشت‌های کاربران نزدیک diary_entries: new: title: روزنوشت تازه @@ -632,6 +654,7 @@ fa: drinking_water: آب آشامیدنی driving_school: آموزشگاه رانندگی embassy: سفارت + events_venue: تالار رویدادها fast_food: غذای آماده ferry_terminal: پایانه کشتی fire_station: آتش‌نشانی @@ -686,7 +709,7 @@ fa: taxi: تاکسی telephone: تلفن عمومی theatre: تئاتر - toilets: سرویس های بهداشتی + toilets: سرویس‌های بهداشتی townhall: شهرداری training: امکانات آموزش university: دانشگاه @@ -917,7 +940,7 @@ fa: leisure: adult_gaming_centre: مرکز بازی بزرگسالان beach_resort: تفریحگاه ساحلی - bird_hide: محل مشاهده ی پرندگان + bird_hide: محل مشاهدهٔ پرندگان common: سرزمین مشترک dog_park: پارک سگ firepit: مشعل آتش @@ -1083,7 +1106,7 @@ fa: quarter: چهارک region: منطقه sea: دریا - square: مربع + square: میدان state: استان subdivision: زیربخش suburb: منطقه شهری @@ -1101,7 +1124,7 @@ fa: light_rail: ریل سبک miniature: راه آهن کوچک monorail: مونوریل - narrow_gauge: زاه‌آهن تبادلگر باریک + narrow_gauge: راه‌آهن تبادل‌گر باریک platform: بستر راه‌آهن preserved: راه آهن محفوظ شده proposed: راه آهن پیشنهادی @@ -1116,7 +1139,7 @@ fa: yard: محوطه راه آهن shop: alcohol: Off License - antiques: عتیقه جات + antiques: عتیقه‌جات art: فروشگاه لوازم هنری bakery: نانوایی beauty: فروشگاه زیبایی @@ -1132,7 +1155,7 @@ fa: carpet: فروشگاه فرش charity: فروشگاه خیریه cheese: پنیر فروشی - chemist: شیمی‌دان + chemist: داروساز clothes: فروشگاه پوشاک computer: فروشگاه رایانه confectionery: فروشگاه قنادی @@ -1222,7 +1245,7 @@ fa: chalet: کلبه ییلاقی gallery: گالری guest_house: مهمانخانه - hostel: شبانه روزی + hostel: هاستل hotel: هتل information: اطلاعات motel: متل @@ -1260,7 +1283,7 @@ fa: level5: مرز شهرستان level6: مرز بخش level7: مرز دهستان/شهر - level8: مرز روستا + level8: مرز شهر level9: مرز منطقه شهری level10: مرز دهستان/شهر level11: محدوده محله @@ -1403,8 +1426,8 @@ fa: intro_text: OpenStreetMap نقشه‌ای از جهان است که افرادی مانند شما آن را ساخته‌اند و آزادید آن را تحت پروانه‌ای آزاد استفاده کنید. intro_2_create_account: ساخت حساب کاربری - hosting_partners_html: میزبانی وب را %{ucl}،‏ %{bytemark} و سایر %{partners} پشتیبانی - می‌کنند. + hosting_partners_html: میزبانی وب را %{ucl}،‏ %{fastly}،‏ %{bytemark} و سایر %{partners} + پشتیبانی می‌کنند. partners_ucl: UCL partners_bytemark: Bytemark Hosting partners_partners: شرکای تجاری @@ -2545,6 +2568,7 @@ fa: my settings: تنظیمات من my comments: نظرات من my_preferences: ترجیحات من + my_dashboard: پیشخوان من blocks on me: مسدودی‌های من blocks by me: مسدودی‌های به دست من edit_profile: ویرایش نمایه @@ -2566,13 +2590,6 @@ fa: spam score: 'رتبهٔ هرزنگاری:' description: شرح user location: موقعبت کاربر - edit_your_profile: ویرایش پروفایل - my friends: دوستان من - no friends: هنوز هیچ دوستی اضافه نکرده‌اید - km away: ‏%{count} کیلومتر فاصله - m away: ‏%{count} متر فاصله - nearby users: دیگر کاربران نزدیک - no nearby users: در این حوالی هیچ کاربری نقشه ترسیم نکرده است role: administrator: این کاربر مدیر است moderator: این کاربر ناظم است @@ -2593,15 +2610,7 @@ fa: unhide_user: آشکارکردن این کاربر delete_user: حذف این کاربر confirm: تأیید - friends_changesets: ویرایش‌های دوستان - friends_diaries: روزنوشت‌های دوستان - nearby_changesets: ویرایش‌های کاربران نزدیک - nearby_diaries: روزنوشت‌های کاربران نزدیک report: گزارش این کاربر - popup: - your location: مکان شما - nearby mapper: نقشه‌کش نزدیک - friend: دوست account: title: ویرایش حساب my settings: تنظیمات من diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 10ba4bdc6..79c3e361c 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -454,6 +454,25 @@ fi: timeout: sorry: Valitettavasti pyytämäsi muutoskokoelmien kommenttien hakeminen kesti liian kauan. + dashboards: + contact: + km away: '%{count} kilometrin päässä' + m away: '%{count} metrin päässä' + popup: + your location: Oma sijaintisi + nearby mapper: Lähellä oleva kartoittaja + friend: Kaveri + show: + title: Minun kojelauta + edit_your_profile: Muokkaa profiiliasi + my friends: Kaverit + no friends: Sinulla ei ole vielä kavereita. + nearby users: Muut lähialueen käyttäjät + no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä. + friends_changesets: kaverien muutoskokoelmat + friends_diaries: kaverien päiväkirjamerkinnät + nearby_changesets: lähialueen käyttäjien muutoskokoelmat + nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät diary_entries: new: title: Uusi päiväkirjamerkintä @@ -1366,6 +1385,7 @@ fi: hosting_partners_html: Palvelinkapasiteettia meille tarjoaa %{ucl}, %{bytemark}, ja muut %{partners}. partners_ucl: UCL + partners_fastly: Nopeasti partners_bytemark: Bytemark Hosting partners_partners: kumppanimme tou: Käyttöehdot @@ -2430,6 +2450,7 @@ fi: my settings: Asetukset my comments: Omat kommentit my_preferences: Asetukseni + my_dashboard: Minun kojelauta blocks on me: Saadut estot blocks by me: Tekemäni estot edit_profile: Muokkaa profiilia @@ -2451,13 +2472,6 @@ fi: spam score: 'Spam-pisteet:' description: Kuvaus user location: Käyttäjän sijainti - edit_your_profile: Muokkaa profiiliasi - my friends: Kaverit - no friends: Sinulla ei ole vielä kavereita. - km away: '%{count} kilometrin päässä' - m away: '%{count} metrin päässä' - nearby users: Muut lähialueen käyttäjät - no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä. role: administrator: Tämä käyttäjä on ylläpitäjä. moderator: Tämä käyttäjä on moderaattori. @@ -2478,15 +2492,7 @@ fi: unhide_user: Poista käyttäjän piilottaminen delete_user: Poista tämä käyttäjä confirm: Vahvista - friends_changesets: kaverien muutoskokoelmat - friends_diaries: kaverien päiväkirjamerkinnät - nearby_changesets: lähialueen käyttäjien muutoskokoelmat - nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät report: Ilmianna käyttäjä - popup: - your location: Oma sijaintisi - nearby mapper: Lähellä oleva kartoittaja - friend: Kaveri account: title: Asetusten muokkaus my settings: Käyttäjäasetukset diff --git a/config/locales/fit.yml b/config/locales/fit.yml index 445a5a45f..6bc4bcdd4 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -353,6 +353,14 @@ fit: timeout: sorry: Valitettavasti pyytämäsi muutoskokoelmien kommenttien hakeminen kesti liian kauan. + dashboards: + contact: + km away: '%{count} kilometrin päässä' + popup: + your location: Sinun paikka + friend: Kaveri + show: + my friends: Minun ystävät diary_entries: new: title: Uusi päiväkirjamerkintä @@ -974,11 +982,6 @@ fit: add as friend: Lissää ystäväksi latest edit: 'Viimeisin muutos (%{ago}):' email address: 'E-postiatressi:' - my friends: Minun ystävät - km away: '%{count} kilometrin päässä' - popup: - your location: Sinun paikka - friend: Kaveri account: title: Mookkaa konttua my settings: Minun inställninkit diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e1d29f99a..818446669 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -516,6 +516,28 @@ fr: timeout: sorry: Désolé, la liste des commentaires d’ensembles de modifications que vous avez demandée est trop longue à récupérer. + dashboards: + contact: + km away: à %{count} km + m away: à %{count} m + popup: + your location: Votre emplacement + nearby mapper: Cartographe à proximité + friend: Ami(e) + show: + title: Mon tableau de bord + no_home_location_html: '%{edit_profile_link} et définissez l’emplacement de + votre domicile pour voir les utilisateurs à proximité.' + edit_your_profile: Modifier votre profil + my friends: Mes amis + no friends: Vous n’avez pas encore ajouté d’ami. + nearby users: Autres utilisateurs à proximité + no nearby users: Aucun utilisateur n’a encore signalé qu’il cartographiait à + proximité. + friends_changesets: groupes de modifications des amis + friends_diaries: entrées de journal des amis + nearby_changesets: groupes de modifications des utilisateurs à proximité + nearby_diaries: entrées de journal des utilisateurs à proximité diary_entries: new: title: Nouvelle entrée du journal @@ -853,6 +875,7 @@ fr: window_construction: Construction de fenêtre winery: Domaine viticole "yes": Boutique d’artisanat + crossing: Croisement emergency: access_point: Point d’accès ambulance_station: Dépôt d’ambulances @@ -1108,6 +1131,7 @@ fr: hill: Colline hot_spring: Source thermale island: Île + isthmus: Isthme land: Terre marsh: Marécage moor: Brande @@ -1122,10 +1146,13 @@ fr: sand: Sable scree: Éboulis scrub: Broussailles + shingle: Galet spring: Source stone: Pierre strait: Détroit tree: Arbre + tree_row: Ligne d’arbres + tundra: Toundra valley: Vallée volcano: Volcan water: Eau @@ -1528,9 +1555,10 @@ fr: intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous et libre d’utilisation sous licence libre. intro_2_create_account: Créez un compte d’utilisateur - hosting_partners_html: L’hébergement est pris en charge par %{ucl}, %{bytemark}, - et d’autres %{partners}. + hosting_partners_html: L’hébergement est pris en charge par %{ucl}, %{fastly}, + %{bytemark}, et d’autres %{partners}. partners_ucl: l’University College de Londres + partners_fastly: Fastly partners_bytemark: l'Hébergeur Bytemark partners_partners: partenaires tou: Conditions d’utilisation @@ -1581,9 +1609,9 @@ fr: subject: '[OpenStreetMap] %{user} vous a ajouté comme ami' had_added_you: '%{user} vous a ajouté comme ami dans OpenStreetMap.' see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.' - see_their_profile_html: Vous pouvez voir leur profil sur %{userurl}. + see_their_profile_html: Vous pouvez voir son profil sur %{userurl}. befriend_them: 'Vous pouvez également l’ajouter comme ami(e) ici : %{befriendurl}.' - befriend_them_html: Vous pouvez aussi les ajouter comme amis sur %{befriendurl}. + befriend_them_html: Vous pouvez aussi l’ajouter comme ami à l’adresse %{befriendurl}. gpx_description: description_with_tags_html: 'Il semblerait que votre fichier GPX %{trace_name} avec la description %{trace_description} et les balises suivantes : %{tags}' @@ -2036,9 +2064,9 @@ fr: région du Vorarlberg et la région du Tyrol (sous licence CC BY AT avec amendements). contributors_au_html: |- - Australie : contient des données sourcées de - PSMA Australia Limited publiées sous la licence - CC BY 4.0 accordée par le Commonwealth d’Australie. + Australie : incorpore ou développé en utilissant Limites administratives © + Geoscape Australia publiées sous la licence + Creative licence internationale Commons Attribution 4.0 (CC BY 4.0). contributors_ca_html: 'Canada : contient des données de GeoBase®, GeoGratis (© Département des Ressources naturelles du Canada), CanVec (© Département des Ressources naturelles du Canada) et StatCan @@ -2715,6 +2743,7 @@ fr: my settings: Mes options my comments: Mes commentaires my_preferences: Mes préférences + my_dashboard: Mon tableau de bord blocks on me: Blocages me concernant blocks by me: Blocages de ma part edit_profile: Modifier le profil @@ -2736,16 +2765,6 @@ fr: spam score: 'Indice de pollution :' description: Description user location: Emplacement de l’utilisateur - no_home_location_html: '%{edit_profile_link} et définissez l’emplacement de - votre domicile pour voir les utilisateurs à proximité.' - edit_your_profile: Modifier votre profil - my friends: Mes amis - no friends: Vous n’avez pas encore ajouté d’ami. - km away: à %{count} km - m away: à %{count} m - nearby users: Autres utilisateurs à proximité - no nearby users: Aucun utilisateur n’a encore signalé qu’il cartographiait à - proximité. role: administrator: C’est un administrateur ou une administratrice moderator: C’est un modérateur ou une modératrice @@ -2766,15 +2785,7 @@ fr: unhide_user: Réafficher cet utilisateur ou cette utilisatrice delete_user: Supprimer cet utilisateur ou cette utilisatrice confirm: Confirmer - friends_changesets: groupes de modifications des amis - friends_diaries: entrées de journal des amis - nearby_changesets: groupes de modifications des utilisateurs à proximité - nearby_diaries: entrées de journal des utilisateurs à proximité report: Signaler cet utilisateur ou cette utilisatrice - popup: - your location: Votre emplacement - nearby mapper: Cartographe à proximité - friend: Ami(e) account: title: Modifier le compte my settings: Mes options diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 71e653ead..38aab3e61 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -377,6 +377,24 @@ fur: index: title_all: Discussion sul grup di cambiaments di OpenStreetMap title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap' + dashboards: + contact: + km away: '%{count}km di distance' + m away: '%{count}m di distance' + popup: + your location: La tô posizion + nearby mapper: Mapadôr dongje + friend: Amì + show: + my friends: I miei amîs + no friends: No tu âs ancjemò nissun amì. + nearby users: Altris utents dongje + no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di + te. + friends_changesets: grups di cambiaments dai amîs + friends_diaries: vôs di diari dai amîs + nearby_changesets: grups di cambiaments dai utents dongje + nearby_diaries: vôs di diari dai utents dongje diary_entries: new: title: Gnove vôs dal diari @@ -1340,13 +1358,6 @@ fur: spam score: 'Ponts di spam:' description: Descrizion user location: Lûc dal utent - my friends: I miei amîs - no friends: No tu âs ancjemò nissun amì. - km away: '%{count}km di distance' - m away: '%{count}m di distance' - nearby users: Altris utents dongje - no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di - te. role: administrator: Chest utent al è un aministradôr moderator: Chest utent al è un moderatôr @@ -1361,15 +1372,7 @@ fur: unhide_user: mostre chest utent delete_user: elimine chest utent confirm: Conferme - friends_changesets: grups di cambiaments dai amîs - friends_diaries: vôs di diari dai amîs - nearby_changesets: grups di cambiaments dai utents dongje - nearby_diaries: vôs di diari dai utents dongje report: Segnale chest utent - popup: - your location: La tô posizion - nearby mapper: Mapadôr dongje - friend: Amì account: title: Modifiche profîl my settings: Mês impostazions diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 7ac987b05..5239bfff9 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -118,6 +118,9 @@ fy: area: Gebiet index: load_more: Mear laden + dashboards: + popup: + friend: Freon diary_entries: form: location: 'Lokaasje:' @@ -537,8 +540,6 @@ fy: email address: 'E-mailadres:' status: 'Status:' description: Beskriuwing - popup: - friend: Freon account: openid: link: http://wiki.openstreetmap.org/wiki/OpenID diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 2cc1c15c5..5f17e6901 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -356,6 +356,16 @@ ga: timeout: sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr tú a aisghabháil. + dashboards: + contact: + km away: '%{count} km uait' + m away: '%{count} m uait' + popup: + nearby mapper: Léarscálaí in aice láimhe + friend: Cara + show: + nearby users: Úsáideoirí eile in aice láimhe + friends_diaries: iontrálacha dialainne do chairde diary_entries: new: title: Iontráil Nua Dialainne @@ -1970,9 +1980,6 @@ ga: spam score: 'Scór Turscair:' description: Cur síos user location: Suíomh an úsáideora - km away: '%{count} km uait' - m away: '%{count} m uait' - nearby users: Úsáideoirí eile in aice láimhe role: administrator: Is riarthóir é an t-úsáideoir seo moderator: Is áisitheoir é an t-úsáideoir seo @@ -1984,10 +1991,6 @@ ga: unhide_user: Taispeáin an tÚsáideoir seo delete_user: Scrios an tÚsáideoir seo confirm: Deimhnigh - friends_diaries: iontrálacha dialainne do chairde - popup: - nearby mapper: Léarscálaí in aice láimhe - friend: Cara account: title: Cuir an cuntas in eagar my settings: Mo chuid socruithe diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index cfb10e051..23d3f04a7 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -24,6 +24,16 @@ gcf: start_rjs: load_data: Chajé sé doné la loading: Y ka chajé... + dashboards: + contact: + km away: '%{count} km' + popup: + your location: Koté ou yé + nearby mapper: Arpantè owa aw + show: + no friends: Ou poko ni pon zanmi + nearby users: 'Itilizatè owa aw :' + no nearby users: Ou poko ni itilizatè owa aw. diary_entries: new: title: Nouvel nèf an jounal la @@ -144,13 +154,6 @@ gcf: mapper since: 'Arpantè dèpi:' description: Deskription user location: Ola itilizatè yé - no friends: Ou poko ni pon zanmi - km away: '%{count} km' - nearby users: 'Itilizatè owa aw :' - no nearby users: Ou poko ni itilizatè owa aw. - popup: - your location: Koté ou yé - nearby mapper: Arpantè owa aw account: my settings: Mes options public editing: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 801839756..034eaad19 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -325,6 +325,23 @@ gd: index: title_all: Deasbaireachd air seataichean atharraichean OpenStreetMap title_particular: Deasbaireachd air seata atharraichean OpenStreetMap %{changeset_id} + dashboards: + contact: + km away: '%{count}km air falbh' + m away: '%{count}m air falbh' + popup: + your location: Far a bheil thu + nearby mapper: Neach-mapachaidh am fagas + friend: Caraid + show: + no friends: Cha do chuir thu caraid ris fhathast. + nearby users: Cleachdaichean am fagas eile + no nearby users: Chan eil cleachdaiche sam bith eile ann a dh'innis gu bheil + iad ris an obair-mhapa am fagas. + friends_changesets: seata atharraichean nan caraidean + friends_diaries: clàran leabhair-latha nan caraidean + nearby_changesets: seata atharraichean nan cleachdaichean am fagas + nearby_diaries: clàran leabhair-latha am fagas diary_entries: new: title: Clàr ùr an leabhair-latha @@ -1901,12 +1918,6 @@ gd: spam score: 'Sgòr spama:' description: Tuairisgeul user location: Far a bheil an cleachdaiche - no friends: Cha do chuir thu caraid ris fhathast. - km away: '%{count}km air falbh' - m away: '%{count}m air falbh' - nearby users: Cleachdaichean am fagas eile - no nearby users: Chan eil cleachdaiche sam bith eile ann a dh'innis gu bheil - iad ris an obair-mhapa am fagas. role: administrator: '''S e rianaire a tha sa chleachdaiche seo' moderator: '''S e maor a tha sa chleachdaiche seo' @@ -1927,14 +1938,6 @@ gd: unhide_user: Neo-fhalaich an cleachdaiche seo delete_user: Sguab às an cleachdaiche seo confirm: Dearbhaich - friends_changesets: seata atharraichean nan caraidean - friends_diaries: clàran leabhair-latha nan caraidean - nearby_changesets: seata atharraichean nan cleachdaichean am fagas - nearby_diaries: clàran leabhair-latha am fagas - popup: - your location: Far a bheil thu - nearby mapper: Neach-mapachaidh am fagas - friend: Caraid account: title: Deasaich an cunntas my settings: Na roghainnean agam diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 9408318c8..dac06f669 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -444,6 +444,28 @@ gl: timeout: sorry: Sentímolo, a listaxe dos comentarios do conxuntos de modificacións que solicitaches tardou moito en obterse. + dashboards: + contact: + km away: a %{count}km de distancia + m away: a %{count}m de distancia + popup: + your location: A súa localización + nearby mapper: Cartógrafo preto de ti + friend: Amizade + show: + title: O meu panel de control + no_home_location_html: '%{edit_profile_link} e define a localización da túa + casa para ver usuarios preto de ti.' + edit_your_profile: Editar o teu perfil + my friends: As miñas amizades + no friends: Aínda non engadiu ningunha amizade. + nearby users: Outros usuarios preto de ti + no nearby users: Aínda non hai usuarios que estean situados preto de ti. + friends_changesets: conxuntos de modificacións das amizades + friends_diaries: entradas de diario das amizades + nearby_changesets: conxuntos de modificacións dos usuarios de lugares preto + de ti + nearby_diaries: entradas de diario dos usuarios de lugares preto de ti diary_entries: new: title: Nova entrada no diario @@ -779,6 +801,7 @@ gl: window_construction: Construtor de xanelas winery: Adega "yes": Tenda de artesanía + crossing: Paso emergency: access_point: Punto de acceso ambulance_station: Base de ambulancias @@ -869,6 +892,7 @@ gl: railway: Vía férrea histórica roman_road: Estrada romana ruins: Ruínas + rune_stone: Pedra rúnica stone: Pedra tomb: Sepulcro tower: Torre @@ -1033,6 +1057,7 @@ gl: hill: Outeiro hot_spring: Manancial quente island: Illa + isthmus: Istmo land: Terra marsh: Marisma moor: Páramo @@ -1047,10 +1072,13 @@ gl: sand: Area scree: Pedregal scrub: Matogueira + shingle: Seixos spring: Manancial stone: Pedra strait: Estreito tree: Árbore + tree_row: Ringleira de árbores + tundra: Tundra valley: Val volcano: Volcán water: Auga @@ -1453,6 +1481,7 @@ gl: hosting_partners_html: O aloxamento é fornecido por %{ucl}, %{bytemark} e outros %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: socios tou: Termos de uso @@ -2414,6 +2443,7 @@ gl: ó sistema para ollar os termos do contribuínte. Non tes que aceptalos, pero debes coñecelos. settings_menu: + account_settings: Axustes da conta oauth1_settings: Axustes OAuth 1 oauth2_applications: Aplicacións OAuth 2 oauth2_authorizations: Autorizacións OAuth 2 @@ -2615,6 +2645,7 @@ gl: my settings: Os meus axustes my comments: Os meus comentarios my_preferences: As miñas preferencias + my_dashboard: O meu panel de control blocks on me: Os meus bloqueos blocks by me: Bloqueos efectuados edit_profile: Editar perfil @@ -2636,12 +2667,6 @@ gl: spam score: 'Puntuación do spam:' description: Descrición user location: Localización do usuario - my friends: As miñas amizades - no friends: Aínda non engadiu ningunha amizade. - km away: a %{count}km de distancia - m away: a %{count}m de distancia - nearby users: Outros usuarios preto de ti - no nearby users: Aínda non hai usuarios que estean situados preto de ti. role: administrator: Este usuario é administrador moderator: Este usuario é moderador @@ -2662,16 +2687,7 @@ gl: unhide_user: Descobrir este usuario delete_user: Eliminar este usuario confirm: Confirmar - friends_changesets: conxuntos de modificacións das amizades - friends_diaries: entradas de diario das amizades - nearby_changesets: conxuntos de modificacións dos usuarios de lugares preto - de ti - nearby_diaries: entradas de diario dos usuarios de lugares preto de ti report: Denunciar este usuario - popup: - your location: A súa localización - nearby mapper: Cartógrafo preto de ti - friend: Amizade account: title: Editar a conta my settings: Os meus axustes diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index 7535996d4..c1b916223 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -178,6 +178,10 @@ gsw: loading: Am Lade ... tag_details: tags: 'Tags:' + dashboards: + popup: + your location: Dyy Standort + nearby mapper: Mapper in dr Nechi friendships: make_friend: success: '%{name} isch jetz Dyy Frynd.' @@ -262,9 +266,6 @@ gsw: make_public: made_public: Track, wu vereffetligt isch users: - popup: - your location: Dyy Standort - nearby mapper: Mapper in dr Nechi go_public: flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz Bearbeitige mache. diff --git a/config/locales/he.yml b/config/locales/he.yml index 991222753..be51dbc5b 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -485,6 +485,26 @@ he: timeout: sorry: הזמן שלקח לרשימת ההערות על ערכת השינויים שביקשת להתקבל ארוך מדי, עמך הסליחה. + dashboards: + contact: + km away: במרחק %{count} ק״מ + m away: במרחק %{count} מ׳ + popup: + your location: מיקומך + nearby mapper: ממפה סמוך + friend: חבר + show: + no_home_location_html: '%{edit_profile_link} והגדרת מיקום הבית שלך לצפייה במשתמשים + קרובים.' + edit_your_profile: עריכת הפרופיל שלך + my friends: החברים שלי + no friends: עדיין לא הוספת חברים. + nearby users: עוד משתמשים בסביבה + no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה. + friends_changesets: ערכות שינויים של חברים + friends_diaries: רשומות יומן של חברים + nearby_changesets: ערכות השינויים של משתמשים בסביבה + nearby_diaries: רשומות יומן של משתמשים בסביבה diary_entries: new: title: רשומת יומן חדשה @@ -908,6 +928,7 @@ he: railway: מסילת רכבת היסטורית roman_road: דרך רומית ruins: חורבה + rune_stone: אבן רונות stone: אבן היסטורית tomb: קבר tower: מגדל היסטורי @@ -1745,8 +1766,25 @@ he: reset: איפוס הסיסמה flash changed: סיסמתך שונתה. flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור? + preferences: + show: + title: ההעדפות שלי + preferred_editor: עורך מועדף + preferred_languages: שפות מועדפות + edit_preferences: עריכת העדפות + edit: + title: עריכת העדפות + save: עדכון העדפות + cancel: ביטול + update: + failure: לא ניתן לעדכן העדפות. + update_success_flash: + message: ההעדפות עודכנו. profiles: edit: + title: עריכת פרופיל + save: עדכון פרופיל + cancel: ביטול image: תמונה gravatar: gravatar: להשתמש ב־Gravatar @@ -1762,6 +1800,9 @@ he: home location: מיקום ראשי no home location: לא הזנת את מיקומך הראשי. update home location on click: עדכון המיקום הראשי שלך בעת לחיצה על המפה? + update: + success: הפרופיל עודכן. + failure: לא ניתן לעדכן פרופיל. sessions: new: title: כניסה @@ -2131,8 +2172,8 @@ he: של אדובי כבר לא נתמך, Potlatch כבר לא זמין בדפדפן. desktop_html: ניתן עדיין להשתמש בPotlatch על ידי הורדת יישום שולחן העבודה ל-Windows או ל-Mac. - id_html: לחלופין, ניתן להגדיר את עורך ברירת המחדל ל-iD, שפועל בדפדפן שלך כפי - שPotlatch פעל בעבר. שינוי הגדרות המשתמש כאן. + id_html: לחלופין, ניתן להגדיר את עורך בררת המחדל שלך ל־iD, שמופעל בדפדפן כמו + ש־Potlach עשה בעבר. ניתן לשנות את ההעדפות שלך כאן. sidebar: search_results: תוצאות החיפוש close: לסגירה @@ -2374,6 +2415,7 @@ he: need_to_see_terms: גישתך ל־API מושעית זמנית. נא להיכנס לאתר כדי לצפות בתנאי התרומה. אין צורך לקבל אותם, אבל חובה להציג אותם. settings_menu: + account_settings: הגדרות חשבון oauth1_settings: הגדרות OAuth 1 oauth2_applications: יישומי OAuth 2 oauth2_authorizations: אישורי OAuth 2 @@ -2568,8 +2610,10 @@ he: my profile: הפרופיל שלי my settings: ההגדרות שלי my comments: ההערות שלי + my_preferences: ההעדפות שלי blocks on me: מתי חסמו אותי blocks by me: מתי חסמתי + edit_profile: עריכת פרופיל send message: שליחת הודעה diary: יומן edits: עריכות @@ -2588,12 +2632,6 @@ he: spam score: 'דירוג זיבול:' description: תיאור user location: מיקום המשתמש - my friends: החברים שלי - no friends: עדיין לא הוספת חברים. - km away: במרחק %{count} ק״מ - m away: במרחק %{count} מ׳ - nearby users: עוד משתמשים בסביבה - no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה. role: administrator: לחשבון הזה יש הרשאות מפעיל moderator: זהו חשבון מנהל @@ -2614,15 +2652,7 @@ he: unhide_user: ביטול הסתרת משתמש זה delete_user: מחיקת משתמש זה confirm: אישור - friends_changesets: ערכות שינויים של חברים - friends_diaries: רשומות יומן של חברים - nearby_changesets: ערכות השינויים של משתמשים בסביבה - nearby_diaries: רשומות יומן של משתמשים בסביבה report: דיווח על המשתמש - popup: - your location: מיקומך - nearby mapper: ממפה סמוך - friend: חבר account: title: עריכת חשבון my settings: ההגדרות שלי diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 3dd619d72..c5ec29ed6 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -15,6 +15,7 @@ # Author: Siddhartha Ghai # Author: ThisIsACreeper0101 # Author: Vdhatterwal +# Author: पदाति --- hi: time: @@ -36,6 +37,9 @@ hi: client_application: create: खाता बनाएं update: अपडेट करें + doorkeeper_application: + create: खाता बनाएं + update: अद्यतनित करें redaction: create: रिडैक्शन बनाएँ update: रिडैक्शन सहेजें @@ -109,6 +113,7 @@ hi: language: भाषा doorkeeper/application: name: नाम + scopes: अनुमतियां friend: user: सदस्य friend: दोस्त @@ -129,6 +134,8 @@ hi: title: विषय body: संदेश का शारीर recipient: प्राप्तकर्ता + redaction: + title: शीर्षक report: category: अपने रिपोर्ट का एक कारण दें details: कृपया अपनी समस्या के बारे में थोड़ी और जानकारी दें (ज़रूरी) @@ -422,6 +429,9 @@ hi: timeout: sorry: माफ़ कीजिए, जिन चेंजसेट कमेंटों की आपने अनुरोध की थी उन्हें लाने में कुछ ज़्यादा ही वक्त लग गया। + dashboards: + show: + my friends: मेरे मित्र diary_entries: new: title: नई डायरी प्रवेश @@ -1010,8 +1020,6 @@ hi: new: deny: मना users: - show: - my friends: मेरे मित्र account: public editing: enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits diff --git a/config/locales/hr.yml b/config/locales/hr.yml index d3abdcf14..03c0c46fb 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -413,6 +413,21 @@ hr: index: title_all: Rasprava o OpenStreetMap setu promjena title_particular: 'Rasprava o OpenStreetMap setu promjena #%{changeset_id}' + dashboards: + contact: + km away: udaljen %{count}km + m away: '%{count}m daleko' + popup: + your location: VaÅ¡a lokacija + nearby mapper: Obližnji maper + friend: Prijatelj + show: + my friends: Moji prijatelji + no friends: Nisi dodao niti jednog prijatelja. + nearby users: Drugi korisnici u blizini + no nearby users: JoÅ¡ uvijek nema drugih korisnika koji kartiraju-mapiraju u + blizini. + friends_changesets: changesetovi prijatelja diary_entries: new: title: Novi zapis u dnevnik @@ -1770,13 +1785,6 @@ hr: spam score: 'Spam ocjena:' description: Opis user location: Lokacija boraviÅ¡ta korisnika - my friends: Moji prijatelji - no friends: Nisi dodao niti jednog prijatelja. - km away: udaljen %{count}km - m away: '%{count}m daleko' - nearby users: Drugi korisnici u blizini - no nearby users: JoÅ¡ uvijek nema drugih korisnika koji kartiraju-mapiraju u - blizini. role: administrator: Ovaj korisnik je administrator moderator: Ovaj korisnik je moderator @@ -1797,12 +1805,7 @@ hr: unhide_user: Otkrij ovog korisnika delete_user: ObriÅ¡i ovog korisnika confirm: Potvrdi - friends_changesets: changesetovi prijatelja report: Prijavi ovog korisnika - popup: - your location: VaÅ¡a lokacija - nearby mapper: Obližnji maper - friend: Prijatelj account: title: Uredi korisnički račun my settings: Moje postavke diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 62362bf48..6f2a3598e 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -26,6 +26,9 @@ hsb: client_application: create: Registrować update: Aktualizować + doorkeeper_application: + create: Registrować + update: Aktualizować redaction: create: Redakciju wutworić update: Redakciju składować @@ -97,6 +100,11 @@ hsb: latitude: Šěrokostnik longitude: Dołhostnik language: Rěč + doorkeeper/application: + name: Mjeno + redirect_uri: Dalesposrědkowanske URI + confidential: Dowěrliwe nałoženje? + scopes: Prawa friend: user: Wužiwar friend: Přećel @@ -139,6 +147,8 @@ hsb: pass_crypt: Hesło pass_crypt_confirmation: Hesło wobkrućić help: + doorkeeper/application: + redirect_uri: Jednu linku na URI wužiwać trace: tagstring: přez komu dźěleny user_block: @@ -150,7 +160,10 @@ hsb: about_x_hours: other: před něhdźe hodźinu about_x_months: - other: něhdźe před měsacom + one: něhdźe před %{count} měsacom + two: něhdźe před %{count} měsacomaj + few: něhdźe před %{count} měsacami + other: něhdźe před %{count} měsacami about_x_years: other: něhdźe před lětom almost_x_years: @@ -187,9 +200,10 @@ hsb: description: iD (we wobhladowaku zasadźeny editor) remote: name: Dalokowodźenje - description: Dalokowodźenje (JOSM abo Merkaartor) + description: Dalokowodźenje (JOSM, Potlach, Merkaartor) auth: providers: + none: Žane openid: OpenID google: Google facebook: Facebook @@ -233,6 +247,16 @@ hsb: anonymous: anonymny no_comment: (žadyn komentar) part_of: 'Dźěl wot:' + part_of_relations: + one: '%{count} relacija' + two: '%{count} relaciji' + few: '%{count} relacije' + other: '%{count} relacijow' + part_of_ways: + one: '%{count} puć' + two: '%{count} pućej' + few: '%{count} puće' + other: '%{count} pućow' download_xml: XML sćahnyć view_history: Historiju pokazać view_details: Podrobnosće pokazać @@ -265,6 +289,11 @@ hsb: title_html: 'Puć: %{name}' history_title_html: 'Historija puća: %{name}' nodes: Suki + nodes_count: + one: '%{count} suk' + two: '%{count} sukaj' + few: '%{count} suki' + other: '%{count} sukow' also_part_of_html: few: dźěl pućow %{related_ways} one: dźěl puća %{related_ways} @@ -274,6 +303,11 @@ hsb: title_html: 'Relacija: %{name}' history_title_html: 'Historija relacije: %{name}' members: Čłonojo + members_count: + one: '%{count} čłon' + two: '%{count} čłonaj' + few: '%{count} čłonojo' + other: '%{count} čłonow' relation_member: entry_role_html: '%{type} %{name} jako %{role}' type: @@ -293,6 +327,7 @@ hsb: changeset: sadźba změnow note: pokiw timeout: + title: Zmylk časoweho překročenja sorry: Wodaj, traje předołho, daty za %{type} z ID %{id} wotwołać. type: node: suk @@ -322,6 +357,7 @@ hsb: wikipedia_link: Nastawk %{page} we Wikipediji wikimedia_commons_link: Element %{page} na Wikimedija Commons telephone_link: '%{phone_number} zawołać' + colour_preview: Přehlad barba %{colour_value} note: title: 'Suk: %{id}' new_note: Nowa pokazka @@ -387,6 +423,26 @@ hsb: title_particular: Diskusija wo sadźbje změnow čo. %{changeset_id} OpenStreetMap timeout: sorry: Bohužel je předołho trało, wot tebje požadanu lisćinu komentarow wotwołać. + dashboards: + contact: + km away: '%{count} km zdaleny' + m away: '%{count} m zdaleny' + popup: + your location: Twoje městno + nearby mapper: Kartěrowar w bliskosći + friend: Přećel + show: + no_home_location_html: '%{edit_profile_link} a nastaj swoje ródne město, zo + by wužiwarjow w bliskosći widźał.' + edit_your_profile: Wobdźěłaj swój profil + my friends: Moji přećeljo + no friends: Hišće njejsy přećelow přidał. + nearby users: Druzy wužiwarjo w bliskosći + no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja. + friends_changesets: Sadźby změnow twojich přećelow + friends_diaries: Dźenikowe zapiski přećelow + nearby_changesets: sadźby změnow wužiwarjow w bliskosći + nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći diary_entries: new: title: Nowy zapisk do dźenika @@ -421,7 +477,8 @@ hsb: body: Wodaj, dźenikowy zapisk abo komentar z čisłom %{id} njeeksistuje. ProÅ¡u přepruwuj prawopis abo snano wotkaz, na kotryž sy kliknył(a), płaćiwy njeje. diary_entry: - posted_by_html: Spisany wot %{link_user} dnja %{created} w rěči %{language_link} + posted_by_html: Spisany wot %{link_user} dnja %{created} w rěči %{language_link}. + updated_at_html: POslednja aktualizacija %{updated} comment_link: Komentar k tutomu zapiskej reply_link: Awtorej powěsć pósłać comment_count: @@ -458,11 +515,17 @@ hsb: description: NajnowÅ¡e dźenikowe zapiski wužiwarjow OpenStreetMap comments: has_commented_on: '%{display_name} je slědowace dźenikowe zapiski komentował(a)' + no_comments: Žane dźenikowe komentary post: Zapisk when: Hdy comment: Komentar newer_comments: NowÅ¡e komentary older_comments: StarÅ¡e komentary + doorkeeper: + flash: + applications: + create: + notice: Nałoženje je zregistrowane. friendships: make_friend: heading: '%{user} jako přećela přidać?' @@ -470,6 +533,8 @@ hsb: success: '%{name} je nětko twój přećel!' failed: Wodaj, %{name} njeda so jako přećel přidać. already_a_friend: Sy hižo přećel wužiwarja %{name}. + limit_exceeded: Sy so njedawno z wjele přećelemi spřećeliłm proÅ¡u dočakaj chwilku, + prjedy hač pospytujeÅ¡ dalÅ¡ich přećelow namakać. remove_friend: heading: '%{user} jako přećela wotstronić?' button: Přećela wotstronić @@ -493,17 +558,29 @@ hsb: chair_lift: Sydłowy lift drag_lift: Wlečny lift gondola: Gondlowa powjaznica + magic_carpet: Přestrjencowy lift + platter: Sněhakowarski lift + pylon: Sćežor station: Gondlowa stacija + t-bar: Wlečny lift + "yes": Powjaznica aeroway: aerodrome: Lětanišćo + airstrip: Startowa čara apron: Lětanske předpolo gate: Wrota hangar: Hangar helipad: Helikoptrowe přizemišćo + holding_position: Zastanišćo + navigationaid: Nawigaciska pomoc lětarstwa + parking_position: Parkowanske městno runway: Startowa a přizemjenska čara + taxilane: Taksijowa jězdnja taxiway: Lětadłowa jězdnja terminal: Terminal + windsock: Wětrowy měšk amenity: + animal_boarding: Zwěrjaca pensija animal_shelter: zwěrjacy dom arts_centre: Kulturny centrum atm: Bankomat @@ -513,7 +590,9 @@ hsb: bench: Ławka bicycle_parking: Wotstajenišćo za kolesa bicycle_rental: Wupožcowarnja za kolesa + bicycle_repair_station: Koleso porjedźernja biergarten: Piwowa zahroda + blood_bank: Krejna banka boat_rental: wupožčenje čołmow brothel: Bordel bureau_de_change: Měnjernja @@ -530,6 +609,7 @@ hsb: clock: časnik college: wysoka Å¡ula community_centre: towarÅ¡nostny centrum + conference_centre: Konferencny centrum courthouse: sudnistwo crematorium: krematorij dentist: zubny lěkar @@ -537,6 +617,7 @@ hsb: drinking_water: pitna woda driving_school: jězbna Å¡ula embassy: wulkopósłanstwo + events_venue: Zarjadowanišćo fast_food: přikuski ferry_terminal: přewozny přistaw fire_station: wohnjostraža @@ -545,13 +626,19 @@ hsb: fuel: tankownja gambling: hra wo zbožo grave_yard: pohrjebnišćo + grit_bin: Zběrnik za sypanski material hospital: chorownja hunting_stand: łakańca ice_cream: lodownja + internet_cafe: Internetna kofejownja kindergarten: pěstowarnja + language_school: Rěčna Å¡ula library: knihownja + loading_dock: Nakładna rampa + love_hotel: Lubosćinski hotel marketplace: torhošćo monastery: klóšter + money_transfer: Pjenježne přepokazanje motorcycle_parking: parkowanišćo za motorske music_school: hudźbna Å¡ula nightclub: nócny klub @@ -559,6 +646,7 @@ hsb: parking: parkowanišćo parking_entrance: zajězd parkowanišća parking_space: stejnišćo + payment_terminal: Płaćenski terminal pharmacy: lěkarnja place_of_worship: Boži dom police: policija @@ -567,6 +655,7 @@ hsb: prison: jastwo pub: korčma public_bath: zjawna kupjel + public_bookcase: Zjawny knižny kamor public_building: zjawne twarjenje recycling: přijimarnja starowiznow restaurant: hosćenc @@ -582,17 +671,24 @@ hsb: theatre: dźiwadło toilets: nuzniki townhall: radnica + training: Trenowanske zarjadnišćo university: uniwersita vending_machine: awtomat veterinary: skótny lěkar village_hall: gmejnski dom waste_basket: smjećnik waste_disposal: wotstronjenje wotpadkow + waste_dump_site: Smjećowa deponija + watering_place: Napojišćo water_point: wodowy přizamk + weighbridge: Jězdźidłowa waha + "yes": Zarjadnišćo boundary: + aboriginal_lands: Rezerwaty administrative: zarjadniska hranica census: mjeza ludličenskeho wobwoda national_park: nacionalny park + political: Wólbny wobwod protected_area: Å¡kitane pasmo "yes": hranica bridge: @@ -615,7 +711,9 @@ hsb: commercial: Wobchodniske twarjenje construction: twarjenje w konstrukciji dormitory: Studentski internat - farm: Hospodarske twarjenje + duplex: Dwójny dom + farm: Burski dom + farm_auxiliary: Hospodarske twarjenje garage: Garaža garages: garaže greenhouse: rostlinarnja @@ -635,12 +733,13 @@ hsb: roof: třěcha ruins: rozpadace twarjenje school: Å ulske twarjenje + semidetached_house: Połojca dwójneho domu service: zawodne twarjenje shed: kólnja stable: hródź/konjenc static_caravan: bydlenski wóz temple: templowe twarjenje - terrace: Terasa + terrace: Serijowy dom train_station: dwórnišćowe twarjenje university: Uniwersitne twarjenje warehouse: skład @@ -654,11 +753,19 @@ hsb: blacksmith: kowar brewery: piwarnja carpenter: ćěsla + confectionery: Słódčiznowy wobchod + dressmaker: Å walča electrician: elektrikar + electronics_repair: Porjedźernja za elektroniku gardener: zahrodnik + glaziery: Å kleńčernja + handicraft: Wuměłstwowe rjemjeslnistwo + hvac: Připrawytwarstwo + metal_construction: Metalotwar painter: moler photographer: fotograf plumber: blachar + roofer: Třěchikryjer sawmill: rězak shoemaker: Å¡ewc stonemason: kamjenjećesar @@ -667,10 +774,16 @@ hsb: winery: winicy "yes": rjemjeslniski wobchod emergency: + access_point: Přistupny dypk ambulance_station: wuchowanska stacija + assembly_point: Zhromadźišćo defibrillator: defibrilator + fire_extinguisher: WoheńhaÅ¡ak + fire_water_pond: Hat haÅ¡enskeje wody landing_site: nuzowe přizemišćo + life_ring: Wuchowanska rynka phone: nuzowy telefon + siren: Sirena "yes": nuzowy pad highway: abandoned: rozpušćena awtodróha @@ -711,24 +824,31 @@ hsb: tertiary: dróha třećeho rjadu tertiary_link: přijězd na dróhu třećeho rjadu track: pólny puć + traffic_mirror: Wobchadny Å¡pihel traffic_signals: ampla + trailhead: Wuchadźišćo pućowanskeje šćežki trunk: spěšnodróha trunk_link: přijězd na spěšnodróhu turning_loop: wobroćišćo unclassified: powÅ¡itkowna dróha "yes": dróha historic: + aircraft: Historiske lětadło archaeological_site: archeologiska městnosć + bomb_crater: Historiski bombowy krater battlefield: bitwišćo boundary_stone: měznik building: historiske twarjenje bunker: bunker + cannon: Historiska kanona castle: hród + charcoal_pile: Historiski wuhelc church: cyrkej city_gate: měšćanske wrota citywalls: měšćanske murje fort: fort heritage: kulturne herbstwo + hollow_way: Hłuboki puć house: dom manor: knježi dwór memorial: wopomnišćo @@ -739,6 +859,7 @@ hsb: railway: historiska železniska čara roman_road: romska dróha ruins: rozpadanki + rune_stone: Kamjeń z runami stone: błudźenk tomb: row tower: wěža @@ -784,8 +905,12 @@ hsb: vineyard: winica "yes": wužiwanje zemje leisure: + amusement_arcade: Hrajna hala + bandstand: Hudźbny pawiljon beach_resort: mórske kupjele bird_hide: ptači schow + bleachers: Sedźenske rjady + bowling_alley: Bowlingowa čara common: gmejnski kraj dance: rejowanska žurla dog_park: psyči park @@ -800,6 +925,7 @@ hsb: marina: sportowy přistaw miniature_golf: minigolf nature_reserve: přirodoÅ¡kitne pasmo + outdoor_seating: Wonkowne stólcy park: park picnic_table: piknikowe blido pitch: sportnišćo @@ -831,6 +957,7 @@ hsb: communications_tower: Å¡kričkowy sćežor crane: kran cross: křiž + dolphin: Přiwjazowanski kolik dyke: haćenje embankment: skłonina flagpole: chorhojowy sćežor @@ -838,6 +965,7 @@ hsb: groyne: buna kiln: palna pěc lighthouse: swětłownja + manhole: Kanalowy Å¡acht mast: sćežor mine: podkopki mineshaft: překop @@ -845,13 +973,16 @@ hsb: petroleum_well: wolijowe žórło pier: stołp pipeline: rołowód + pumping_station: Klumparnja silo: silo snow_cannon: sněhowa kanona snow_fence: sněhowy płót storage_tank: składowanski tank + street_cabinet: Nadróžny rozdźělowak surveillance: dohladowanje telescope: teleskop tower: wěža + utility_pole: Milinowodowy sćežor wastewater_plant: wodočisćernja watermill: wodowy młyn water_tap: wodowy honač @@ -866,10 +997,13 @@ hsb: barracks: kaserna bunker: bunker checkpoint: kontrolny dypk + trench: Zakop "yes": wójsko mountain_pass: "yes": hórski přesmyk natural: + atoll: Atol + bare_rock: Naha skała bay: zaliw beach: přibrjóh cape: kap @@ -886,12 +1020,14 @@ hsb: grassland: łuka heath: hola hill: hórka + hot_spring: Horce žórło island: kupa land: kraj marsh: marÅ¡a moor: bahno mud: błóto peak: wjerÅ¡k + peninsula: Połkupa point: dypk reef: rif ridge: hórski hrjebjeń @@ -909,25 +1045,36 @@ hsb: water: wodźizna wetland: łučina wood: lěs + "yes": Krajinowa forma office: accountant: knihiwjedniski běrow administrative: zarjadnistwo + advertising_agency: Wabjenska agentura architect: architektowy běrow association: towarÅ¡nosć company: předewzaće + diplomatic: Diplomatiske zastupnistwo educational_institution: kubłanska institucija employment_agency: dźěłowy zarjad + energy_supplier: Běrow energijoweho zastaraćela estate_agent: makler ležownosćow + financial: Financny zarjad government: zarjad insurance: zawěsćenski běrow it: IT-běrow lawyer: prawiznik + logistics: Logistiski běrow + newspaper: Běrow nowinskeho nakładnistwa ngo: NGO-běrow + notary: Notar + research: Slědźerski běrow + tax_advisor: Dawkowy poradźowar telecommunication: telekomunikaciski běrow travel_agent: jězbny běrow "yes": běrow place: allotments: zahrodki + archipelago: Archipel city: wulkoměsto city_block: bydlenski blok country: kraj @@ -942,6 +1089,7 @@ hsb: locality: městnosć municipality: gmejna neighbourhood: bydlenski wobwod + plot: Ležownosć postcode: póštowa ličba quarter: měšćanska Å¡twórć region: region @@ -978,13 +1126,18 @@ hsb: tram_stop: zastanišćo tramwajki yard: Ranžěrowanske dwórnišćo shop: + agrarian: Agrarny wobchod alcohol: wobchod za spirituozy antiques: wobchod starožitnosćow + appliance: Wobchod domjacnostnych nastrojow art: wuměłski wobchod + baby_goods: Babyjowe artikle + bag: Tobołowy wbchod bakery: pjekarnja beauty: kosmetikowy salon beverages: napojowe wiki bicycle: kolesowarski wobchod + bookmaker: Wjetowarnja books: kniharnja boutique: butika butcher: rěznik @@ -993,61 +1146,85 @@ hsb: car_repair: awtowa porjedźernja carpet: přestrjencowy wobchod charity: dobroćelski wobchod + cheese: Twarožkowy wobchod chemist: drogerija + chocolate: Å okolada clothes: drastowy wobchod + coffee: Kofejownja computer: kompjuterowy wobchod confectionery: konditornja convenience: miniwiki copyshop: kopěrowanski wobchod cosmetics: parfimerija + curtain: Wobchod za zawěški + dairy: Mlokowy wobchod deli: delikatesowy wobchod department_store: kupnica discount: wobchod za tunje artikle doityourself: wobchod za twaršćizny dry_cleaning: čisćernja + e-cigarette: Wobcho za E-cigarety electronics: wobchod za elektroniku + erotic: Wobchod erotiskich artiklow estate_agent: wikowar z imobilijemi + fabric: Płatowy wobchod farm: statokowy wobchod fashion: modowy wobchod florist: kwětkarnja food: wobchod za žiwidła + frame: Wobchod za wobrazowe wobłuki funeral_directors: pochowanski wustaw furniture: meblowy wobchod garden_centre: zahrodniski centrum + gas: Wobchod za gasowe bleÅ¡e general: wobchod za měšane twory gift: wobchod za dary greengrocer: wobchod za sad a zeleniny grocery: žiwidłowy wobchod hairdresser: frizer hardware: železarstwo + health_food: Wobchod za přirodnu jědź + hearing_aids: Słuchanske nastroje + herbalist: Zelowy wobchod hifi: Hi-fi houseware: wobchod za domjace twory + ice_cream: Lodarnja interior_decoration: nutřkowne wuhotowanje jewelry: debjenkar kiosk: kiosk kitchen: kuchinski wobchod laundry: myjernja + locksmith: Klučowa słužba lottery: loterija mall: nakupowanski centrum massage: masaža mobile_phone: handyjowy wobchod + money_lender: Wupožčowarnja pjenjez motorcycle: wobchod za motorske + motorcycle_repair: Dźěłarnja motorskich music: hudźbny wobchod + musical_instrument: Hudźbne instrumenty newsagent: nowinski wobchod + nutrition_supplements: Dodatne zežiwidła optician: optikar organic: biowobchod outdoor: outdoor-wobchod paint: lakěrowarnja + pastry: Konditarnja pawnbroker: zastawnja + perfumery: Parfimerija pet: zwěrjacy wobchod + pet_grooming: Psyči frizer photo: fotowy wobchod seafood: mórske płody second_hand: second-hand-wobchod + sewing: Å iće shoes: wobchod za črije sports: sportowy wobchod stationery: papjernistwo supermarket: superwiki tailor: krawcownja + tea: Čajowy wobchod ticket: tiketowy wobchod tobacco: tobakowy wobchod toys: wobchod za hrajki @@ -1056,6 +1233,8 @@ hsb: vacant: prózdny wobchod variety_store: tuni wobchod video: widejoteka + video_games: Wobchod za widejowe hry + wholesale: Wulkowikowanje wine: winoteka "yes": wobchod tourism: @@ -1065,6 +1244,7 @@ hsb: attraction: atrakcija bed_and_breakfast: přenocowanje ze snědanju cabin: chěžka + camp_pitch: Campingowanišćo camp_site: stanowanišćo caravan_site: campingowanišćo za caravany chalet: chata @@ -1078,6 +1258,7 @@ hsb: picnic_site: piknikowanišćo theme_park: zabawjenski park viewpoint: wuhladnišćo + wilderness_hut: Å kitna budka zoo: coo tunnel: building_passage: přechod přez twarjenje @@ -1104,6 +1285,7 @@ hsb: "yes": wódna dróha admin_levels: level2: statna hranica + level3: Regionowa hranica level4: krajna hranica level5: regionalna hranica level6: wokrjesna hranica @@ -1111,6 +1293,7 @@ hsb: level8: měšćanska hranica level9: hranica měšćanskeho dźěla level10: hranica Å¡twórće + level11: Susodstwowa hranica types: cities: wulkoměsta towns: města @@ -1173,9 +1356,10 @@ hsb: reopen: reopened: Status problema je so změnił na „wočinjene“ comments: + comment_from_html: Komentar wužiwarja %{user_link} wot %{comment_created_at} reassign_param: Problem znowa připokazać? reports: - reported_by_html: Rozprawjeny jako %{category} wot %{user} + reported_by_html: Zdźěleny jako %{category} wot %{user} %{updated_at} helper: reportable_title: diary_comment: '%{entry_title}, komentar čo. %{comment_id}' @@ -1278,22 +1462,41 @@ hsb: hi: Witaj %{to_user}, header: '%{from_user} je dźenikowy zapisk pola OpenStreetMap z temu %{subject} komentował(a):' + header_html: '%{from_user} je dźenikowy zapisk pola OpenStreetMap z temu %{subject} + {{GENDER:%{from_user}|komentował|komentowała}}:' footer: MóžeÅ¡ komentar tež na %{readurl} čitać a na %{commenturl} komentować abo na %{replyurl} wotmołwić + footer_html: MóžeÅ¡ komentar tež na %{readurl} čitać a na %{commenturl} komentować + abo awtorej na %{replyurl} powěsć pósłać message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Witaj %{to_user}, header: '%{from_user} je ći přez OpenStreetMap powěsć z temu %{subject} pósłał(a):' + header_html: '%{from_user} je ći přez OpenStreetMap powěsć z temu %{subject} + {{GENDER:%{from_user}|pósłał|pósłała}}:' + footer: MóžeÅ¡ tež powěsć na %{readurl} čitać a móžeÅ¡ awtorej powěsć na %{replyurl} + pósłać footer_html: MóžeÅ¡ powěsć tež pod %{readurl} čitać a pod %{replyurl} wotmołwić friendship_notification: hi: Witaj %{to_user}, subject: '[OpenStreetMap] %{user} je će jako přećela přidał' had_added_you: '%{user} je će na OpenStreetMap jako přećela přidał.' see_their_profile: MóžeÅ¡ sej jeho abo jeje profil na %{userurl} wobhladać. + see_their_profile_html: MóžeÅ¡ sej jeho abo jeje profil na %{userurl} wobhladać. befriend_them: MóžeÅ¡ jeho/nju na %{befriendurl} jako přećela přidać. + befriend_them_html: MóžeÅ¡ jeho/ju na %{befriendurl} jako přećela přidać. + gpx_description: + description_with_tags_html: 'Wupada za waÅ¡ej GPX-dataju %{trace_name} z wopisanjom + %{trace_description} a slědowacymi značkami: %{tags}' + description_with_no_tags_html: Wupada za waÅ¡ej GPX-dataju %{trace_name} z wopisanjom + %{trace_description} a bjez značkow gpx_failure: + hi: Witaj %{to_user}, failed_to_import: 'njemóhło so importować. Zmylk je:' + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Zmylk při imporće GPX' gpx_success: + hi: Witaj %{to_user}, loaded_successfully: '%{trace_points} z %{possible_points} móžnych dypkow bu wuspěšnje importowane.' subject: '[OpenStreetMap] GPX-import wuspěšny' @@ -1328,25 +1531,38 @@ hsb: subject_other: '[OpenStreetMap] %{commenter} je pokazku komentował(a), za kotruž so zajimujeÅ¡' your_note: '%{commenter} je jednu z twojich pokazkow blisko %{place} komentował(a).' + your_note_html: '%{commenter} je jednu z twojich pokazkow blisko %{place} + {{GENDER?%{commenter}|komentował|komentowała}}.' commented_note: '%{commenter} je wot tebje komentowanu pokazku tohorunja komentował(a). Pokazka je blisko %{place}.' + commented_note_html: '%{commenter} je wot tebje komentowanu pokazku tohorunja + {{GENDER:%{commenter}|komentował|komentowała}}. Pokazka je blisko %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} je jednu z twojich pokazkow rozrisał' subject_other: '[OpenStreetMap] %{commenter} je pokazku rozrisał, za kotruž so zajimujeÅ¡' your_note: '%{commenter} je jednu z twojich kartowych pokazkow blisko %{place} rozrisał.' + your_note_html: '%{commenter} je jednu z twojich kartowych pokazkow blisko + %{place} {{GENDER:%{commenter}|rozrisał|rozrisała}}.' commented_note: '%{commenter} je kartowu pokazku rozrisał, kotruž sy komentował(a). Pokazka je blisko %{place}.' + commented_note_html: '%{commenter} je kartowu pokazku {{GENDER:%{commenter}|rozrisał|rozrisała}}, + kotruž sy komentował. Pokazka je blisko %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} je jednu z twojich pokazkow reaktiwizował' subject_other: '[OpenStreetMap] %{commenter} je pokazku reaktiwizował, za kotruž so zajimujeÅ¡' your_note: '%{commenter} je jednu z twojich kartowych pokazkow blisko %{place} reaktiwizował.' + your_note_html: '%{commenter} je jednu z twojich kartowych pokazkow blisko + %{place} {{GENDER:%{commenter}|reaktiwizował|reaktiwizowała}}.' commented_note: '%{commenter} je kartowu pokazku reaktiwizował, kotruž sy komentował(a). Pokazka je blisko %{place}.' + commented_note_html: '%{commenter} je kartowu pokazku {{GENDER:%{commenter}|reaktiwizował|reaktiwizowała}}, + kotruž sy komentował. Pokazka je blisko %{place}.' details: DalÅ¡e podrobnosće wo pokazce namakaÅ¡ pod %{url}. + details_html: DalÅ¡e podrobnosće wo pokazce namakaÅ¡ pod %{url}. changeset_comment_notification: hi: Witaj %{to_user}, greeting: Witaj, @@ -1356,13 +1572,22 @@ hsb: za kotruž so zajimujeÅ¡' your_changeset: '%{commenter} je w %{time} jednu z twojich sadźbow změnow komentował' + your_changeset_html: '%{commenter} je w %{time} jednu z twojich sadźbow změnow + {{GENDER:%{commenter}|komentował|komentowała}}' commented_changeset: '%{commenter} je w %{time} wot tebje wobkedźbowanu sadźbu změnow komentował, kotraž je so wot %{changeset_author} wutworiła' + commented_changeset_html: '%{commenter} je w %{time} wot tebje wobkedźbowanu + sadźbu změnow {{GENDER:%{commenter}|komentował|komentowała}}, kotraž je + so wot %{changeset_author} wutworiła' partial_changeset_with_comment: z přispomnjenku „%{changeset_comment}“ + partial_changeset_with_comment_html: z komentarom „%{changeset_comment}“ partial_changeset_without_comment: bjez komentara details: DalÅ¡e podrobnosće wo sadźbje změnow namakaÅ¡ na %{url}. + details_html: DalÅ¡e podrobnosće wo sadźbje změnow namakaÅ¡ na %{url}. unsubscribe: Zo by aktualizacije wo tutej sadźbje změnow wotskazał(a), wopytaj %{url} a klikń na „wotzjewić“ + unsubscribe_html: Zo by aktualizacije wo tutej sadźbje změnow wotskazał, wopytaj + %{url} a klikń na „wotskazać“ confirmations: confirm: heading: Přepruwuj swoju e-mejl! @@ -1387,10 +1612,17 @@ hsb: success: Změnjenje twojeje mejloweje adresy bu wobkrućena. failure: E-mejlowa adresa je hižo z tutym kodom wobkrućena. unknown_token: Wobkrućenski kod je spadnjeny abo njeeksistuje. + resend_success_flash: + confirmation_sent: Smy wobkrućensku noticu na %{email} póslali a tak ruče hač + swoje konto wobkrućiÅ¡, móžeÅ¡ kartěrowanje započeć. + whitelist: Jeli přećiwospamowy system wužiwaÅ¡, kotryž wobkrućenske napraÅ¡owanja + sćele, přewzmi %{sender} do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske + napraÅ¡owanja wotmołwić. messages: inbox: title: Póštowy kašćik my_inbox: Moja póšta + my_outbox: Mój póstowy wuchad messages: MaÅ¡ %{new_messages} a %{old_messages} new_messages: few: '%{count} nowe powěsće' @@ -1429,6 +1661,8 @@ hsb: body: Bohužel njeje powěsć z tutej ID. outbox: title: Pósłane + my_inbox: Mój póstowy dochad + my_outbox: Mój póstowy wuchad messages: few: Sy %{count} powěsće pósłał(a) one: Sy %{count} powěsć pósłał(a) @@ -1468,8 +1702,8 @@ hsb: heading: Sy hesło zabył? email address: 'E-mejlowa adresa:' new password button: Hesło wróćo stajić - help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił{{GENDER:||a|(a)}}, - pósćelemy wotkaz na nju, kotryž móžeÅ¡ za wróćostajenje hesła wužić. + help_text: Zapódaj mejlowu adresu, kotruž sy za registrowanje wužił, pósćelemy + wotkaz na nju, kotryž móžeÅ¡ za wróćostajenje hesła wužić. notice email on way: Sy jo zabył :-(, ale e-mejl je po puću, zo by móhł jo borze wróćo stajić. notice email cannot find: Wodaj, ale njemóžachmy tutu e-mejlowu adresu namakać. @@ -1479,21 +1713,44 @@ hsb: reset: Hesło wróćo stajić flash changed: Twoje hesło je so změniło. flash token bad: Njemóžachmy tutón kod namakać, proÅ¡u přepruwuj URL. + preferences: + show: + title: Moje nastajenja + preferred_editor: Preferowany editor + preferred_languages: Preferowane rěče + edit_preferences: Nastajenja wobdźěłać + edit: + title: Nastajenja wobdźěłać + save: Nastajenja aktualizować + cancel: Přetorhnyć + update: + failure: Nastajenja njedachu so aktualizować. + update_success_flash: + message: Nastajenja su so zaktualizowali. profiles: edit: - image: 'Wobraz:' + title: Profil wobdźěłać + save: Profil aktualizować + cancel: Přetorhnyć + image: Wobraz gravatar: gravatar: Gravatar wužiwać link: http://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Å to Grawatar je? + disabled: Grawatar je so znjemóžnił. + enabled: Zwobraznjenje waÅ¡eho grawatara je so zmóžniło. new image: Wobraz přidać keep image: Aktualny wobraz wobchować delete image: Aktualny wobraz wotstronić replace image: Aktualny wobraz narunać image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje funguja) - home location: 'Domjace stejnišćo:' + home location: Domjace stejnišćo no home location: Njejsy swoje domjace stejnišćo zapodał. update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować? + update: + success: Profil je so zaktualizował. + failure: Profil njeda so aktualizować. sessions: new: title: Přizjewjenje @@ -1516,7 +1773,7 @@ hsb: na wotkaz w e-mejlu kontoweho wubkrućenja, zo by swoje konto aktiwizował, abo proÅ¡ wo nowu wobkrućensku e-mejl. account is suspended: Twoje konto bu bohužel podhladneje aktiwity dla wupowědźene.
Stajće so proÅ¡u z webmasterom do zwiska, jeli + />Stajće so proÅ¡u z teamom pomocy do zwiska, jeli chceÅ¡ wo tym diskutować. auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje. openid_logo_alt: Z OpenID přizjewić @@ -1536,6 +1793,9 @@ hsb: github: title: Z GitHub přizjewić alt: Z kontom GitHub přizjewić + wikipedia: + title: Z Wikipediju přizjewić + alt: Z kontom Wikipedije přizjewić wordpress: title: Přizjewjenje z Wordpress alt: Přizjewjenje z Wordpress OpenID @@ -1546,6 +1806,24 @@ hsb: title: Wotzjewić heading: Z OpenStreetMap wotzjewić logout_button: Wotzjewić + shared: + markdown_help: + title_html: Parsowany z kramdown + headings: Nadpisy + heading: Nadpis + subheading: Podnapis + unordered: Naličenje + ordered: Čisłowana lisćina + first: Prěni element + second: Druhi element + link: Wotkaz + text: Tekst + image: Wobraz + alt: Alternatiwny tekst + url: URL + richtext_field: + edit: Wobdźěłać + preview: Přehlad site: about: next: Dale @@ -1597,9 +1875,8 @@ hsb: abo zepěraÅ¡ so na nje, móžeÅ¡ wuslědk jenož pod samsnej licencu rozdźělić. Dospołny tekst licency wujasnja twoje prawa a winowatosće. - intro_3_1_html: Kartografija w naÅ¡ich kartowych kachličkach a naÅ¡a dokumentacija - stej pod licencu Creative - Commons Attribution-ShareAlike 2.0 (CC-BY-SA) licencowanej. + intro_3_1_html: NaÅ¡a dokumentacija je pod licencu Creative + Commons Attribution-ShareAlike 2.0 (CC BY-SA 2.0) licencowana. credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać credit_1_html: Žadamy sej wužiwanje pokazki „© sobuskutkowacy OpenStreetMap“. credit_2_1_html: DyrbiÅ¡ tež wujasnić, zo steja daty pod licencu Open Database, @@ -1647,8 +1924,10 @@ hsb: Générale des Impôts.' contributors_nl_html: 'Nižozemska: Wobsahuje daty © AND data, 2007 (www.and.com)' - contributors_nz_html: 'Nowoseelandska: Wobsahuje daty ze - žórłow wot Land Information New Zealand. Awtorske prawo wuměnjene.' + contributors_nz_html: "Nowoseelandska: Wobsahuje daty ze + słužby \nLand Information New Zealand + a \nje za zasowužiwanje pod \nCC + BY 4.0 licencowane." contributors_si_html: 'Słowjenska: Wobsahuje daty ze zarjada za krajměrjenje a kartěrowanje kaž tež z ministerstwa za ratarstwo, lěsnistwo a zežiwjenje (zjawne informacije Słowjenskeje).' @@ -1657,7 +1936,7 @@ hsb: Information, Statne awtorske prawo wuměnjene.' contributors_gb_html: 'Zjednoćene kralestwo: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) © Awtorske prawo a prawo - za datowe banki 2010-2012.' + za datowe banki 2010-2019.' contributors_footer_1_html: Za dalÅ¡e podrobnosće za to a druhe žórła, kotrež su so wužili, zo bychu OpenStreetMap polěpÅ¡ili, hlej proÅ¡u stronu sobuskutkowarjow na wikiju OpenStreetMap. @@ -1772,7 +2051,7 @@ hsb: temow. welcome: url: /welcome - title: Witaj k OSM + title: Witaj k OpenStreetMap description: Započń z tutym spěšnym nawodom, kotryž zakłady OpenStreetMap wobsahuje. beginners_guide: @@ -1781,7 +2060,7 @@ hsb: description: Přez zhromadźenstwo wothladowany nawod za započatkowarjow. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org + title: Forum pomocy description: PraÅ¡ej so za něčim abo pytaj za wotmołwami na stronje praÅ¡enjow a wotmołwow OpenStreetMap. mailing_lists: @@ -1798,10 +2077,13 @@ hsb: title: Přeńć k OSM description: Pomoc za předewzaća a organizacije, kotrež na kartach a druhich słužbach bazuja a k OpenStreetMap přeńdu. + welcomemat: + url: https://welcome.openstreetmap.org/ + title: Za organizacije wiki: url: http://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Přepytaj wiki za nadrobnej OSM-dokumentaciju + title: Wiki OpenStreetMap + description: Přepytaj wiki za nadrobnej dokumentaciju OpenStreetMap sidebar: search_results: Pytanske wuslědki close: Začinić @@ -1811,9 +2093,10 @@ hsb: get_directions_title: Wobličenje čary mjez městnomaj from: Wot to: Do - where_am_i: Hdźe sym? + where_am_i: Hdźe to je? where_am_i_title: Aktualne městno z pomocu pytawy wopisać submit_text: Dźi + reverse_directions_text: Směry wobroćić key: table: entry: @@ -1826,6 +2109,9 @@ hsb: track: Čara bridleway: Jěchanski puć cycleway: Kolesowarska šćežka + cycleway_national: Narodna kolesowarska šćežka + cycleway_regional: Regionalna kolesowarska šćežka + cycleway_local: Lokalna kolesowarska šćežka footway: Chódnik rail: Železnica subway: Podzemska železnica @@ -1878,6 +2164,9 @@ hsb: private: Priwatny přistup destination: Jenož za přidróžnych construction: Dróhi w twarje + bicycle_shop: Kolesarnja + bicycle_parking: Kólaso parkowanišćo + toilets: Nuzniki welcome: title: Witaj! introduction_html: Witaj k OpenstreetMap, swobodnej a wobdźěłujomnej karće swěta. @@ -1915,7 +2204,7 @@ hsb: title: MaÅ¡ hišće praÅ¡enja? paragraph_1_html: |- OpenStreetMap ma wÅ¡elake resursy za zeznaće projekta, praÅ¡enja a wotmołwy wo něčim a zhromadnu diskusiju a dokumentowanje kartěrowanske temy. - Pomoc. + Pomoc. MaÅ¡ plany z organizaciju za OpenStreetMap? Wopytajće naÅ¡u witansku stronu. start_mapping: Kartěrowanje započeć add_a_note: title: NimaÅ¡ chwile za wobdźěłowanje? Přidaj pokazku! @@ -1934,8 +2223,11 @@ hsb: identifiable: Identifikujomny (pokazuje so w lisćinje ćěrjow a jako identifikujomny, zrjadowane dypki z časowymi kołkami) new: + upload_trace: GPS-ćěr nahrać visibility_help: Å¡to to woznamjenja? + visibility_help_url: https://wiki.openstreetmap.org/wiki/DE:Visibility_of_GPS_traces help: Pomoc + help_url: https://wiki.openstreetmap.org/wiki/DE:Upload create: upload_trace: GPS-ćěr nahrać trace_uploaded: Twoja GPX-dataja je so nahrała a čaka na zasunjenje do datoweje @@ -1949,9 +2241,12 @@ hsb: nahrate, prjedy hač dalÅ¡e nahrawaÅ¡, zo njeby so čakanski rynk za druhich wužiwarjow blokował. edit: + cancel: Přetorhnyć title: Ćěr %{name} wobdźěłać heading: Ćěr %{name} wobdźěłać visibility_help: Å¡to to woznamjenja? + update: + updated: Ćěr je so zaktualizowała. trace_optionals: tags: Atributy show: @@ -1963,6 +2258,7 @@ hsb: uploaded: 'Nahraty dnja:' points: 'Dypki:' start_coordinates: 'Startowa koordinata:' + coordinates_html: '%{latitude}; %{longitude}' map: karta edit: wobdźěłać owner: 'Wobsedźer:' @@ -1973,13 +2269,18 @@ hsb: delete_trace: Tutu čaru zničić trace_not_found: Ćěr njenamakana! visibility: 'Widźomnosć:' + confirm_delete: Tutu ćěr zhaÅ¡eć? trace_paging_nav: showing_page: Strona %{page} older: StarÅ¡e ćěrje newer: NowÅ¡e ćěrje trace: pending: NJESČINJENY - count_points: '%{count} dypkow' + count_points: + one: '%{count} dypk' + two: '%{count} dypkaj' + few: '%{count} dypki' + other: '%{count} dypkow' more: wjace trace_details: Podrobnosće ćěrje pokazać view_map: Kartu pokazać @@ -1992,6 +2293,7 @@ hsb: in: w index: public_traces: Zjawne GPS-ćěrje + my_traces: Moje ćěrje public_traces_from: Zjawne GPS-ćěrje wot %{user} description: NajnowÅ¡e nahraća GPS-čarow přepytać tagged_with: Markěrowane přez %{tags} @@ -1999,6 +2301,8 @@ hsb: wukń wjace wo GPS-slědowanju na wikijowej stronje. upload_trace: Ćěr nahrać + all_traces: Wšě ćěrje + traces_from: Zjawne ćěrje wot %{user} destroy: scheduled_for_deletion: Čara předwidźana za zničenje make_public: @@ -2022,12 +2326,19 @@ hsb: require_cookies: cookies_needed: Zda so, zo maÅ¡ placki znjemóžnjene - proÅ¡u zmóžń placki w swojim wobhladowaku, prjedy hač pokročujeÅ¡. + require_admin: + not_an_admin: DyrbiÅ¡ administrator być, zo by tutu akciju wuwjedł. setup_user_auth: blocked: Twój přistup k API je so blokował. ProÅ¡u přizjew so do webpowjercha, zo by wjace zhonił. need_to_see_terms: Twój přistup na API je nachwilu wusadźeny. ProÅ¡u přizjew so k webpowjerchej, zo by sej wuměnjenja za sobuskutkowacych wobhladał. NjetrjebaÅ¡ přezjedny być, dyrbiÅ¡ sej je jenož wobhladać. + settings_menu: + account_settings: Kontowe nastajenja + oauth1_settings: Nastajenja OAUTH 1 + oauth2_applications: Nastajenja OAUTH 2 + oauth2_authorizations: Prawa OAUTH 2 oauth: authorize: title: Přistup na twoje konto awtorizować @@ -2053,6 +2364,13 @@ hsb: invalid: Awtorizaciski token płaćiwy njeje. revoke: flash: Sy token za %{application} anulował. + scopes: + read_prefs: Wužiwarske nastajenja čitać + write_prefs: Wužiwarske nastajenja změnić + write_api: Kartu změnić + read_gpx: Priwatne GPS-ćěrje čitać + write_gpx: GPS-ćěrje nahrać + write_notes: Noticy změnić oauth_clients: new: title: Nowu aplikaciju registrować @@ -2081,6 +2399,7 @@ hsb: no_apps_html: MaÅ¡ aplikaciju, kotruž chceÅ¡ za wužiwanje z standardom %{oauth} registrować? DyrbiÅ¡ swoju webaplikaciju registrować, prjedy hač móžeÅ¡ napraÅ¡owanja OAuth k tutej słužbje wotpósłać. + oauth: OAuth registered_apps: 'Sy slědowace aplikacije zregistrował:' register_new: Twoju aplikaciju registrować form: @@ -2093,13 +2412,57 @@ hsb: flash: Klientowe informacije wuspěšnje zaktualizowane destroy: flash: Registrowanje klientoweje aplikacije bu zničene + oauth2_applications: + index: + title: Moje klientowe aplikacije + no_applications_html: MaÅ¡ aplikaciju, kotruž chceÅ¡ za wužiwanje z standardom + %{oauth2} registrować? DyrbiÅ¡ swoju nałoženje registrować, prjedy hač móžeÅ¡ + napraÅ¡owanja OAuth k tutej słužbje wotpósłać. + new: Nowe nałoženje registrować + name: Mjeno + permissions: Prawa + application: + edit: Wobdźěłać + delete: ZhaÅ¡eć + confirm_delete: Tute nałoženje zhaÅ¡eć? + new: + title: Nowu aplikaciju registrować + edit: + title: Twoje nałoženje wobdźěłać + show: + edit: Wobdźěłać + delete: ZhaÅ¡eć + confirm_delete: Tute nałoženje zhaÅ¡eć? + client_id: Klientowy ID + client_secret: Klientowe potajnstwo + permissions: Prawa + redirect_uris: Dalesposrědkowanske URI + not_found: + sorry: Tute nałoženje njeje so bohužel namakało. + oauth2_authorizations: + new: + title: Awtorizacija trěbna + authorize: Awtorizować + deny: Wotpokazać + error: + title: Zmylk je wustupił + show: + title: Awtorizaciski kod + oauth2_authorized_applications: + index: + title: Moje awtorizowane nałoženja + application: Nałoženje + permissions: Prawa + application: + revoke: Přistup zebrać + confirm_revoke: Přistup za tute nałoženje zebrać? users: new: title: Registrować no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce załožić. - contact_support_html: ProÅ¡u staj so z webmasterom do - zwiska, zo by so konto załožiło - budźemy pospytać napraÅ¡owanje tak spěšnje + contact_support_html: ProÅ¡u staj so z teamom pomocy + do zwiska, zo by so konto załožiło - budźemy pospytać napraÅ¡owanje tak spěšnje kaž móžno wobdźěłać. about: header: Swobodny a wobdźěłujomny @@ -2118,13 +2481,18 @@ hsb: continue: Registrować terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował! terms: - title: Wuměnjenja za sobuskutkowarjow - heading: Wuměnjenja za sobuskutkowarjow - consider_pd: Přidatnje k horjeka mjenowanemu dojednanju, mam swoje přinoÅ¡ki - za zjawnosć přistupne. + title: Wuměnjenja + heading: Wuměnjenja + heading_ct: Wuměnjenja za sobuskutkowarjow + read_tou: Sym wužiwanske wuměnjenja přečitał a sym z nimi přezjedny|přezjedna + consider_pd: Přidatnje k horjeka mjenowanym wuměnjenjam, mam swoje přinoÅ¡ki + za powÅ¡itkownosći wužitne. consider_pd_why: Å to to je? + consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Informacije, kotrež pomhaja tute wuměnjenja rozumić: zrozumliwe zjeće a někotre njeoficielne přełožki' + continue: Dale + declined: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined decline: Wotpokazać you need to accept or decline: ProÅ¡u přečitaj nowe wužiwarske wuměnjenja a akceptuj abo wotpokazaj je, prjedy hač dale činiÅ¡. @@ -2133,6 +2501,11 @@ hsb: france: Francoska italy: Italska rest_of_world: Zbytk swěta + terms_declined_flash: + terms_declined_html: Wobžarujemy, zo sy so rozsudźił, nowe wuměnjenja za sobuskutkowarjow + njeakceptować. Za dalÅ¡e informacije hlej proÅ¡u %{terms_declined_link}. + terms_declined_link: tuta wikistrona + terms_declined_url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined no_such_user: title: Wužiwar njeeksistuje heading: Wužiwar %{user} njeeksistuje @@ -2149,8 +2522,10 @@ hsb: my profile: Mój profil my settings: Moje nastajenja my comments: Moje komentary + my_preferences: Moje nastajenja blocks on me: Dostane blokowanja blocks by me: Date blokowanja + edit_profile: Profil wobdźěłać send message: Powěsć pósłać diary: Dźenik edits: Změny @@ -2162,18 +2537,13 @@ hsb: ct status: 'Wuměnjenja za sobuskutkowarjow:' ct undecided: Njerozsudźeny ct declined: Wotpokazany - latest edit: 'NajnowÅ¡a změna %{ago}:' + latest edit: 'NajnowÅ¡a změna (%{ago}):' email address: 'E-mejlowa adresa:' created from: 'Wutworjeny z:' status: 'Status:' spam score: 'Spamowe hódnoćenje:' description: Wopisanje user location: Wužiwarske stejnišćo - no friends: Hišće njejsy přećelow přidał. - km away: '%{count} km zdaleny' - m away: '%{count} m zdaleny' - nearby users: Druzy wužiwarjo w bliskosći - no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja. role: administrator: Tutón wužiwar je administrator moderator: Tutón wužiwar je moderator. @@ -2194,24 +2564,17 @@ hsb: unhide_user: Tutoho wužiwarja pokazaś delete_user: Tutoho wužiwarja zhaÅ¡eć confirm: Wobkrućić - friends_changesets: Sadźby změnow twojich přećelow - friends_diaries: Dźenikowe zapiski přećelow - nearby_changesets: sadźby změnow wužiwarjow w bliskosći - nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći - popup: - your location: Twoje městno - nearby mapper: Kartěrowar w bliskosći - friend: Přećel + report: Tutoho wužiwarja zdźělić account: title: Konto wobdźěłać my settings: Moje nastajenja - current email address: 'Aktualna e-mejlowa adresa:' - external auth: 'Eksterna awtentifikacija:' + current email address: Aktualna e-mejlowa adresa + external auth: Eksterna awtentifikacija openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: Å to to je? public editing: - heading: 'Zjawne wobdźěłowanje:' + heading: Zjawne wobdźěłowanje enabled: Zmóžnjene. Nic anonymne a daty hodźa so wobdźěłać. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Å to to je? @@ -2228,12 +2591,13 @@ hsb: e-mejlowa adresa njebudźe so zjawnej pokazać.

  • Tuta akcija njeda so wobroćić a wÅ¡itcy nowi wužiwarjo su nětko po standardźe zjawni.
    • contributor terms: - heading: 'Wuměnjenja za sobuskutkowarjow:' + heading: Wuměnjenja za sobuskutkowarjow agreed: Sy do nowych wuměnjenjow za sobuskutkowarjow zwolił. not yet agreed: Hišće njejsy do nowych wuměnjenjow za sobuskutkowarjow zwolił. review link text: ProÅ¡u slěduj někajkižkuli wotkaz, zo by nowe wuměnjenja za sobuskutkowarjow přehladał a akceptował. agreed_with_pd: Sy tež deklarował, zo twoje změny su zjawne. + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Å¡to to je? save changes button: Změny składować make edits public button: Wšě moje změny zjawne činić @@ -2258,12 +2622,13 @@ hsb: suspended: title: Konto wupowědźene heading: Konto wupowědźene + support: pomoc body_html: |-

    Twoje konto bu bohužel podhladneje aktiwity dla wupowědźene.

    - Tutón rozsud budźe so bórze wot administratora pruwować, abo móžeš so z %{webmaster} do zwiska stajić, jeli chceš wo tym diskutować. + Tutón rozsud budźe so bórze wot administratora přepruwować, abo móžeš so z %{webmaster} do zwiska stajić, jeli chceš wo tym diskutować.

    auth_failure: connection_failed: Zwisk z awtentifikaciskim poskićowarjom je so nimokulił @@ -2283,6 +2648,8 @@ hsb: not_a_role: ZnamjeÅ¡kowy rjećazk "%{role}" płaćiwa róla njeje. already_has_role: Wužiwar hižo ma rólu %{role}. doesnt_have_role: Wužiwar nima rólu %{role}. + not_revoke_admin_current_user: Administratorowa róla njeda so aktualnemu wužiwarjej + prěč wzać. grant: title: Daće róle wobkrućić heading: Daće róle wobkrućić @@ -2339,13 +2706,15 @@ hsb: title: Zběhnje so blokowanje přećiwo %{block_on} heading_html: Zběhnje so blokowanje přećiwo %{block_on} wot %{block_by} time_future: Tute blokowanje skónči so %{time}. - past: Tute blokowanje je so před %{time} skónčiło a njeda so nětko zběhnyć. + past: Tute blokowanje je so %{time} skónčiło a njeda so nětko zběhnyć. confirm: ChceÅ¡ woprawdźe tute blokowanje zběhnyć? revoke: Zběhnyć! flash: Tute blokowanje je so zběhnyło. helper: time_future_html: Kónči so %{time}. until_login: Aktiwne, doniž so wužiwar njepřizjewja. + time_future_and_until_login_html: Skónči so za %{time} a po tym zo wužiwar bě + so přizjewił. time_past_html: Je so před %{time} skónčiło. block_duration: hours: @@ -2353,6 +2722,26 @@ hsb: one: 1 hodźina two: '%{count} hodźinje' other: '%{count} hodźin' + days: + one: '%{count} dźeń' + two: '%{count} dnjej' + few: '%{count} dny' + other: '%{count} dnjow' + weeks: + one: '%{count} tydźeń' + two: '%{count} njedźeli' + few: '%{count} njedźele' + other: '%{count} njedźel' + months: + one: '%{count} měsac' + two: '%{count} měsacaj' + few: '%{count} měsacy' + other: '%{count} měsacow' + years: + one: '%{count} lěto' + two: '%{count} lěće' + few: '%{count} lěta' + other: '%{count} lět' blocks_on: title: Blokowanja přećiwo %{name} heading_html: Lisćina blokowanjow přećiwo %{name} @@ -2364,8 +2753,9 @@ hsb: show: title: '%{block_on} wot %{block_by} zablokowany' heading_html: '%{block_on} wot %{block_by} zablokowany' - created: Wutworjeny - status: Status + created: 'Wutworjeny:' + duration: 'Traće:' + status: 'Status:' show: Pokazać edit: Wobdźěłać revoke: Blokowanje zběhnyć! @@ -2393,6 +2783,7 @@ hsb: title: Pokazki, kotrež su so wot %{user} dali abo komentowali heading: Pokazki wužiwarja %{user} subheading_html: Pokazki, kotrež su so wot %{user} dali abo komentowali + no_notes: Žane pokazy id: ID creator: Tworićel description: Wopisanje @@ -2412,6 +2803,7 @@ hsb: custom_dimensions: Swójske wotměry nastajić format: 'Format:' scale: 'Měritko:' + image_dimensions: Wobraz standardnu runinu pola %{width} x %{height} pokaza download: Sćahnyć short_url: Krótki URL include_marker: Kartowu marku stajić @@ -2424,26 +2816,40 @@ hsb: key: title: Legenda tooltip: Legenda - tooltip_disabled: Legenda jenož za standardnu runinu k dispoziciji steji + tooltip_disabled: Legenda za tutu runinu k dispoziciji njeje map: zoom: in: PowjetÅ¡ić out: Pomjeńšić locate: title: Aktualne městno pokazać + metersPopup: + one: Sće mjenje hač %{count} meter wot tutoho dypka zdaleny + two: Sće mjenje hač %{count} metraj wot tutoho dypka zdaleny + few: Sće mjenje hač %{count} metry wot tutoho dypka zdaleny + other: Sće mjenje hač %{count} metrow wot tutoho dypka zdaleny + feetPopup: + one: Sće mjenje hač %{count} stopu wot tutoho dypka zdaleny + two: Sće mjenje hač %{count} stopje wot tutoho dypka zdaleny + few: Sće mjenje hač %{count} stopy wot tutoho dypka zdaleny + other: Sće mjenje hač %{count} stopow wot tutoho dypka zdaleny base: standard: Standard + cyclosm: CyclOSM cycle_map: Kolesowa karta transport_map: Wobchadna karta hot: Sobuskutkowacy humanitarneje pomocy + opnvkarte: ÖPNVKarte layers: header: Kartowe runiny notes: Pokazki data: Kartowe daty + gps: Zjawne GPS-ćěrje overlays: WorÅ¡ty za pytanje za zmylkami na karće zmóžnić title: Runiny copyright: © Sobuskutkowarjo OpenStreetMap donate_link_text: + terms: Wuměnjenja websydła a API site: edit_tooltip: Kartu wobdźěłać edit_disabled_tooltip: Za wobdźěłanje karty powjetÅ¡ić @@ -2464,8 +2870,7 @@ hsb: new: intro: Sy zmylk widźał abo zo něšto faluje? Informuj druhich kartografow, zo móhli to porjedźić. Přesuń marku ke korektnej poziciji a zapisaj pokazku, - zo by problem wujasnił. (ProÅ¡u njezapodaj wosobinske informacije abo informacije - z kartow Å¡kitanych přez awtorske prawo abo lisćiny rjadowakow.) + zo by problem wujasnił. add: Pokazku přidać show: anonymous_warning: Tuta pokazka wobsahuje komentary wot anonymnych wužiwarjow, @@ -2478,36 +2883,95 @@ hsb: edit_help: Přesuń kartu do městna, kotrež chceÅ¡ wobdźěłać, powjetÅ¡ tam a klikń potom tu. directions: + ascend: Postupowacy engines: + fossgis_osrm_bike: Koleso (OSRM) fossgis_osrm_car: Awto (OSRM) + fossgis_osrm_foot: Pěši (OSRM) graphhopper_bicycle: Koleso (GraphHopper) + graphhopper_car: Awto (GraphHopper) graphhopper_foot: Pěši (GraphHopper) + descend: Spadowacy directions: Směry distance: Zdalenosć errors: no_route: Njenamakach čaru mjez tutymaj městnomaj. - no_place: Njenamakach tute městno. + no_place: Bohužel njemóžachmy městno „%{place}“ namakać. instructions: continue_without_exit: Dale na %{name} slight_right_without_exit: połnaprawo na %{name} + offramp_right: Prawy najězd wzać + offramp_right_with_exit: Prawy wujězd %{exit} wzać + offramp_right_with_exit_name: Prawy wujězd %{exit} na %{name} wzać + offramp_right_with_exit_directions: Prawy wujězd %{exit} k směrej %{directions} + wzać + offramp_right_with_exit_name_directions: Prawy wujězd %{exit} na %{name} k + směrej %{directions} wzać + offramp_right_with_name: Prawy najězd na %{name} wzać + offramp_right_with_directions: Prawy najězd k směrej %{directions} wzać + offramp_right_with_name_directions: Prawy najězd na %{name} k směrej %{directions} + wzać + onramp_right_without_exit: Pola najězda na %{name} naprawo wotbočić + onramp_right_with_directions: Naprawo na najězd k směrej %{directions} wotbočić + onramp_right_with_name_directions: Naprawo na najězd na %{name} k směrej %{directions} + wotbočić + onramp_right_without_directions: Naprawo na najězd wotbočić + onramp_right: Naprawo na najězd wotbočić + endofroad_right_without_exit: Na kóncu dróhi naprawo na %{name} wotbočić + merge_right_without_exit: So naprawo do %{name} zarjadować + fork_right_without_exit: Pola rozpuća naprawo na %{name} wotbočić turn_right_without_exit: Wotboč naprawo na %{name} sharp_right_without_exit: Połnje naprawo na %{name} uturn_without_exit: So zawróćić podłu %{name} sharp_left_without_exit: Połnje nalěwo na %{name} turn_left_without_exit: Wotboč nalěwo na %{name} + offramp_left: Lěwy najězd wzać + offramp_left_with_exit: Lěwy wujězd %{exit} wzać + offramp_left_with_exit_name: Lěwy wujězd %{exit} na %{name} wzać + offramp_left_with_exit_directions: Lěwy wujězd %{exit} k směrej %{directions} + wzać + offramp_left_with_exit_name_directions: Lěwy wujězd %{exit} na %{name} k směrej + %{directions} wzać + offramp_left_with_name: Lěwy najězd na %{name} wzać + offramp_left_with_directions: Lěwy najězd k směrej %{directions} wzać + offramp_left_with_name_directions: Lěwy najězd na %{name} k směrej %{directions} + wzać + onramp_left_without_exit: Pola najězda nalěwo %{name} wotbočić + onramp_left_with_directions: Nalěwo na najězd k směrej %{directions} wotbočić + onramp_left_with_name_directions: Nalěwo na najězd na %{name} k směrej %{directions} + wotbočić + onramp_left_without_directions: Nalěwo na najězd wotbočić + onramp_left: Nalěwo na najězd wotbočić + endofroad_left_without_exit: Na kóncu dróhi nalěwo na %{name} wotbočić + merge_left_without_exit: So nalěwo do %{name} zarjadować + fork_left_without_exit: Pola rozpuća nalěwo na %{name} wotbočić slight_left_without_exit: Połnalěwo na %{name} via_point_without_exit: (přez městno) follow_without_exit: Dale na %{name} - roundabout_without_exit: Wzaj %{name} w kružnym wobchadźe + roundabout_without_exit: W kružnym wobchadźe wujězd %{name} wzać leave_roundabout_without_exit: Wopušć kružny wobchad – %{name} stay_roundabout_without_exit: Wostań w kružnym wobchadźe – %{name} - start_without_exit: Na kóncu %{name} započeć + start_without_exit: Pola %{name} započeć destination_without_exit: Cil docpěty against_oneway_without_exit: Přećiwo jednosměrowej dróze na %{name}hić end_oneway_without_exit: Kónc jednosměroweje dróhi na %{name} roundabout_with_exit: W kružnym wobchadźe wzaj wujězd %{exit} na %{name} + roundabout_with_exit_ordinal: W kružnym wobchadźe %{exit} wujězd na %{name} + wzać + exit_roundabout: Kružny wobchad na %{name} wopušćić unnamed: njeznaty puć courtesy: Směrowe instrukcije pochadźeja wot %{link} + exit_counts: + first: prěni + second: druhi + third: třeći + fourth: Å¡twórty + fifth: pjaty + sixth: šěsty + seventh: sedmy + eighth: wosmy + ninth: dźewjaty + tenth: dźesaty time: Čas query: node: Suk @@ -2516,6 +2980,12 @@ hsb: nothing_found: Žane funkcije namakane error: 'Zmylk při kontaktowanju %{server}: %{error}' timeout: Čas překročowany při kontaktowanju %{server} + context: + directions_from: Čara wottud + directions_to: Čara wottud + show_address: Adresu pokazać + query_features: Funkcije napraÅ¡ować + centre_map: Kartu tu srjedźić redactions: edit: heading: Redakciju wobdźěłać @@ -2544,4 +3014,7 @@ hsb: prjedy hač ju zhaÅ¡eÅ¡. flash: Redakcija je so zhaÅ¡ała. error: Při haÅ¡enju tuteje redakcije je zmylk wustupił. + validations: + invalid_characters: wobsahuje njepłaćiwe znamjeÅ¡ka + url_characters: wobsahuje wosebite URL-znamjeÅ¡ka (%{characters}) ... diff --git a/config/locales/hu.yml b/config/locales/hu.yml index e7da92eb9..8a8f62ad4 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -428,7 +428,7 @@ hu: index: title: Módosításcsomagok title_user: '%{user} módosításcsomagjai' - title_friend: Ismerőseim módosításcsomagjai + title_friend: Ismerősök módosításcsomagjai title_nearby: Közeli felhasználók módosításcsomagjai empty: Nem található módosításcsomag empty_area: Nincs módosításcsomag erre a területre. @@ -453,6 +453,28 @@ hu: timeout: sorry: Sajnáljuk, túl sokáig tartott az általad kért módosításcsomag-hozzászólások listájának lekérése. + dashboards: + contact: + km away: '%{count} km távolságra' + m away: '%{count} m távolságra' + popup: + your location: Helyed + nearby mapper: Közeli térképszerkesztő + friend: Ismerős + show: + title: Irányítópult + no_home_location_html: '%{edit_profile_link}, és add meg az otthoni tartózkodási + helyed, hogy lásd a közeli felhasználókat.' + edit_your_profile: Szerkeszd a profilodat + my friends: Ismerősök + no friends: Még nem adtál meg egyetlen ismerőst sem. + nearby users: További közeli felhasználók + no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben + szerkesztenek. + friends_changesets: ismerősök módosításcsomagjai + friends_diaries: ismerősök naplóbejegyzései + nearby_changesets: közeli felhasználók módosításcsomagjai + nearby_diaries: közeli felhasználók naplóbejegyzései diary_entries: new: title: Új naplóbejegyzés @@ -788,6 +810,7 @@ hu: window_construction: Ablakkészítő winery: Borászat "yes": Kézműves bolt + crossing: Gyalogosátkelő emergency: access_point: Mentési pont ambulance_station: Mentőállomás @@ -1043,6 +1066,7 @@ hu: hill: Domb hot_spring: Hőforrás island: Sziget + isthmus: Földszoros land: Szárazföld marsh: Mocsár moor: Mocsár @@ -1057,10 +1081,13 @@ hu: sand: Homok scree: Törmeléklejtő scrub: Bozót + shingle: Kavicsos tengerpart vagy folyómeder spring: Forrás stone: Kő strait: Tengerszoros tree: Fa + tree_row: Fasor + tundra: Tundra valley: Völgy volcano: Vulkán water: Víz @@ -1457,9 +1484,10 @@ hu: intro_text: Az OpenStreetMap egy világtérkép, amelyet hozzád hasonló emberek készítenek és szabad licenc alatt elérhető. intro_2_create_account: Felhasználói fiók létrehozása - hosting_partners_html: 'Az üzemeltetés támogatói: %{ucl}, %{bytemark}, és további - %{partners}.' + hosting_partners_html: 'Az üzemeltetés támogatói: %{ucl}, %{fastly}, %{bytemark}, + és további %{partners}.' partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partnerek tou: Felhasználási feltételek @@ -1646,8 +1674,8 @@ hu: messages: inbox: title: Beérkezett üzenetek - my_inbox: Beérkezett üzeneteim - my_outbox: Elküldött üzeneteim + my_inbox: Beérkezett üzenetek + my_outbox: Elküldött üzenetek messages: '%{new_messages} és %{old_messages} van' new_messages: one: 1 új üzeneted @@ -1682,8 +1710,8 @@ hu: body: Sajnáljuk, nincs ilyen azonosítójú üzenet. outbox: title: Elküldött üzenetek - my_inbox: Beérkezett üzeneteim - my_outbox: Elküldött üzeneteim + my_inbox: Beérkezett üzenetek + my_outbox: Elküldött üzenetek messages: one: Egy elküldött üzeneted van other: '%{count} elküldött üzeneted van' @@ -1736,7 +1764,7 @@ hu: flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t. preferences: show: - title: Beállításaim + title: Megjelenési beállítások preferred_editor: Előnyben részesített szerkesztő preferred_languages: Előnyben részesített nyelvek edit_preferences: Beállítások szerkesztése @@ -1953,9 +1981,11 @@ hu: Ausztria: adatokat tartalmaz a következő forrásból: Bécs városa CC BY licenc alatt. - contributors_au_html: |- - Ausztrália: tartalmaz külvárosi adatokat az - Ausztrál Statisztikai Hivatal adatain alapulva. + contributors_au_html: 'Ausztrália: A Commonwealth of Australia által a Creative Commons Attribution + 4.0 International licenc (CC BY 4.0) alapján engedélyezett Geoscape + Australia Administrative Boundaries © (közigazgatási határok) felhasználásával + készült vagy azt tartalmazza.' contributors_ca_html: |- Kanada: adatokat tartalmaz a következő forrásokból: GeoBase®, GeoGratis (© Department of Natural @@ -2592,16 +2622,17 @@ hu: is lehet, hogy rossz linkre kattintottál. deleted: törölve show: - my diary: Naplóm + my diary: Saját napló new diary entry: új naplóbejegyzés - my edits: Szerkesztéseim + my edits: Saját szerkesztések my traces: Nyomvonalaim - my notes: Jegyzeteim - my messages: Üzeneteim - my profile: Profilom - my settings: Beállításaim - my comments: Hozzászólásaim - my_preferences: Beállításaim + my notes: Saját jegyzetek + my messages: Üzenetek + my profile: Profil + my settings: Személyes beállítások + my comments: Saját hozzászólások + my_preferences: Megjelenési beállítások + my_dashboard: Irányítópult blocks on me: Engem sújtó blokkolások blocks by me: Általam kiosztott blokkolások edit_profile: Profil szerkesztése @@ -2623,16 +2654,6 @@ hu: spam score: 'Spam pontszám:' description: Leírás user location: Felhasználó helye - no_home_location_html: '%{edit_profile_link}, és add meg az otthoni tartózkodási - helyed, hogy lásd a közeli felhasználókat.' - edit_your_profile: Szerkeszd a profilodat - my friends: Ismerőseim - no friends: Még nem adtál meg egyetlen ismerőst sem. - km away: '%{count} km távolságra' - m away: '%{count} m távolságra' - nearby users: További közeli felhasználók - no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben - szerkesztenek. role: administrator: Ez a felhasználó adminisztrátor moderator: Ez a felhasználó moderátor @@ -2653,18 +2674,10 @@ hu: unhide_user: felhasználó elrejtésének megszüntetése delete_user: felhasználó törlése confirm: Megerősítés - friends_changesets: ismerősök módosításcsomagjai - friends_diaries: ismerősök naplóbejegyzései - nearby_changesets: közeli felhasználók módosításcsomagjai - nearby_diaries: közeli felhasználók naplóbejegyzései report: Felhasználó bejelentése - popup: - your location: Helyed - nearby mapper: Közeli térképszerkesztő - friend: Ismerős account: title: Fiók szerkesztése - my settings: Beállításaim + my settings: Személyes beállítások current email address: Jelenlegi e-mail-cím external auth: Külső hitelesítés openid: @@ -2699,7 +2712,7 @@ hu: link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: mi ez? save changes button: Módosítások mentése - make edits public button: Szerkesztéseim nyilvánossá tétele + make edits public button: Az összes szerkesztésem nyilvánossá tétele flash update success confirm needed: Felhasználói információk sikeresen frissítve. Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez. flash update success: Felhasználói információk sikeresen frissítve. diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 8557c8204..ea97dc65c 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -431,6 +431,27 @@ ia: timeout: sorry: Le lista de commentos sur gruppos de modificationes que tu requestava tardava troppo de tempore pro esser recuperate. + dashboards: + contact: + km away: a %{count} km de distantia + m away: a %{count} m de distantia + popup: + your location: Tu position + nearby mapper: Cartographo vicin + friend: Amico + show: + title: Mi pannello + no_home_location_html: '%{edit_profile_link} e defini tu loco de domicilio pro + vider le usatores a proximitate.' + edit_your_profile: Modifica tu profilo + my friends: Mi amicos + no friends: Tu non ha ancora addite alcun amico. + nearby users: Altere usatores vicin + no nearby users: Il non ha ancora altere cartographos in le vicinitate. + friends_changesets: gruppos de modificationes de tu amicos + friends_diaries: articulos de diario de tu amicos + nearby_changesets: gruppos de modificationes de usatores a proximitate + nearby_diaries: articulos de diario per usatores a proximitate diary_entries: new: title: Nove entrata de diario @@ -764,6 +785,7 @@ ia: window_construction: Construction de fenestras winery: Vinia "yes": Boteca de artisanato + crossing: Transversamento emergency: access_point: Puncto de accesso ambulance_station: Station de ambulantias @@ -1019,6 +1041,7 @@ ia: hill: Collina hot_spring: Fonte thermal island: Insula + isthmus: Isthmo land: Terra marsh: Palude moor: Landa @@ -1033,10 +1056,13 @@ ia: sand: Sablo scree: Detrito cadite scrub: Arbusto + shingle: Silice spring: Fontana stone: Petra strait: Stricto tree: Arbore + tree_row: Fila de arbores + tundra: Tundra valley: Vallea volcano: Vulcano water: Aqua @@ -1435,9 +1461,10 @@ ia: intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere de usar sub un licentia aperte. intro_2_create_account: Crea un conto de usator - hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark} - e altere %{partners}. + hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{fastly}, + %{bytemark} e altere %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partners tou: Conditiones de uso @@ -1930,10 +1957,11 @@ ia: BY, Land Vorarlberg e Land Tirol (sub CC BY AT con emendamentos).' - contributors_au_html: 'Australia: Contine datos obtenite - ab PSMA - Australia Limited licentiate per le Commonwealth de Australia sub CC BY 4.0.' + contributors_au_html: 'Australia: Incorpora o disveloppate + usante Limites Administrative © Geoscape + Australia publicate per le Commonwealth de Australia sub licentia Creative Commons Attribution + 4.0 International (CC BY 4.0).' contributors_ca_html: |- Canada: Contine datos ab GeoBase®, GeoGratis (© Department of Natural @@ -2595,6 +2623,7 @@ ia: my settings: Mi preferentias my comments: Mi commentos my_preferences: Mi preferentias + my_dashboard: Mi pannello blocks on me: Blocadas concernente me blocks by me: Blocadas facite per me edit_profile: Modificar profilo @@ -2616,15 +2645,6 @@ ia: spam score: 'Punctos de spam:' description: Description user location: Position del usator - no_home_location_html: '%{edit_profile_link} e defini tu loco de domicilio pro - vider le usatores a proximitate.' - edit_your_profile: Modifica tu profilo - my friends: Mi amicos - no friends: Tu non ha ancora addite alcun amico. - km away: a %{count} km de distantia - m away: a %{count} m de distantia - nearby users: Altere usatores vicin - no nearby users: Il non ha ancora altere cartographos in le vicinitate. role: administrator: Iste usator es un administrator moderator: Iste usator es un moderator @@ -2645,15 +2665,7 @@ ia: unhide_user: Revelar iste usator delete_user: Deler iste usator confirm: Confirmar - friends_changesets: gruppos de modificationes de tu amicos - friends_diaries: articulos de diario de tu amicos - nearby_changesets: gruppos de modificationes de usatores a proximitate - nearby_diaries: articulos de diario per usatores a proximitate report: Signalar iste usator - popup: - your location: Tu position - nearby mapper: Cartographo vicin - friend: Amico account: title: Modificar conto my settings: Mi configurationes diff --git a/config/locales/id.yml b/config/locales/id.yml index 2c4bf74d9..5bd0be633 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -12,6 +12,7 @@ # Author: Dewisulistio # Author: Emirhartato # Author: Farras +# Author: Han4299 # Author: Hanif Al Husaini # Author: HarryMahar # Author: Hidayatsrf @@ -128,6 +129,7 @@ id: language: Bahasa doorkeeper/application: name: Nama + scopes: Izin friend: user: Pengguna friend: Teman @@ -444,6 +446,24 @@ id: timeout: sorry: Maaf, daftar komentar set perubahan yang Anda minta butuh waktu lama untuk ditampilkan. + dashboards: + contact: + km away: sejauh %{count}km + m away: sejauh %{count} meter + popup: + your location: Lokasi Anda + nearby mapper: Pembuat peta disekitar Anda + friend: Teman + show: + my friends: Teman saya + no friends: Anda belum menambahkan teman. + nearby users: Pengguna lain terdekat + no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan + terdekat. + friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman + friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman + nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat + nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat diary_entries: new: title: Entri Baru Catatan Harian @@ -2391,13 +2411,6 @@ id: spam score: 'Jumlah Spam:' description: Deskripsi user location: Lokasi pengguna - my friends: Teman saya - no friends: Anda belum menambahkan teman. - km away: sejauh %{count}km - m away: sejauh %{count} meter - nearby users: Pengguna lain terdekat - no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan - terdekat. role: administrator: Pengguna ini merupakan administrator moderator: Pengguna ini adalah moderator @@ -2418,15 +2431,7 @@ id: unhide_user: Munculkan Kembali Pengguna Ini delete_user: Hapus Pengguna Ini confirm: Konfirmasi - friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman - friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman - nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat - nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat report: Laporkan Pengguna Ini - popup: - your location: Lokasi Anda - nearby mapper: Pembuat peta disekitar Anda - friend: Teman account: title: Edit akun my settings: Pengaturan saya diff --git a/config/locales/is.yml b/config/locales/is.yml index 57a381441..122316109 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -421,6 +421,24 @@ is: timeout: sorry: Því miður, það tók of langan tíma að ná í listann yfir þær athugasemdir við breytingasett sem þú baðst um. + dashboards: + contact: + km away: í %{count} km fjarlægð + m away: í %{count} m fjarlægð + popup: + your location: Staðsetning þín + nearby mapper: Nálægur notandi + friend: Vinur + show: + my friends: Vinir mínir + no friends: Þú átt enga vini + nearby users: Aðrir nálægir notendur + no nearby users: Engir notendur hafa stillt staðsetningu sína á korti nálægt + þér. + friends_changesets: breytingasett vina + friends_diaries: bloggfærslur vina + nearby_changesets: breytingasett vina í næsta nágrenni + nearby_diaries: bloggfærslur vina í næsta nágrenni diary_entries: new: title: Ný bloggfærsla @@ -2477,13 +2495,6 @@ is: spam score: 'Ruslpóst-einkunn:' description: Lýsing user location: Staðsetning - my friends: Vinir mínir - no friends: Þú átt enga vini - km away: í %{count} km fjarlægð - m away: í %{count} m fjarlægð - nearby users: Aðrir nálægir notendur - no nearby users: Engir notendur hafa stillt staðsetningu sína á korti nálægt - þér. role: administrator: Þessi notandi er möppudýr moderator: Þessi notandi er prófarkalesari @@ -2504,15 +2515,7 @@ is: unhide_user: Af-fela þennan notanda delete_user: Eyða þessum notanda confirm: Staðfesta - friends_changesets: breytingasett vina - friends_diaries: bloggfærslur vina - nearby_changesets: breytingasett vina í næsta nágrenni - nearby_diaries: bloggfærslur vina í næsta nágrenni report: Tilkynna þennan notanda - popup: - your location: Staðsetning þín - nearby mapper: Nálægur notandi - friend: Vinur account: title: Stillingar my settings: Mínar stillingar diff --git a/config/locales/it.yml b/config/locales/it.yml index 735a560c4..7a58f289f 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -482,6 +482,28 @@ it: timeout: sorry: Spiacenti, l'elenco richiesto di commenti al changeset ha impiegato troppo tempo per poter essere recuperato. + dashboards: + contact: + km away: distante %{count} km + m away: '%{count}m di distanza' + popup: + your location: Propria posizione + nearby mapper: Mappatore vicino + friend: Amico + show: + title: La mia dashboard + no_home_location_html: '%{edit_profile_link} e imposta la posizione di casa + per vedere gli utenti vicini.' + edit_your_profile: Modifica il tuo profilo + my friends: I miei amici + no friends: Non ci sono ancora amici. + nearby users: Altri utenti nelle vicinanze + no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle + vicinanze. + friends_changesets: gruppi di modifiche degli amici + friends_diaries: note dei diari degli amici + nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze + nearby_diaries: note dei diari degli utenti nelle vicinanze diary_entries: new: title: Nuova voce del diario @@ -817,6 +839,7 @@ it: window_construction: Costruttore di finestre winery: Cantina vinicola "yes": Negozio di Artigianato + crossing: Attraversamento emergency: access_point: Punto d'accesso ambulance_station: Stazione delle ambulanze @@ -1072,6 +1095,7 @@ it: hill: Collina hot_spring: Sorgente termale island: Isola + isthmus: Istmo land: Terra marsh: Palude alluvionale moor: Molo @@ -1086,10 +1110,13 @@ it: sand: Sabbia scree: Ghiaione scrub: Boscaglia + shingle: Greto spring: Sorgente stone: Pietra strait: Stretto tree: Albero + tree_row: Filare di alberi + tundra: Tundra valley: Valle volcano: Vulcano water: Acqua @@ -1488,9 +1515,10 @@ it: intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera da utilizzare secondo una licenza aperta. intro_2_create_account: Crea un account utente - hosting_partners_html: L'hosting è supportato da %{ucl}, %{bytemark}, e da altri - %{partners}. + hosting_partners_html: L'hosting è supportato da %{ucl}, %{fastly}, %{bytemark}, + e da altri %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partner tou: Condizioni d'uso @@ -1959,11 +1987,11 @@ it: credit_2_1_html: |- Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC BY-SA. Puoi fare ciò mettendo un collegamento URL a questa pagina di copyright. In alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org. - credit_3_1_html: 'I tasselli della mappa nello “stile predefinito” + credit_3_1_html: I tasselli della mappa nello “stile predefinito” su www.openstreetmap.org sono frutto del lavoro della fondazione OpenStreetMap - a partire da dati OpenStreetMap rilasciati con licenza Open Database. Se - utilizzi questi tasselli, inserisci la seguente attribuzione: “Mappa - di base e dati da OpenStreetMap e dalla fondazione OpenStreetMap”.' + a partire da dati OpenStreetMap rilasciati con licenza Open Database. Quando + utilizzi questo stile mappa è richiesta la stessa attribuzione come per + i dati mappa. credit_4_html: |- In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa. Ad esempio: @@ -1989,9 +2017,11 @@ it: CC BY), Land Vorarlberg e Land Tirol (sotto CC-BY AT con emendamenti). - contributors_au_html: |- - Australia: contiene i dati della periferia basati - sui dati dell'Australian Bureau of Statistics. + contributors_au_html: 'Australia: contiene o è sviluppato + sfruttando i confini amministrativi © Geoscape + Australia rilasciati dal Commonwealth dell''Australia con licenza Creative Commons Attribuzione + 4.0 Internazionale (CC BY 4.0).' contributors_ca_html: |- Canada: contiene i dati della GeoBase®, GeoGratis (© Department of Natural @@ -2408,7 +2438,7 @@ it: in: in index: public_traces: Tracciati GPS pubblici - my_traces: Miei tracciati + my_traces: I miei tracciati public_traces_from: Tracciati GPS pubblici di %{user} description: Naviga fra i tracciati GPS caricati recentemente tagged_with: ' etichettati con %{tags}' @@ -2534,7 +2564,7 @@ it: flash: Distrutta la registrazione dell'applicazione client oauth2_applications: index: - title: Mie applicazioni client + title: Le mie applicazioni client no_applications_html: Possiedi un’applicazione che vorresti registrare per poterla usare con noi mediante lo standard %{oauth2}? Devi registrare la tua applicazione prima che essa possa effettuare richieste OAuth a questo servizio. @@ -2650,14 +2680,15 @@ it: show: my diary: Il mio diario new diary entry: nuova voce del diario - my edits: Mie modifiche - my traces: Miei tracciati - my notes: Mie note - my messages: Miei messaggi + my edits: Le mie modifiche + my traces: I miei tracciati + my notes: Le mie note + my messages: I miei messaggi my profile: Il mio profilo my settings: Impostazioni - my comments: Miei commenti + my comments: I miei commenti my_preferences: Preferenze + my_dashboard: La mia dashboard blocks on me: Blocchi su di me blocks by me: Blocchi applicati da me edit_profile: Modifica profilo @@ -2679,16 +2710,6 @@ it: spam score: 'Punteggio Spam:' description: Descrizione user location: Luogo dell'utente - no_home_location_html: '%{edit_profile_link} e imposta la posizione di casa - per vedere gli utenti vicini.' - edit_your_profile: Modifica il tuo profilo - my friends: I miei amici - no friends: Non ci sono ancora amici. - km away: distante %{count} km - m away: '%{count}m di distanza' - nearby users: Altri utenti nelle vicinanze - no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle - vicinanze. role: administrator: Questo utente è un amministratore moderator: Questo utente è un moderatore @@ -2709,15 +2730,7 @@ it: unhide_user: Mostra questo utente delete_user: Cancella questo utente confirm: Conferma - friends_changesets: gruppi di modifiche degli amici - friends_diaries: note dei diari degli amici - nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze - nearby_diaries: note dei diari degli utenti nelle vicinanze report: Segnala questo utente - popup: - your location: Propria posizione - nearby mapper: Mappatore vicino - friend: Amico account: title: Modifica profilo my settings: Impostazioni diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c4487e0f3..0ad3f14a2 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -28,6 +28,7 @@ # Author: Oinary # Author: Omotecho # Author: Otokoume +# Author: RYOUMA1117 # Author: Ruila # Author: Rxy # Author: Schu @@ -461,6 +462,25 @@ ja: title_particular: OpenStreetMap変更セット#%{changeset_id}の議論 timeout: sorry: 申し訳ありませんが、要求した変更セットのコメントの一覧は時間がかかりすぎたため取得できませんでした。 + dashboards: + contact: + km away: 距離 %{count} km + m away: 距離 %{count} m + popup: + your location: 自分の位置 + nearby mapper: 周辺のマッパー + friend: 友達 + show: + no_home_location_html: '%{edit_profile_link}そして、近くのユーザーが表示されるように自宅の場所を設定します。' + edit_your_profile: プロフィールの編集 + my friends: 友だち + no friends: あなたはまだ誰も友達として登録していません。 + nearby users: 周辺にいるその他の利用者 + no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。 + friends_changesets: 友達による変更セット + friends_diaries: 友達の日記エントリ + nearby_changesets: 周辺の利用者のメモ + nearby_diaries: 周辺のユーザーの日記エントリ diary_entries: new: title: 日記エントリの新規作成 @@ -792,6 +812,7 @@ ja: window_construction: サッシ施工業 winery: ワイン醸造所 "yes": 手芸店 + crossing: 交差点 emergency: access_point: アクセスポイント ambulance_station: 消防署 @@ -882,6 +903,7 @@ ja: railway: 廃線 roman_road: ローマ街道 ruins: 廃墟 + rune_stone: ルーン石碑 stone: 岩石 tomb: 墓地 tower: 塔 @@ -1046,6 +1068,7 @@ ja: hill: 丘陵 hot_spring: 温泉 island: 島 + isthmus: 地峡 land: 陸地 marsh: 沼地 moor: 沼地 @@ -1060,10 +1083,13 @@ ja: sand: 砂 scree: がれ場 scrub: 低木林 + shingle: 帯状疱疹 spring: 泉 stone: 岩石 strait: 海峡 tree: 木 + tree_row: 並木 + tundra: ツンドラ valley: è°· volcano: 噴火口 water: 湖水 @@ -1460,8 +1486,9 @@ ja: intro_header: OpenStreetMap へようこそ! intro_text: OpenStreetMap は、あなたのような人々が作成した世界地図であり、オープン ライセンスの下で自由に利用できます。 intro_2_create_account: 新しい利用者アカウントを作成 - hosting_partners_html: 'ホスティング支援者: %{ucl}、%{bytemark}及びその他の%{partners}' + hosting_partners_html: ホスティングは、%{ucl}、%{fastly}、%{bytemark}、およびその他の%{partners}によってサポートされています。 partners_ucl: UCL + partners_fastly: すばやく partners_bytemark: バイトマーク ホスティング partners_partners: パートナー tou: 利用規約 @@ -1682,6 +1709,7 @@ ja: preferences: show: title: 個人設定 + preferred_editor: 優先エディター preferred_languages: 優先言語 edit_preferences: 設定の編集 edit: @@ -2234,6 +2262,7 @@ ja: blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。 need_to_see_terms: あなたは一時的にAPIの利用を停止されています。ウェブインターフェイスにログインして協力者規約をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。 settings_menu: + account_settings: アカウント設定 oauth1_settings: OAuth 1 設定 oauth2_applications: OAuth 2 アプリケーション oauth2_authorizations: OAuth 2 認証 @@ -2439,12 +2468,6 @@ ja: spam score: 'スパム評価:' description: 説明 user location: 利用者の位置 - my friends: 友だち - no friends: あなたはまだ誰も友達として登録していません。 - km away: 距離 %{count} km - m away: 距離 %{count} m - nearby users: 周辺にいるその他の利用者 - no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。 role: administrator: このユーザーは管理者です moderator: このユーザーはモデレーターです @@ -2465,15 +2488,7 @@ ja: unhide_user: このユーザーを再表示 delete_user: この利用者を削除 confirm: 確認 - friends_changesets: 友達による変更セット - friends_diaries: 友達の日記エントリ - nearby_changesets: 周辺の利用者のメモ - nearby_diaries: 周辺のユーザーの日記エントリ report: この利用者を通報 - popup: - your location: 自分の位置 - nearby mapper: 周辺のマッパー - friend: 友達 account: title: アカウントの編集 my settings: 設定 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index a5697bd0b..b00886d57 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -236,6 +236,13 @@ ka: changeset_comments: comment: commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user} + dashboards: + contact: + km away: '%{count}კმ თქვენგან' + m away: '%{count}მ თქვენგან' + popup: + your location: თქვენი ადგილმდებარეობა + friend: მეგობარი diary_entries: new: title: დღიურში ახალი ჩანაწერის გაკეთება @@ -1064,8 +1071,6 @@ ka: spam score: 'სპამის შეფასება:' description: აღწერა user location: მომხმარებლის ადგილმდებარეობა - km away: '%{count}კმ თქვენგან' - m away: '%{count}მ თქვენგან' role: administrator: ეს მომხმარებელი ადმინისტრატორია comments: კომენტარები @@ -1077,9 +1082,6 @@ ka: unhide_user: ამ მომხმარებლის გამოჩენა delete_user: ამ მომხმარებლის წაშლა confirm: დადასტურება - popup: - your location: თქვენი ადგილმდებარეობა - friend: მეგობარი account: title: ანგარიშის რედაქტირება my settings: ჩემი პარამეტრები diff --git a/config/locales/kab.yml b/config/locales/kab.yml index b0b95f55b..126124394 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -375,6 +375,19 @@ kab: timeout: sorry: Suref-aÉ£, tabdart n iygrawen n usnifel i d-tessutreḍ tettawi ddeqs n wakud akken ad d-tali. + dashboards: + contact: + km away: '%{count} km' + m away: yebɛed s %{count} m + popup: + your location: Adig-ik + friend: Amdakkel + show: + nearby users: Iseqdacen-nniḍen iqeṛben + friends_changesets: Igrawen n usnifel n yidukkal + friends_diaries: Inekcam n uÉ£mis n yimdukkal + nearby_changesets: Ihrawen n usnifel n iseqdacen iqeṛben + nearby_diaries: Inekcam n uÉ£mis n iseqdacen iqeṛben diary_entries: new: title: Anekcam amaynut n uÉ£mis @@ -1336,9 +1349,6 @@ kab: spam score: 'Amatar n uspam:' description: Aglam user location: Adig n useqdac - km away: '%{count} km' - m away: yebɛed s %{count} m - nearby users: Iseqdacen-nniḍen iqeṛben role: administrator: Aseqdac-agi d anedbal grant: @@ -1356,13 +1366,6 @@ kab: unhide_user: Sken aseqdac-agi delete_user: Kkes aseqdac-agi confirm: Sentem - friends_changesets: Igrawen n usnifel n yidukkal - friends_diaries: Inekcam n uÉ£mis n yimdukkal - nearby_changesets: Ihrawen n usnifel n iseqdacen iqeṛben - nearby_diaries: Inekcam n uÉ£mis n iseqdacen iqeṛben - popup: - your location: Adig-ik - friend: Amdakkel account: title: Ẓreg amiḍan my settings: IÉ£ewwaṛen-iw diff --git a/config/locales/km.yml b/config/locales/km.yml index 5cd23b1d6..90c9392fa 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -198,6 +198,12 @@ km: no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។ no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។ load_more: ផ្ទុកបន្ថែម + dashboards: + contact: + km away: ចម្ងាយ %{count} គ.ម. + m away: ចម្ងាយ %{count} ម. + show: + no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។ diary_entries: new: title: ប្រកាសកំណត់ហេតុថ្មី @@ -787,9 +793,6 @@ km: remove as friend: ដកចេញជាមិត្ត​ add as friend: បន្ថែមជាមិត្ត​ description: បរិយាយ​ - no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។ - km away: ចម្ងាយ %{count} គ.ម. - m away: ចម្ងាយ %{count} ម. account: title: កែប្រែគណនី​ public editing: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 1bce0654c..6dab6e9db 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -182,6 +182,8 @@ ko: pass_crypt: 비밀번호 pass_crypt_confirmation: 비밀번호 확인 help: + doorkeeper/application: + redirect_uri: URI마다 1줄 사용 trace: tagstring: 쉼표로 구분 user_block: @@ -422,6 +424,25 @@ ko: title_particular: 'OpenStreetMap 변경 집합 #%{changeset_id} 토론' timeout: sorry: 죄송합니다, 요청하는 변경 집합 댓글을 불러오는데 너무 오래 걸렸습니다. + dashboards: + contact: + km away: '%{count}km 거리' + m away: '%{count}m 거리' + popup: + your location: 내 위치 + nearby mapper: 근처 매퍼 + friend: 친구 + show: + title: 내 대시보드 + edit_your_profile: 내 프로파일 편집 + my friends: 내 친구 + no friends: 아직 어떠한 친구도 추가하지 않았습니다. + nearby users: 기타 근처 사용자 + no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다. + friends_changesets: 친구의 바뀜집합 + friends_diaries: 친구의 일기 항목 + nearby_changesets: 근처 사용자의 바뀜집합 + nearby_diaries: 근처 사용자의 일기 항목 diary_entries: new: title: 새 일기 항목 @@ -495,6 +516,11 @@ ko: comment: 의견 newer_comments: 새 의견 older_comments: 이전 의견 + doorkeeper: + flash: + applications: + create: + notice: 애플리케이션을 등록했습니다. friendships: make_friend: heading: '%{user} 님을 친구로 추가할까요?' @@ -963,6 +989,7 @@ ko: stone: 돌 strait: 해협 tree: 나무 + tundra: 툰드라 valley: 골짜기 volcano: 화산 water: 물 @@ -2098,6 +2125,7 @@ ko: uploaded: '올린 날짜:' points: '점:' start_coordinates: '시작 좌표:' + coordinates_html: '%{latitude}; %{longitude}' map: 지도 edit: 편집 owner: '소유자:' @@ -2138,6 +2166,7 @@ ko: 위키 문서에서 GPS 궤적에 대해 더 알아보세요. upload_trace: 궤적 올리기 + remove_tag_filter: 태그 필터 제거 destroy: scheduled_for_deletion: 삭제 계획중인 궤적 make_public: @@ -2167,6 +2196,7 @@ ko: need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자 약관에 동의할 필요는 없습니다만 기여자 약관을 보아야 합니다. settings_menu: + account_settings: 계정 설정 oauth1_settings: OAuth 1 설정 oauth2_applications: OAuth 2 애플리케이션 oauth2_authorizations: OAuth 2 인가 @@ -2198,6 +2228,9 @@ ko: missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다 scopes: write_prefs: 사용자 환경 설정 수정 + write_api: 지도 수정 + read_gpx: 비공개 GPS 궤적 읽기 + write_gpx: GPS 궤적 업로드 oauth_clients: new: title: 새 애플리케이션 등록 @@ -2241,10 +2274,13 @@ ko: oauth2_applications: index: title: 내 클라이언트 애플리케이션 + new: 새 애플리케이션 등록 name: 이름 permissions: 권한 application: edit: 편집 + delete: 삭제 + confirm_delete: 이 애플리케이션을 삭제하시겠습니까? new: title: 새 애플리케이션 등록 edit: @@ -2256,10 +2292,16 @@ ko: client_id: 클라이언트 ID permissions: 권한 oauth2_authorizations: + new: + authorize: 인가 + deny: 거부 error: title: 오류가 발생했습니다 + show: + title: 인증 코드 oauth2_authorized_applications: index: + title: 내 인증한 애플리케이션 application: 애플리케이션 permissions: 권한 users: @@ -2306,6 +2348,7 @@ ko: italy: 이탈리아 rest_of_world: 나머지 국가 terms_declined_flash: + terms_declined_link: 이 위키 문서 terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: 이러한 사용자는 없습니다 @@ -2323,6 +2366,7 @@ ko: my settings: 프로필 설정 my comments: 내 의견 my_preferences: 내 환경 설정 + my_dashboard: 내 대시보드 blocks on me: 나를 차단 blocks by me: 나한테 차단 edit_profile: 프로필 수정 @@ -2344,12 +2388,6 @@ ko: spam score: '스팸 점수:' description: 설명 user location: 사용자 위치 - my friends: 내 친구 - no friends: 아직 어떠한 친구도 추가하지 않았습니다. - km away: '%{count}km 거리' - m away: '%{count}m 거리' - nearby users: 기타 근처 사용자 - no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다. role: administrator: 이 사용자는 관리자입니다 moderator: 이 사용자는 운영자입니다 @@ -2370,15 +2408,7 @@ ko: unhide_user: 이 사용자를 숨기기 취소 delete_user: 이 사용자를 삭제 confirm: 확인 - friends_changesets: 친구의 바뀜집합 - friends_diaries: 친구의 일기 항목 - nearby_changesets: 근처 사용자의 바뀜집합 - nearby_diaries: 근처 사용자의 일기 항목 report: 이 사용자 ë³´ê³  - popup: - your location: 내 위치 - nearby mapper: 근처 매퍼 - friend: 친구 account: title: 계정 편집 my settings: 프로필 설정 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index cd4f27f66..8659b6c71 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -1,4 +1,4 @@ -# Messages for Kurdish (Latin script) (kurdî (latînî)‎) +# Messages for Kurdish (Latin script) (kurdî (latînî)) # Exported from translatewiki.net # Export driver: phpyaml # Author: 1233qwer1234qwer4 @@ -442,6 +442,24 @@ ku-Latn: timeout: sorry: Bibore, bidestxistina lîsteya şîroveyên desteya guhertinan ê ku te xwest demeke dirêj girt. + dashboards: + contact: + km away: '%{count} km dûr e' + m away: '%{count} m dûr e' + popup: + your location: Cihê te + nearby mapper: Nexşesazên nêz + friend: Heval + show: + my friends: Hevalên min + no friends: Te hêj ji xwe re hevalek çênekiriye. + nearby users: Bikarhênerên din ên nêz + no nearby users: Li nêzî te bikarhênerekî din yê ku cihê xwe diyar kiribe tine + ye. + friends_changesets: desteyên guhertinan yên hevalan + friends_diaries: nivîsên rojane yên hevalan + nearby_changesets: desteyên guhertinan yên bikarhênerên nêz + nearby_diaries: nivîsên rojane yên bikarhênerên nêz diary_entries: new: title: Nivîsa nû yê rojane @@ -2588,13 +2606,6 @@ ku-Latn: spam score: Skora spamêː description: Danasîn user location: Cihê bikarhênerê - my friends: Hevalên min - no friends: Te hêj ji xwe re hevalek çênekiriye. - km away: '%{count} km dûr e' - m away: '%{count} m dûr e' - nearby users: Bikarhênerên din ên nêz - no nearby users: Li nêzî te bikarhênerekî din yê ku cihê xwe diyar kiribe tine - ye. role: administrator: Ev bikarhêner rêvebirek e moderator: Ev bikarhêner moderatorek e @@ -2615,15 +2626,7 @@ ku-Latn: unhide_user: Vi bikarhênerî nîşan bide delete_user: Vî/ê bikarhênerî/ê jê bibe confirm: Pesend bike - friends_changesets: desteyên guhertinan yên hevalan - friends_diaries: nivîsên rojane yên hevalan - nearby_changesets: desteyên guhertinan yên bikarhênerên nêz - nearby_diaries: nivîsên rojane yên bikarhênerên nêz report: Vî/Vê bikarhênerî/ê gilî bike - popup: - your location: Cihê te - nearby mapper: Nexşesazên nêz - friend: Heval account: title: Hesabê biguherîne my settings: Hevyazên min diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 5fadeab5e..40e293223 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Davio +# Author: Helicoducair # Author: Les Meloures # Author: Robby # Author: Soued031 @@ -9,7 +10,7 @@ lb: time: formats: - friendly: '%e %B %Y um %H:%M' + friendly: '%e. %B %Y um %H:%M Auer' helpers: file: prompt: Fichier eraussichen @@ -29,6 +30,9 @@ lb: doorkeeper_application: create: Aschreiwen update: Aktualiséieren + redaction: + create: Schwäerzen + update: Schäerzung späicheren trace: create: Eroplueden update: Ännerunge späicheren @@ -36,27 +40,61 @@ lb: create: Spär uleeën update: Spär aktualiséieren activerecord: + errors: + messages: + invalid_email_address: schéngt keng valabel E-Mail-Adress ze sinn + email_address_not_routable: ass net routingfäheg models: + acl: Zougrëffssteierlëscht changeset: Set vun Ännerungen + changeset_tag: Ännerungssaz-Tag country: Land + diary_comment: Blog-Commentaire + diary_entry: Blog-Antrag friend: Frënd issue: Probleem language: Sprooch message: Message node: Knuet + node_tag: Knuet-Tag + notifier: Meller old_node: Ale Knuet + old_node_tag: Ale Knuet-Tag old_relation: Al Relatioun + old_relation_member: Ale Relatiouns-Member + old_relation_tag: Ale Relatiouns-Tag old_way: Ale Wee + old_way_node: Ale Wee-Knuet + old_way_tag: Ale Wee-Tag relation: Relatioun + relation_member: Relatiouns-Member + relation_tag: Relatiouns-Tag report: Rapport session: Sessioun + trace: Spuer + tracepoint: Spuermarkéierung + tracetag: Spuer-Attribut user: Benotzer user_preference: Benotzerastellung + user_token: Benotzer-Token way: Wee + way_node: Wee-Knuet + way_tag: Wee-Tag attributes: client_application: name: Numm (Obligatoresch) + url: Haaptapplikatiouns-URL + callback_url: Callback-URL + support_url: Support-URL + allow_read_prefs: Hir Benotzerastellunge liesen + allow_write_prefs: Hir Benotzerastellungen änneren + allow_write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen allow_write_api: d'Kaart änneren + allow_read_gpx: Zougrëff op hir privat GPS-Spueren + allow_write_gpx: GPS-Spueren eroplueden + allow_write_notes: Notizë beaarbechten + diary_comment: + body: Text diary_entry: user: Benotzer title: Sujet @@ -65,6 +103,7 @@ lb: language: Sprooch doorkeeper/application: name: Numm + redirect_uri: Weiderleedungs-URIën confidential: Confidentiel Applikatioun? scopes: Autorisatiounen friend: @@ -85,25 +124,47 @@ lb: message: sender: Sender title: Sujet + body: Text recipient: Empfänger redaction: title: Titel description: Beschreiwung + report: + category: Wiel e Grond fir deng Meldung aus + details: Wannechgelift méi Eenzelheeten iwwer de Problem uginn (erfuerderlech). user: + auth_provider: Authentifizéierungsubidder + auth_uid: Authentifizéierungs UID email: E-Mail + email_confirmation: E-Mail Bestätegung new_email: Nei E-Mail-Adress active: Aktiv display_name: Numm dee gewise gëtt description: Beschreiwung vum Profil home_lat: Breedegrad home_lon: Längegrad - languages: Léifst Sproochen + languages: Liblingssproochen + preferred_editor: Liblingseditor pass_crypt: Passwuert pass_crypt_confirmation: Passwuert confirméieren help: + doorkeeper/application: + confidential: Et gëtt eng Applikatioun verwent, bei där d'Clientsgeheimnis + vertraulech behandelt ka ginn (nativ- an eesäiteg Appë sinn net vertraulech) + redirect_uri: Pro URI eng Zeil benotzen trace: tagstring: Mat Komma getrennt + user_block: + reason: De Grond, firwat de Benotzer / d'Benotzerin gespaart ass. Sief wannechgelift + esou roueg a sachlech wéi méiglech. Beschreif d'Lag méiglechst detailléiert + an denk dorun, datt déng Noriicht ëffentlech siichtbar ass. Denk och dorun, + datt net all d'Benotzer de Jargon vum Gemeinschaftsprojet verstinn a benotz + wannechgelift Formuléierungen, déi fir Laie verständlech sinn. + needs_view: Muss sech de Benotzer umellen, ier dës Spär opgehuewe gëtt? user: + email_confirmation: Är Adress gëtt net ëffentlech ugewisen. Liest eis Dateschutzerklärung + fir méi Informatiounen. new_email: (ni ëffentlech gewisen) datetime: distance_in_words_ago: @@ -148,6 +209,10 @@ lb: default: Standard (elo %{name}) id: name: iD + description: iD (am Browser agebetten Editeur) + remote: + name: Fernsteierung + description: Extern Editeuren (JOSM, Potlach, Merkaartor) auth: providers: none: Keng @@ -160,14 +225,26 @@ lb: api: notes: comment: + opened_at_html: '%{when} erstallt' + opened_at_by_html: '%{when} vum %{user} erstallt' + commented_at_html: '%{when} aktualiséiert' + commented_at_by_html: '%{when} vum %{user} aktualiséiert' closed_at_html: Geléist %{when} closed_at_by_html: Geléist %{when} vum %{user} reopened_at_html: Reaktivéiert %{when} reopened_at_by_html: Reaktivéiert %{when} vum %{user} rss: title: OpenStreetMap Notizen + description_area: Iwwersiicht vun de gemellten, kommentéierten oder ofgeschlossenen + Hiweiser am Beräich [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]. + description_item: En RSS-Feed fir den Hiweis %{id} + opened: Neien Hiweis (an der Géigend vun %{place}) + commented: Neie Commentaire (an der Géigend vun %{place}) + closed: Ofgeschlossenen Hiweis (an der Géigend vun %{place}) + reopened: Reaktivéierten Hiweis (an der Géigend vun %{place}) entry: comment: Bemierkung + full: Vollstännegen Hiweis browse: created: Ugeluecht closed: Zou @@ -182,6 +259,12 @@ lb: anonymous: anonym no_comment: (keng Bemierkung) part_of: Deel vu(n) + part_of_relations: + one: 1 Relatioun + other: '%{count} Relatiounen' + part_of_ways: + one: 1 Wee + other: '%{count} Weeër' download_xml: XML eroflueden view_history: Versioune weisen view_details: Detailer weisen @@ -205,15 +288,28 @@ lb: title_comment: Set vun Ännerungen %{id} - %{comment} join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen discussion: Diskussioun + still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal + wéi den Ännerungssaz zou ass. node: title_html: 'Knuet: %{name}' + history_title_html: 'Versioune vum Knuet: %{name}' way: title_html: 'Wee: %{name}' history_title_html: 'Versioune vum Wee: %{name}' nodes: Kniet + nodes_count: + one: 1 Knuet + other: '%{count} Kniet' + also_part_of_html: + one: Deel vum Wee %{related_ways} + other: Deeler vun de Weeër %{related_ways} relation: title_html: 'Relatioun: %{name}' + history_title_html: 'Versioune vun der Relatioun: %{name}' members: Memberen + members_count: + one: 1 Member + other: '%{count} Memberen' relation_member: entry_role_html: '%{type} %{name} als %{role}' type: @@ -233,6 +329,9 @@ lb: changeset: Set vun Ännerungen note: Notiz timeout: + title: Zäitdepassementsfeeler + sorry: Et huet leider ze laang gedauert, 'Donnéeën fir %{type} mat der ID %{id} + ofzeruffen. type: node: Knuet way: Wee @@ -240,11 +339,16 @@ lb: changeset: Set vun Ännerungen note: Notiz redacted: + redaction: Schwäerzung %{id} + message_html: 'D''Versioun %{version} vun dësem %{type} kann net ugewise ginn, + well hei eppes geschwäerzt gouf. Méi erfueren: %{redaction_link}.' type: node: Knuet way: Wee relation: Relatioun start_rjs: + feature_warning: D'Luede vun %{num_features} Funktioune kann dëse Browser méi + lues maachen oder afréieren. Sollen dës Donnéeë wierklech ugewise ginn? load_data: Donnéeë lueden loading: Lueden... tag_details: @@ -254,11 +358,15 @@ lb: tag: D'Wiki-Beschreiwungssäit fir den %{key}=%{value}-Tag wikidata_link: D'Element %{page} op Wikidata wikipedia_link: Den Artikel %{page} op der Wikipedia + wikimedia_commons_link: D'%{page} Element op Wikimedia Commons telephone_link: '%{phone_number} uruffen' + colour_preview: Faarw %{colour_value} Ausbléck note: title: 'Notiz: %{id}' new_note: Nei Notiz description: Beschreiwung + open_title: 'Ongeléisten Hiweis #%{note_name}' + closed_title: 'Geléisten Hiweis #%{note_name}' hidden_title: Verstoppt Notiz N° %{note_name} opened_by_html: Ugeluecht vum %{user} viru(n) %{when} opened_by_anonymous_html: Ugeluecht vun engem Anonymen @@ -270,6 +378,12 @@ lb: reopened_by_html: Reaktivéiert vum %{user} %{when} reopened_by_anonymous_html: Reaktivéiert vun engem Anonymen %{when} hidden_by_html: Verstoppt vum %{user} %{when} + report: Dësen Hiweis mellen + query: + title: Objetsoffro + introduction: Klick op d'Kaart, fir Objeten an der Noperschaft ze fannen. + nearby: Objeten an der Noperschaft + enclosing: Ëmschléißend Objeten changesets: changeset_paging_nav: showing_page: Säit %{page} @@ -278,6 +392,7 @@ lb: changeset: anonymous: Anonym no_edits: (keng Ännerungen) + view_changeset_details: Detailer vum Ännerungssaz uweisen changesets: id: Nummer (ID) saved_at: Gespäichert de(n) @@ -296,42 +411,115 @@ lb: no_more_area: Keng weider Grupp vun Ännerungen an dëser Géigend. no_more_user: Keng weider Gruppe vun Ännerunge vun dësem Benotzer. load_more: Méi lueden + timeout: + sorry: Et leider ze laang gedauert, déi ugefuerdert Ännerungssätz ofzeruffen. changeset_comments: comment: + comment: 'Neien Diskussiounsbäitrag zum Ännerungssaz #%{changeset_id} vun %{author}' commented_at_by_html: '%{when} vum %{user} aktualiséiert' + comments: + comment: 'Neie Commentaire zum Ännerungssaz #%{changeset_id} vun %{author}' + index: + title_all: Diskussioun iwwer den OpenStreetMap-Ännerungssaz + title_particular: 'Diskussioun iwwer den OpenStreetMap-Ännerungssaz #%{changeset_id}' + timeout: + sorry: Leider ass d'Lëscht mat de Commentairë vun den Ännerungssätz, déis du + ugefuerdert hues, fir den Ofruff ze laang. + dashboards: + contact: + km away: '%{count} km ewech' + m away: '%{count} m ewech' + popup: + friend: Frënn + show: + title: Meng Iwwersiichtssäit + no_home_location_html: '%{edit_profile_link} a lee deng Heemecht fest, fir Benotzer + an der Noperschaft ze gesinn.' + edit_your_profile: Äre Profil änneren + my friends: Meng Frënn + no friends: Dir hutt nach keng Frënn derbäigesat. + nearby users: Aner Benotzer nobäi + friends_changesets: Ännerungssätz vun dénge Frënn + nearby_changesets: Ännerungssätz vu Benotzer an der Noperschaft diary_entries: + new: + title: Neie Blogantrag form: location: Plaz use_map_link: Kaart benotzen index: title: Blogge vun de Benotzer + title_friends: Blogge vun dénge Frënn + title_nearby: Blogge vu Benotzer an dénger Noperschaft user_title: Blog vum %{user} + in_language_title: Blog-Anträg op %{language} + new: Neie Blogantrag + new_title: Blogantrag erstellen + my_diary: Mäi Blog + no_entries: Keng Bloganträg + recent_entries: Neiest Anträg + older_entries: Eeler Anträg + newer_entries: Méi nei Anträg + edit: + title: Blogantrag beaarbechten + marker_text: Plaz vum Blogantrag show: + title: Blog vun %{user} | %{title} + user_title: Blog vun %{user} leave_a_comment: Eng Bemierkung maachen login_to_leave_a_comment_html: '%{login_link} fir eng Bemierkung ze schreiwen' login: Aloggen + no_such_entry: + title: Blogantrag net fonnt + heading: Kee Blogantrag mat der Nummer %{id} + body: Mir konnte leider kee Blogantrag oder Commentaire mat der Nummer %{id} + fannen. Du hues dech méiglecherweis vertippt oder hues en ongëltege Link opgemaach. diary_entry: posted_by_html: Vum %{link_user} matgedeelt de(n) %{created} op %{language_link}. updated_at_html: Lescht Aktualiséierung de(n) %{updated} + comment_link: Commentaire zu dësem Antrag reply_link: Dem Auteur e Message schécken comment_count: one: '%{count} Bemierkung' - zero: Keng Bemierkungen other: '%{count} Bemierkungen' + edit_link: Dësen Antrag beaarbechten + hide_link: Dësen Antrag verstoppen + unhide_link: Dësen Antrag net méi verstoppen confirm: Confirméieren + report: Dësen Antrag mellen diary_comment: comment_from_html: Bemierkung vum %{link_user} de(n) %{comment_created_at} hide_link: Dës Bemierkung verstoppen + unhide_link: Dëse Commentaire net méi verstoppen confirm: Confirméieren + report: Dëse Commentaire mellen location: location: 'Plaz:' view: Weisen edit: Änneren + feed: + user: + title: OpenStreetMap Bloganträg vun %{user} + description: Lescht OpenStreetMap Bloganträg vun %{user} + language: + title: OpenStreetMap Bloganträg op %{language_name} + description: Lescht Bloganträg vu Benotzer op OpenStreetMap op %{language_name} + all: + title: OpenStreetMap Blogbäiträg + description: Neiest Bloganträg vun OpenStreetMap-Benotzer comments: + has_commented_on: '%{display_name} huet folgend Bloganträg commentéiert' + no_comments: Keng Blog-Commentairen + post: Blogantrag when: Wéini comment: Bemierkung newer_comments: Méi nei Bemierkungen older_comments: Méi al Bemierkungen + doorkeeper: + flash: + applications: + create: + notice: Applikatioun registréiert. friendships: make_friend: heading: '%{user} als Frënd derbäisetzen?' @@ -339,7 +527,11 @@ lb: success: '%{name} ass elo Äre Frënd!' failed: Pardon, %{name} konnt net als Frënd derbäigesat ginn. already_a_friend: Dir sidd schonn de Frënd vum %{name}. + limit_exceeded: Du hues dech a leschter Zäit mat ville Benotzer ugefrënnt. Wannechgelift + waart eng Zäit, iers de versichs, weider Frënn ze fannen. remove_friend: + heading: Frënd %{user} ewechmaachen? + button: Frënd ewechmaachen success: '%{name} gouf als Äre Frënd ewechgeholl.' not_a_friend: '%{name} ass kee vun Äre Frënn.' geocoder: @@ -347,25 +539,43 @@ lb: title: latlon_html: Resultater vun Internal ca_postcode_html: Resultater vu Geocoder.ca + osm_nominatim_html: Resultater vun OpenStreetMap + Nominatim geonames_html: Resultater vu GeoNames + osm_nominatim_reverse_html: Resultater vun OpenStreetMap + Nominatim geonames_reverse_html: Resultater vun GeoNames search_osm_nominatim: prefix: aerialway: cable_car: Kabelwon + chair_lift: Sessellift + drag_lift: Schleeflift + gondola: Gondel + magic_carpet: Teppechlift + platter: Skilift pylon: Mast + station: Gondelstatioun t-bar: Schlepplift "yes": Seelbunn aeroway: aerodrome: Fluchhafen + airstrip: Startbunn + apron: Fluchvirfeld gate: Paart hangar: Hangar helipad: Helikopterlandeplaz + holding_position: Haltestell + navigationaid: Aviatiouns-Navigatiounshëllef + parking_position: Parkplaz runway: Start- a Landepist taxilane: Taxispur + taxiway: Rullbunn terminal: Terminal + windsock: Wandsak amenity: animal_boarding: Déierepensioun + animal_shelter: Déierenheem arts_centre: Konschtzentrum atm: Bancomat bank: Bank @@ -376,16 +586,23 @@ lb: bicycle_rental: Locatioun vu Vëloen bicycle_repair_station: Vëlosatelier biergarten: Béiergaard + blood_bank: Bluttbänk + boat_rental: Bootslocatioun brothel: Bordell bureau_de_change: Wiesselbüro bus_station: Busarrêt cafe: Café + car_rental: Autoslocatioun + car_sharing: Carsharing car_wash: Autoswäschanlag casino: Casino charging_station: Statioun fir ze lueden + childcare: Kannerbetreiung cinema: Kino clinic: Klinik clock: Auer + college: Héichschoul + community_centre: Communautéitszentrum conference_centre: Konferenzzentrum courthouse: Geriicht crematorium: Crematoire @@ -394,32 +611,55 @@ lb: drinking_water: Drénkwaasser driving_school: Fahrschoul embassy: Ambassade + events_venue: Veranstaltungszentrum + fast_food: Fast Food + ferry_terminal: Fähren-Ulafstell fire_station: Pompjeeën + food_court: Iesshaff fountain: Sprangbur fuel: Benzin + gambling: Glécksspill grave_yard: Kiirfecht + grit_bin: Streeguttbehälter hospital: Klinik + hunting_stand: Héichstand ice_cream: Glace + internet_cafe: Internet Café kindergarten: Spillschoul + language_school: Sproocheschoul library: Bibliothéik + loading_dock: Luedramp + love_hotel: Léifthotel marketplace: Maartplaz + mobile_money_agent: Mobille Geldagent monastery: Klouschter + money_transfer: Geldtransfer + motorcycle_parking: Motorradsparkplaz music_school: Museksschoul nightclub: Bar (Nightclub) nursing_home: Altersheim parking: Parking + parking_entrance: Parkafaart parking_space: Parkplaz(en) + payment_terminal: Bezuelterminal pharmacy: Apdikt + place_of_worship: Unduechtsstätt police: Police post_box: Bréifboîte post_office: Postbüro prison: Prisong pub: Bistro + public_bath: Ëffentlech Schwemm + public_bookcase: Ëffentleche Bicherschaf public_building: Ëffentlecht Gebai + ranger_station: Rangerstatioun recycling: Recycling-Center restaurant: Restaurant + sanitary_dump_station: Sanitär Entsuergungsariichtung school: Schoul + shelter: Ënnerstand shower: Douche + social_centre: Sozialzentrum social_facility: Sozial Ariichtung studio: Studio swimming_pool: Schwämm @@ -428,16 +668,30 @@ lb: theatre: Theater toilets: Toiletten townhall: Stadhaus + training: Trainingsariichtung university: Universitéit + vehicle_inspection: Gefierinspektioun vending_machine: Verkaafsautomat veterinary: Déiereklinik + village_hall: Gemengenzentrum waste_basket: Drecksback + waste_disposal: Offallentsuergung waste_dump_site: Dreckstipp + watering_place: Tränk + water_point: Waasseruschloss + weighbridge: Gefierwo + "yes": Ariichtung boundary: aboriginal_lands: Reservat + administrative: Verwaltungsgrenz + census: Grenz vum Vollekszielgebitt national_park: Nationalpark + political: Walbezierk + protected_area: Schutzgebitt + "yes": Grenz bridge: aqueduct: Aquädukt + boardwalk: Strandpromenad suspension: Hänkbréck swing: Dréibréck viaduct: Viadukt @@ -445,98 +699,190 @@ lb: building: apartment: Appartement apartments: Appartementer + barn: Scheier bungalow: Bungalow + cabin: Blockhütt chapel: Kapell church: Kierchegebai + civic: Ëffentlecht Gebai + college: Héichschoulgebai + commercial: Commercëgebai + construction: Gebai am Bau detached: Eenzelt Haus + dormitory: Studentewunnheem + duplex: Duebelhaus farm: Bauerenhaff + farm_auxiliary: Wirtschaftsgebai + garage: Garage garages: Garagen greenhouse: Zär hangar: Hangar + hospital: Klinicksgebai hotel: Hotelgebai house: Haus houseboat: Hausboot hut: Hütt + industrial: Industriegebai + kindergarten: Spillschoulsgebai + manufacture: Fabricksgebai office: Bürosgebai + public: Ëffentlecht Gebai + residential: Wunngebai + retail: Eenzelhandelsgebai + roof: Daach + ruins: Verfaalt Gebai school: Schoulgebai + semidetached_house: Duebelhaushalschent + service: Betribsgebai shed: Schapp stable: Stall - terrace: Terrasse + static_caravan: Rulott + temple: Tempelgebai + terrace: Terrass train_station: Gebai vun der Gare (Eisebunn) + university: Universitéitsgebai warehouse: Lager "yes": Gebai club: + scout: Scoutslager sport: Sportsclub + "yes": Veräin craft: beekeeper: Beiemann + blacksmith: Schmadd brewery: Brauerei carpenter: Zammermann + caterer: Traiteur + confectionery: Séißwueregeschäft + dressmaker: Dammeschneider electrician: Elektriker + electronics_repair: Elektronik-Reparaturdéngscht gardener: Gäertner + glaziery: Gletscher handicraft: Handwierk + hvac: Klimaanlag + metal_construction: Metallbau painter: Usträicher photographer: Fotograf + plumber: Installateur + roofer: Zammermann + sawmill: Seemillen shoemaker: Schouster + stonemason: Steemetzer tailor: Schneider + window_construction: Fënsterbauer + winery: Wäigutt + "yes": Handwierksgeschäft + crossing: Kräizung emergency: access_point: Zougangspunkt + ambulance_station: Rettungswaach + assembly_point: Sammelplaz defibrillator: Defibrillator fire_extinguisher: Feierläscher + fire_water_pond: Läschwaasserweier + landing_site: Noutlandplaz + life_ring: Rettungsréng phone: Noutruff-Telefon + siren: Siren + suction_point: Läschwaassersaugplaz + water_tank: Noutwaasserbehälter "yes": Urgence highway: + abandoned: Abandonnéiert Strooss bridleway: Wee fir Päerd bus_guideway: Busspur bus_stop: Busarrêt construction: Autobunn (am Bau) corridor: Couloir + cycleway: Véloswee elevator: Lift + emergency_access_point: Noutruffpunkt + emergency_bay: Nouthaltbucht footway: Fousswee ford: Fuert + give_way: Virfaart-beuechte-Schëld + living_street: Spill-/Wunnstrooss milestone: Kilometersteen motorway: Autobunn + motorway_junction: Autobunnsechangeur motorway_link: Autobunnsopfaart + passing_place: Auswäichplaz path: Pad pedestrian: Fousswee platform: Quai primary: Haaptstrooss primary_link: Haaptstrooss proposed: Virgeschlo Strooss + raceway: Rennstreck + residential: Wunnstrooss + rest_area: Rastplaz road: Strooss secondary: Niewestrooss secondary_link: Niewestrooss + service: Zoufaartsstrooss + services: Autobunnsraststätt speed_camera: Radar fir d'Vitesse ze moossen steps: Trap stop: Stoppschëld street_lamp: Stroosseluucht tertiary: Kleng Strooss + tertiary_link: Kleng Strooss + track: Spuer + traffic_mirror: Verkéiersspigel + traffic_signals: Verkéiersluuchten + trailhead: Ausgangspunkt vun engem Wanderwee + trunk: Schnellstrooss + trunk_link: Schnellstroossenopfaart + turning_loop: Dréischläif + unclassified: Net klasséiert Strooss "yes": Strooss historic: aircraft: Historesche Fliger archaeological_site: Archeologesche Site + bomb_crater: Bombentriichter battlefield: Schluechtfeld + boundary_stone: Grenzsteen building: Historescht Gebai bunker: Bunker + cannon: Historesch Kanoun castle: Schlass + charcoal_pile: Historesch Meilerplaz church: Kierch city_gate: Stadpaart citywalls: Stadmaueren + fort: Fort + heritage: Denkmal + hollow_way: Huelwee house: Haus + manor: Guttshaus memorial: Monument + milestone: Historesche Meilesteen mine: Minn + mine_shaft: Grueweschacht monument: Monument + railway: Historesch Eisebunnsstreck roman_road: Réimerwee ruins: Ruinen + rune_stone: Runesteen stone: Steen tomb: Graf tower: Tuerm + wayside_chapel: Weekapell + wayside_cross: Weekräiz + wayside_shrine: Bildstack wreck: Wrack "yes": Historesch Plaz junction: "yes": Kräizung landuse: + allotments: Klenggäert aquaculture: Aquakultur + basin: Baseng + brownfield: Braachland cemetery: Kierfecht + commercial: Commercëgebitt + conservation: Naturschutzgebitt construction: Chantier farm: Bauerenhaff farmland: Akerland @@ -546,114 +892,221 @@ lb: grass: Wiss greenfield: Gréngzone industrial: Industriezone + landfill: Deponie + meadow: Wiss military: Militairegebitt mine: Minn orchard: Bongert + plant_nursery: Bamschoul quarry: Steekaul railway: Eisebunn + recreation_ground: Erhuelungsgebitt + religious: Terrain mat reliéiser Notzung + reservoir: Reservoir + reservoir_watershed: Waasseranzuchsgebitt residential: Wunngéigend + retail: Eenzelhandel + village_green: Duerfwiss vineyard: Wéngert + "yes": Buedemnotzung leisure: + adult_gaming_centre: Automatecasino + amusement_arcade: Spillhal + bandstand: Musekspavillon + beach_resort: Strandbad + bird_hide: Vullebeobachtungsplaz + bleachers: Sëtzreien + bowling_alley: Bowlingbunn + common: ëffentlech Gréngfläch dance: Danzsall + dog_park: Hondspark + firepit: Feierplaz + fishing: Fëschereigronn + fitness_centre: Fitnessstudio + fitness_station: Fräiloft-Fitnessariichtung garden: Gaart golf_course: Golfterrain + horse_riding: Reitanlag ice_rink: Äispist marina: Yachthafen miniature_golf: Minigolf nature_reserve: Naturschutzgebitt + outdoor_seating: Baussebestullung park: Park picnic_table: Picknickdësch pitch: Sportsterrain playground: Spillplaz + recreation_ground: Erhuelungsgebitt + resort: Vakanzenuert sauna: Sauna + slipway: Slipanlag + sports_centre: Sportszenter stadium: Stadion swimming_pool: Schwämm + track: Lafbunn + water_park: Waasserpark "yes": Fräizäit man_made: + adit: Stollen + advertising: Baussereklamm antenna: Antenn avalanche_protection: Lawineschutz + beacon: Liichttuerm + beehive: Beiestack + breakwater: Hafendamm bridge: Bréck bunker_silo: Bunker + cairn: Steemännchen chimney: Kamäin + clearcut: Ofholzung + communications_tower: Funktuerm crane: Kran + cross: Kräiz + dyke: Däich + embankment: Rampli + flagpole: Fändelsmast gasometer: Gasometer + groyne: Buhn + kiln: Brennuewen lighthouse: Liichttuerm mast: Mast mine: Minn + mineshaft: Grueweschacht + monitoring_station: Observatiounsstatioun + petroleum_well: Äerduelegquell + pier: Pfeiler pipeline: Pipeline pumping_station: Pompel-Statioun + reservoir_covered: Waasserhéichbehälter + silo: Späicher + snow_cannon: Schnéikanoun + snow_fence: Schnéizonk + storage_tank: Lagertank + street_cabinet: Stroosseverdeeler surveillance: Iwwerwaachung telescope: Teleskop tower: Tuerm + utility_pole: Leitungsmast + wastewater_plant: Kläranlag watermill: Waassermillen + water_tap: Waasserkrunn water_tower: Waassertuerm water_well: Buer + water_works: Waasserwierk windmill: Wandmillen works: Fabrik + "yes": mënschgemaach military: airfield: Militärfluchhafen barracks: Kasär bunker: Bunker + checkpoint: Kontrollpunkt + trench: Schützegruewen "yes": Militär mountain_pass: "yes": Pass an de Bierger natural: atoll: Atoll + bare_rock: Fiels bay: Bucht beach: Plage cape: Kap + cave_entrance: Hielenagang + cliff: Klipp + coastline: Küstelinn crater: Krater + dune: Dün + fell: Fjell fjord: Fjord forest: Bësch geyser: Geysir glacier: Gletscher grassland: Wiss + heath: Heed hill: Hiwwel + hot_spring: Gliddeg Quell island: Insel + isthmus: Isthmus land: Land marsh: Mouer moor: Mouer + mud: Schléck + peak: Sommet peninsula: Hallefinsel point: Punkt + reef: Rëff + ridge: Grat rock: Steng + saddle: Pass sand: Sand + scree: Gestengs + scrub: Buschland + shingle: Gestengs spring: Quell stone: Steen + strait: Mierengt tree: Bam + tree_row: Bamrei + tundra: Tundra valley: Dall volcano: Vulkan water: Waasser wetland: Fiichtgebitt wood: Bësch + "yes": Landschaftsform office: + accountant: Comptabilitéitsbüro administrative: Verwaltung + advertising_agency: Publicitéitsagentur architect: Architekt + association: Verband company: Firma + diplomatic: Diplomatesch Vertriedung + educational_institution: Bildungsariichtung employment_agency: Aarbechtsamt + energy_supplier: Büro vun engem Energieversuerger estate_agent: Immobilière + financial: Finanzamt + government: Amt + insurance: Versécherungsbüro + it: IT-Büro lawyer: Affekot + logistics: Logistikbüro + newspaper: Büro vun engem Zeitungsverlag + ngo: NGO notary: Notaire + religion: Religiéist Amt + research: Fuerschungs- an Entwécklungsbüro tax_advisor: Steierberoder + telecommunication: Telekommunikatiounsbüro travel_agent: Reesbüro "yes": Büro place: + allotments: Klenggäert + archipelago: Archipel city: Stad + city_block: Haiserblock country: Land county: Bezierk farm: Bauerenhaff + hamlet: Weiler house: Haus houses: Haiser island: Insel islet: Insel + isolated_dwelling: Eenzelgehöft locality: Plaz municipality: Gemeng neighbourhood: Noperschaft + plot: Grondstéck postcode: Postcode quarter: Quartier region: Regioun sea: Mier square: Plaz + state: Staat subdivision: Ënnerdeelung + suburb: Staddeel town: Stad village: Duerf "yes": Plaz @@ -661,69 +1114,158 @@ lb: abandoned: Fréier Eisebunn construction: Eisebunn (am Bau) disused: Fréier Eisebunn + funicular: Standseelbunn + halt: Zuchhaltestell junction: Eisebunnskräizung + level_crossing: Eisebunnskräizung + light_rail: Stadbunn miniature: Miniatur-Eisebunn monorail: Monorail + narrow_gauge: Schmuelspuerbunn platform: Zuchquai + preserved: Muséesbunn proposed: Proposéiert Eisebunnslinn + spur: Uschlossgleis station: Gare (Eisebunn) + stop: Zuchhaltepunkt subway: Metro + subway_entrance: Ënnergrondbunnsagang + switch: Weich tram: Tram + tram_stop: Tramhaltestell + yard: Rangéiergare shop: + agrarian: Agrargeschäft + alcohol: Spirituosebuttek antiques: Antiquitéitegeschäft + appliance: Haushaltsgerätebuttek + art: Konschtbuttek + baby_goods: Babywueren + bag: Täschegeschäft bakery: Bäckerei + bathroom_furnishing: Buedstudio + beauty: Schéinheetssalon + bed: Bettestudio + beverages: Getränkemaart bicycle: Vëlosgeschäft bookmaker: Wettbüro books: Bichergeschäft boutique: Boutique butcher: Metzlerei + car: Autohaus + car_parts: Autodeelhändler car_repair: Garage carpet: Teppechgeschäft + charity: Wueltätegkeetsbuttek + cheese: Kéisbuttek chemist: Apdikt chocolate: Schockela clothes: Kleedergeschäft + coffee: Kaffisbuttek computer: Computergeschäft + confectionery: Séißwuerebuttek + convenience: Noperschaftsbuttek + copyshop: Copyshop cosmetics: Parfümerie + craft: Kënschtler- a Bastelbedarf + curtain: Riddosgeschäft + dairy: Mëllechbuttek + deli: Feikaschtbuttek + department_store: Kafhaus + discount: Diskontbuttek + doityourself: Baumaart dry_cleaning: Botzerei + e-cigarette: Geschäft fir E-Zigaretten + electronics: Elektronikgeschäft erotic: Sex-Shop + estate_agent: Immobilière fabric: Stoffgeschäft + farm: Haffbuttek fashion: Moudegeschäft + fishing: Aangelgeschäft florist: Fleurist food: Epicerie + frame: Bilderrummegeschäft funeral_directors: Doudegriewer furniture: Miwwelgeschäft + garden_centre: Gaardenzentrum + gas: Gasfläschebuttek + general: Gemëschtwuerebuttek + gift: Geschenkbuttek + greengrocer: Uebst- a Geméishändler + grocery: Liewensmëttelbuttek hairdresser: Coiffeur hardware: Quincaillerie + health_food: Naturkaschtbuttek hearing_aids: Hörapparat + herbalist: Kraiderhandel + hifi: Elektroshop + houseware: Houswuerebuttek ice_cream: Glacëbuttek + interior_decoration: Bannenausstattung jewelry: Bijouterie + kiosk: Kiosk + kitchen: Kichegeschäft laundry: Botzerei + locksmith: Schlësseldéngscht lottery: Lotterie + mall: Akaafszentrum massage: Massage + medical_supply: Sanitätsbedarf + mobile_phone: Handysgeschäft + money_lender: Handyléin + motorcycle: Motorradsgeschäft + motorcycle_repair: Motorradsgarage music: Museksgeschäft + musical_instrument: Musekinstrumenter + newsagent: Zeitungsbuttek + nutrition_supplements: Nährungsergänzungsmëttel optician: Optiker + organic: Bio-Buttek + outdoor: Outdoor-Ausrëschter + paint: Lackéierei + pastry: Pâtisserie perfumery: Parfümerie pet: Déierebuttek pet_grooming: Honds-Salon photo: Fotosgeschäft seafood: Mieresfriichten second_hand: Secondhand-Geschäft + sewing: Bitzgeschäft shoes: Schonggeschäft sports: Sportsgeschäft + stationery: Schreifwuerebuttek + storage_rental: Léilager supermarket: Supermarché tailor: Schneider + tattoo: Tätowéierer + tea: Téibuttek + ticket: Ticketsbuttek + tobacco: Tubaksbuttek + toys: Spillwueregeschäft travel_agency: Reesbüro tyres: Peuenhändler + vacant: Eidelstoend Geschäft + variety_store: Bëllegbuttek + video: Videothéik + video_games: Videospillbuttek + wholesale: Grousshandel wine: Vinothéik "yes": Geschäft tourism: + alpine_hut: Bierghütt apartment: Vakanzen-Appartement artwork: Konschtwierk attraction: Attraktioun + bed_and_breakfast: Bed and Breakfast cabin: Hütt + camp_pitch: Campingplaz camp_site: Camping + caravan_site: Wunnmobil-Stellplaz chalet: Chalet gallery: Galerie + guest_house: Pensioun + hostel: Jugendherberg hotel: Hotel information: Informatioun motel: Motel @@ -731,15 +1273,42 @@ lb: picnic_site: Piknikplaz theme_park: Fräizäitpark viewpoint: Aussiichtspunkt + wilderness_hut: Schutzhütt zoo: Zoo tunnel: + building_passage: Gebaisduerchgang + culvert: Duerchlooss "yes": Tunnel waterway: + artificial: Kënschtlech Waasserstrooss + boatyard: Werft canal: Kanal dam: Staudamm + derelict_canal: Opgeloossene Kanal + ditch: Waassergruef + dock: Dock + drain: Ofwaassergruef + lock: Schleis + lock_gate: Schleisepaart + mooring: Uleeplaz + rapids: Stroumschnellen river: Floss + stream: Baach wadi: Wadi waterfall: Waasserfall + weir: Wier + "yes": Waasserstrooss + admin_levels: + level2: Staatsgrenz + level3: Regiounsgrenz + level4: Landesgrenz + level5: Regiounsgrenz + level6: Krees-/Bezierksgrenz + level7: Gemengegrenz + level8: Gemenge-/Stadsgrenz + level9: Staddeelgrenz + level10: Noperschaftsgrenz + level11: Noperschaftsgrenz types: cities: Stied towns: Dierfer @@ -750,37 +1319,104 @@ lb: issues: index: title: Problemer + select_status: Status auswielen select_type: Typ eraussichen + select_last_updated_by: Auswiel zulescht aktualiséiert vun + reported_user: Gemellte Benotzer not_updated: Net aktualiséiert search: Sichen + search_guidance: 'Problemer duerchsichen:' user_not_found: Benotzer gëtt et net + issues_not_found: Keng entspriechend Problemer fonnt status: Status reports: Rapporten last_updated: Lescht Aktualiséierung + last_updated_time_html: %{time} + last_updated_time_user_html: %{time} duerch den + %{user} + link_to_reports: Rapporte weisen + reports_count: + one: 1 Bericht + other: '%{count} Berichter' + reported_item: Gemellten Objet states: ignored: Ignoréiert open: Opmaachen resolved: Geléist update: + new_report: Äre Rapport gouf enregistréiert + successful_update: Äre Rapport gouf erfollegräich aktualiséiert provide_details: Gitt wgl. déi gefroten Detailer un show: + title: '%{status} Problem Nr. %{issue_id}' + reports: + one: Eng Meldung + other: '%{count} Meldungen' + report_created_at: Fir d'éischt gemellt den %{datetime} + last_resolved_at: Fir d'lescht erleedegt den %{datetime} + last_updated_at: Fir d'lescht aktualiséiert den %{datetime} vun %{displayname} resolve: Léisen ignore: Ignoréieren + reopen: Nees opmaachen reports_of_this_issue: Meldunge vun dësem Probleem read_reports: Rapporte liesem new_reports: Nei Rapporten + other_issues_against_this_user: Weider Problemer géint dëse Benotzer + no_other_issues: Keng weider Problemer géint dëse Benotzer + comments_on_this_issue: Commentairen zu dësem Problem + resolve: + resolved: De Problemstatus gouf op „Erleedegt“ geännert + ignore: + ignored: De Problemstatus gouf op „Ignoréiert“ geännert + reopen: + reopened: De Problemstatus gouf op „Oppe“ geännert + comments: + comment_from_html: Commentaire vun %{user_link} erstallt den %{comment_created_at} + reassign_param: Problem op en Neits zouweisen? + reports: + reported_by_html: Gemellt als %{category} vun %{user} den %{updated_at} + helper: + reportable_title: + diary_comment: '%{entry_title}, Commentaire #%{comment_id}' + note: 'Hiweis #%{note_id}' + issue_comments: + create: + comment_created: Däi Commentaire gouf erfollegräich erstallt reports: new: title_html: '%{link} mellen' + missing_params: Es konnt keng nei Meldung erstallt ginn + disclaimer: + intro: 'Iers de deng Meldung un d''Websäitmoderatore schécks, stell wannechgelift + sécher, datt:' + not_just_mistake: Du bass dir sécher, datt däi Problem net nëmmen e Feeler + ass. + unable_to_fix: Du kanns dëse Problem selwer oder mat Hëllef vun eise Communautéitsmemberen + net léisen + resolve_with_user: Du hues ewell versicht, de Problem mam zoustännege Benotzer + ze léisen. categories: diary_entry: + spam_label: Dëse Blogantrag ass/enthält Spam + offensive_label: Dëse Blogcommentaire ass obszön/ustéisseg + threat_label: Dëse Blogantrag enthält eng Menace + other_label: Anerer + diary_comment: + spam_label: Dëse Blogantrag ass/enthält Spam + offensive_label: Dëse Blogcommentaire ass obszön/ustéisseg + threat_label: Dëse Blogantrag enthält eng Menace other_label: Anerer user: + spam_label: Dëse Benotzerkont ass/enthält Spam + offensive_label: Dëse Benotzerkont ass obszön/ustéisseg + threat_label: Dëse Benotzerkont enthält eng Menace vandal_label: Dëse Benotzer ass e Vandal other_label: Anerer note: spam_label: Dës Notiz ass Spam + personal_label: Dësen Hiweis enthält perséinlech Donnéeën abusive_label: Dës Notiz ass abusiv + other_label: Anerer create: successful_report: Äre Rapport gouf enregistréiert provide_details: Gitt wgl. déi gefroten Detailer un @@ -788,29 +1424,46 @@ lb: logo: alt_text: OpenStreetMap Logo home: Op déi Plaz zréckgoen déi als Doheem definéiert ass - logout: Ausloggen + logout: Ofmellen log_in: Aloggen + log_in_tooltip: Mat engem existéierende Kont umellen sign_up: Mellt Iech un + start_mapping: Mat dem Kaartéieren ufänken + sign_up_tooltip: E Kont erstellen, fir 'Donnéeë beaarbechten ze kënnen edit: Änneren history: Versiounen export: Exportéieren issues: Problemer data: Donnéeën export_data: Donnéeën exportéieren + gps_traces: GPS-Spueren + gps_traces_tooltip: GPS-Spuere verwalten user_diaries: Benotzer Bloggen + user_diaries_tooltip: Benotzer-Blogge liesen edit_with: Ännere mat %{editor} + tag_line: D'fräi Wiki-Weltkaart intro_header: Wëllkomm bei OpenStreetMap! intro_text: OpenStreetMap ass eng Kaart vun der Welt, déi vu Leit wéi Iech gemaach gouf an déi fräi ënner enger oppener Lizenz benotzt ka ginn. intro_2_create_account: E Benotzerkont uleeën + hosting_partners_html: Den Hosting gëtt vun %{ucl}, %{fastly}, %{bytemark} an + anere(n) %{partners} ënnerstëtzt. partners_ucl: '''''University College'''' zu London' - partners_partners: Partner + partners_fastly: Fastly + partners_bytemark: Bytemark Hosting + partners_partners: Partneren + tou: Benotzungs-Bedéngungen osm_offline: D'OpenStreetMap Datebank ass elo net disponibel well dru geschafft muss ginn. + osm_read_only: D'OpenStreetMap Datebank kann den Ament nëmmen ausgelies an net + beaarbecht ginn, well se gewaart gëtt. + donate: Ënnerstëtz d'OpenStreetMap-Hardwarenspendenaktioun duerch eng eegen %{link} help: Hëllef about: Iwwer copyright: Copyright community: Communautéit + community_blogs: Bloggen + community_blogs_title: Blogge vu Matwierkenden bei OpenStreetMap foundation: Fondatioun foundation_title: D'OpenStreetMao Fondatioun make_a_donation: @@ -820,67 +1473,195 @@ lb: more: Méi user_mailer: diary_comment_notification: + subject: '[OpenStreetMap] %{user} huet e Blogantrag kommentéiert' hi: Salut %{to_user}, + header: '%{from_user} huet den OpenStreetMap-Blogantrag mat dem Thema %{subject} + kommentéiert:' + header_html: '%{from_user} huet den OpenStreetMap-Blogantrag mat dem Thema %{subject} + kommentéiert:' + footer: Hei geet et zum Commentaire %{readurl}, du kanns e kommentéieren %{commenturl} + oder dem Auteur ënner %{replyurl} äntferen. + footer_html: Du kanns och de Commentaire ënner %{readurl} an en ënnert %{commenturl} + kommentéieren oder dem Auteur ënner %{replyurl} e Message schécken. message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Salut %{to_user}, + header: '%{from_user} huet dir e Message iwwer OpenStreetMap mam Betreff %{subject} + geschéckt:' + header_html: '%{from_user} huet dir e Message iwwer OpenStreetMap mat dem Betreff + %{subject} geschéckt:' + footer: Du kanns de Message och ënner %{readurl} liesen an dem Auteur ënner + %{replyurl} äntferen footer_html: Dir kënnt de Message och op %{readurl} liesen an Dir kënnt op %{replyurl} äntwerten friendship_notification: hi: Salut %{to_user}, + subject: '[OpenStreetMap] %{user} huet dech als Frënd bäigefügt' had_added_you: '%{user} hat Iech als Frënd op OpenStreet Map derbäigesat.' see_their_profile: Dir kënnt säin/hire Profil op %{userurl} kucken. + see_their_profile_html: Dir kënnt säin/hire Profil ënner %{userurl} kucken. befriend_them: Dir kënnt hien/si och als Frënd op %{befriendurl} derbäisetzen. + befriend_them_html: Dir kënnt hien/si och als Frënd ënner %{befriendurl} derbäisetzen. + gpx_description: + description_with_tags_html: 'Et schéngt, datt déng GPX-Datei %{trace_name} mat + der Beschreiwung %{trace_description} an de folgenden Taggen: %{tags}' + description_with_no_tags_html: Et schéngt, datt deng GPX-Datei %{trace_name} + mat der Beschreiwung %{trace_description} an ouni Taggen gpx_failure: hi: Salut %{to_user}, failed_to_import: 'konnt net importéiert ginn. Hei ass de Feeler:' + more_info_html: Weider Informatiounen iwwer Feeler bei GPX-Importer a wéi se + vermidde kënne gi fanne sech ënner %{url} + import_failures_url: https://wiki.openstreetmap.org/wiki/LB:GPX + subject: '[OpenStreetMap] GPX-Import Feeler' gpx_success: hi: Salut %{to_user}, + loaded_successfully: + one: mat %{trace_points} von 1 méigleche Punkt erfollegräich gelueden. + other: mat %{trace_points} vun %{possible_points} méigleche Punkten erfollegräich + gelueden. + subject: '[OpenStreetMap] GPX-Import erfollegräich' signup_confirm: + subject: '[OpenStreetMap] Wëllkomm bei OpenStreetMap' greeting: Bonjour ! + created: Iergendeen (hoffentlech du) huet grad bei %{site_url} e Benotzerkont + erstallt + confirm: Ier mir eppes ënnerhuelen, brauche mir eng Bestätegung, datt dës Ufro + vun dir staamt. Falls jo, klick wannechgelift op den ënne stoende Link, fir + däi Kont ze bestätegen. + welcome: No der Bestätegung vun dengem Benotzerkont gi mir dir zousätzlech Informatiounen, + fir unzefänken. email_confirm: subject: '[OpenStreetMap] Confirméiert Är E-Mailadress' greeting: Salut, + hopefully_you: Iergendeen (hoffentlech du) wëll seng E-Mail-Adress op %{server_url} + zu %{new_address} änneren. click_the_link: Wann Dir dat sidd, da klickt op de Link hei drënner fir d'Ännerung ze confirméieren. lost_password: subject: '[OpenStreetMap] Ufro fir d''Passwuert zréckzesetzen' greeting: Salut, + hopefully_you: Iergendeen (hoffentlech du) huet eng Zerécksetzung vum Passwuert + fir den OpenStreetMap.org-Kont vun dëser E-Mail-Adress ugefuerdert. click_the_link: Wann Dir dat sidd da klickt wgl. op de Link hei drënner fir Äert Passwuert zréckzesetzen. note_comment_notification: anonymous: En anonyme Benotzer greeting: Salut, + commented: + subject_own: '[OpenStreetMap] %{commenter} huet ee vun déngen Hiweiser kommentéiert' + subject_other: '[OpenStreetMap] %{commenter} huet en Hiweis kommentéiert, + un deems du interesséiert bass' + your_note: '%{commenter} huet ee vun dir gemellten Hiweis an der Noperschaft + vu(n) %{place} kommentéiert.' + your_note_html: '%{commenter} huet ee vun dir gemellten Hiweis an der Noperschaft + vu(n) %{place} kommentéiert.' + commented_note: '%{commenter} huet zu engem Hiweis, deens du kommentéiert + has, e weidere Commentaire hannerluecht. Den Hiweis ass an der Noperschaft + vu(n) %{place}.' + commented_note_html: '%{commenter} huet zu engem Hiweis, denns du kommentéiert + has, e weidere Commentaire hannerluecht. Dësen Hiweis ass an der Noperschaft + vu(n) %{place}.' + closed: + subject_own: '[OpenStreetMap] %{commenter} huet ee vun dengen Hiweiser kommentéiert' + subject_other: '[OpenStreetMap] %{commenter} huet e gemellte Problem geléist, + un deems du interesséiert bass.' + your_note: '%{commenter} huet ee vun Iech gemellte Problem an der Noperschaft + vu(n) %{place} geléist.' + your_note_html: '%{commenter} huet ee vun dir gemellte Problem an der Noperschaft + vu(n) %{place} geléist.' + commented_note: '%{commenter} huet e Problem geléist, deens du kommentéiert + has. Den Hiweis war an der Noperschaft vu(n) %{place}.' + commented_note_html: '%{commenter} huet e Problem/Thema geléist, zu deems + du kommentéiert has. Den Hiweis war an der Noperschaft vu(n) %{place}.' + reopened: + subject_own: '[OpenStreetMap] %{commenter} huet ee vun dengen Hiweiser kommentéiert' + subject_other: '[OpenStreetMap] %{commenter} huet en Hiweis, un deems du interesséiert + bass, reaktivéiert.' + your_note: '%{commenter} huet ee vun Iech gemellte Problem an der Noperschaft + vu(n) %{place} geléist.' + your_note_html: '%{commenter} huet ee vun Iech gemellten Hiweis an der Noperschaft + vu(n) %{place} kommentéiert.' + commented_note: '%{commenter} huet en Hiweis an der Noperschaft vu(n) %{place}, + deens du kommentéiert has, reaktivéiert.' + commented_note_html: '%{commenter} huet en Hiweis an der Noperschaft vu(n) + %{place}, deens du kommentéiert has, reaktivéiert.' details: Méi Detailer iwwer d'Notiz fannt Dir op %{url}. + details_html: Méi Detailer iwwer d'Notiz fannt Dir op %{url}. changeset_comment_notification: hi: Salut %{to_user}, greeting: Salut, commented: + subject_own: '[OpenStreetMap] %{commenter} huet ee vun dengen Ännerungssätz + kommentéiert.' + subject_other: '[OpenStreetMap] %{commenter} huet en Ännerungssaz kommentéiert, + un deems du interesséiert bass' + your_changeset: '%{commenter} huet e Commentaire um %{time} zu engem vun dengen + Ännerungssätz hannerlooss' + your_changeset_html: '%{commenter} huet um %{time} zu engem vun dengen Ännerungssätz + en Diskussiounsbäitrag hannerlooss' + commented_changeset: '%{commenter} huet en Diskussiounsbäitrag um %{time} + zu engem Kaartenännerungssaz hannerlooss, deens du observéiert hues, erstallt + vu(m) %{changeset_author}' + commented_changeset_html: '%{commenter} huet um %{time} en Diskussiounsbäitrag + zu engem vun dir observéierten Ännerungssaz vu(m) %{changeset_author} hannerlooss' + partial_changeset_with_comment: mat der Bemierkung „%{changeset_comment}“ + partial_changeset_with_comment_html: mat der Bemierkung „%{changeset_comment}“ partial_changeset_without_comment: ouni Kommentar + details: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt ginn. + details_html: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt + ginn. + unsubscribe: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, besich + %{url} a klick op „Ofmellen“. + unsubscribe_html: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, + besich %{url} a klick op „Ofmellen“. confirmations: confirm: heading: Iwwerpréift Är E-Mail! introduction_1: Mir hunn Iech eng Confirmatiouns-E-Mail geschéckt. + introduction_2: Wannechgelift bestäteg däi Benotzerkont, an deems du de Link + an der Bestätegungs-E-Mail uklicks. Da kanns du domat ufänken, bei OpenStreetMap + matzeschaffen. press confirm button: Klickt wgl. op de Knäppchen confirméieren fir Äre Benotzerkont z'aktivéieren. button: Confirméieren + success: Däi Benotzerkont gouf bestätegt, Merci fir d'Registréieren! already active: Dëse Kont gouf scho confirméiert. unknown token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net. + reconfirm_html: Fir d'Bestätegungs-E-Mail erëm ze senden, klick + hei. confirm_resend: failure: Benotzer %{name} gouf net fonnt. confirm_email: heading: Eng Ännerung vun enger E-Mailadress confirméieren + press confirm button: Fir d'Bestätegung vun der neier E-Mail-Adress, klick wannechgelift + ënnen op „Bestätegen“. button: Confirméieren + success: D'Ännerung vun denger E-Mail-Adress gouf bestätegt! + failure: Eng E-Mail-Adress gouf ewell mat dësem Link bestätegt. unknown_token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net. + resend_success_flash: + whitelist: Wanns du en Antispam-System verwenns, dee Bestätegungsufroe sent, + stell wannechgelift sécher, dass du %{sender} op eng Erlaabnislëscht setz, + well mir keng Bestätegungsufroë beäntwere kënnen. messages: inbox: + title: Postagang + my_inbox: Mäi Postagang + my_outbox: Mäi Postausgang messages: Dir hutt %{new_messages} a(n) %{old_messages} new_messages: one: '%{count} neie mMssage' other: '%{count} nei Messagen' - from: Vum + old_messages: + one: '%{count} ale Message' + other: '%{count} al Messagen' + from: Vu(n) subject: Sujet date: Datum + no_messages_yet_html: Du hues nach keng Noriichte versent. Wëlls de mat %{people_mapping_nearby_link} + Kontakt ophuelen? + people_mapping_nearby: Mapperen an der Noperschaft message_summary: unread_button: Als net gelies markéieren read_button: Als gelies markéieren @@ -890,17 +1671,32 @@ lb: title: Noriicht schécken send_message_to_html: Dem %{name} en neie Message schécken subject: Sujet + body: Text + back_to_inbox: Zréck an de Postagang create: message_sent: Message geschéckt no_such_message: title: Kee sou ee Message heading: Kee sou ee Message outbox: + my_inbox: Mäi Postagang + my_outbox: Mäi Postausgang + messages: + one: Du hues %{count} Noriicht gesent + other: Du hues %{count} Noriichte gesent + to: Un subject: Sujet date: Datum + no_sent_messages_html: Du hues nach keng Noriichte versent. Wëlls de mat %{people_mapping_nearby_link} + Kontakt ophuelen? + people_mapping_nearby: Mapperen an der Noperschaft + reply: + wrong_user: Du bass als '%{user}' ugemellt, awer d'Noriicht, déis du beäntwere + wollts, gouf un en anere Benotzer geschéckt. Mell dech fir d'Beäntwerte wannechgelift + mat dem richtege Benotzer un. show: title: Message liesen - from: Vum + from: Vu(n) subject: Sujet date: Datum reply_button: Äntwerten @@ -908,6 +1704,9 @@ lb: destroy_button: Läschen back: Zréck to: Fir + wrong_user: Du bass ugemellt als '%{user}', awer d'Noriicht, déis du liese wollts, + gouf un en anere Benotzer geschéckt. Wannechgelift mell dech fir ze liese + mat dem richtege Benotzer un. sent_message_summary: destroy_button: Läschen mark: @@ -921,22 +1720,57 @@ lb: heading: Passwuert vergiess? email address: 'E-Mail-Adress:' new password button: Passwuert zrécksetzen + help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt + has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze + kanns. + notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert + gouf un dech versent. notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon. reset_password: title: Passwuert zrécksetzen heading: Passwuert fir %{user} zrécksetzen reset: Passwuert zrécksetzen flash changed: Äert Passwuert gouf geännert. + flash token bad: Mir konnten dëst Kierzel leider net fannen. Du hues dech méiglecherweis + vertippt oder du hues en ongëltege Link opgemaach. + preferences: + show: + title: Meng Benotzerastellungen + preferred_editor: Liblingseditor + preferred_languages: Léifste Sproochen + edit_preferences: Benotzerastellungen änneren + edit: + title: Benotzerastellungen änneren + save: Benotzerastellungen aktualiséieren + cancel: Ofbriechen + update: + failure: D'Benotzerastellunge konnten net aktualiséiert ginn. + update_success_flash: + message: Astellungen aktualiséiert. profiles: edit: + title: Profil beaarbechten + save: Profil aktualiséieren + cancel: Ofbriechen image: Bild gravatar: + gravatar: Gravatar verwenden + link: https://wiki.openstreetmap.org/wiki/DE:Gravatar + what_is_gravatar: Wat ass Gravatar? 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 + image size hint: (quadratesch Biller mat zumindest 100x100 Pixel funktionéieren + am beschten) + home location: Heemecht + no home location: Du hues nach keng Heemecht aginn. + update home location on click: Heemecht beim Klick op d'Kaart aktualiséieren + update: + success: Profil aktualiséiert. + failure: De Profil konnt net aktualiséiert ginn. sessions: new: title: Umellen @@ -949,8 +1783,13 @@ lb: login_button: Umellen register now: Elo aschreiwen new to osm: Nei bei OpenStreetMap? + to make changes: Fir Donnéesännerunge bei OpenStreetMap virhuelen ze kënnen, + muss Du e Benotzerkont hunn. create account minute: Maacht e Benotzerkont. Et dauert nëmmen eng Minutt. no account: Hutt Dir kee Benotzerkont? + account is suspended: Däi Benotzerkont gouf opgrond vu verdächtegen Aktivitéite + gespaart.
    Wannechgelift kontaktéier de Support, + falls du dëst kläre wëlls. openid_logo_alt: Alogge mat enger OpenID auth_providers: openid: @@ -1000,27 +1839,85 @@ lb: site: about: next: Weider + copyright_html: ©OpenStreetMap
    Matwierkend + used_by_html: '%{name} stellt Kaartendonnéeë fir dausende vu Websäiten, Appen + an anere Geräter zur Verfügung' + lede_text: OpenStreetMap gëtt vun enger Panoplie vu Mapperen erstallt, déi Donnéeën + zu Weeër, Gebaier an allerlee Weiderem weltwäit erfaassen a fleegen. local_knowledge_title: Lokaalt Wëssen + local_knowledge_html: OpenStreetMap leet Wäert op lokaalt Wëssen. Auteure benotze + Loftbiller, GPS-Geräter a Feldkaarte fir d'Verifizéierung, sou dass OSM korrekt + an aktuell ass. + community_driven_title: Communautéitsbedriwwen + community_driven_html: |- + D'OpenStreetMap-Communautéit ass villfälteg, leidenschaftlech a wiisst deeglech. Eis Matwierkend si begeeschtert Mapper, GIS-Profien, Ingenieuren, déi d'OSM-Servere bedreiwen a vill méi. + Fir méi iwwer d'Communautéit z'erfueren, lies eisen OpenStreetMap-Blog, + d'Benotzertagebicher, + Community-Bloggen an d'Websäit vun der OSM-Foundatioun. open_data_title: Open Data - legal_title: Legal - partners_title: Partner + open_data_html: 'OpenStreetMap ass „Open Data“: Du kanns et fir jiddwer Zweck + verwenden, soulaangs du OpenStreetMap a seng Matwierkend erwääns. Falls du + déi Donnéeën ofänners oder op bestëmmt Aart abaus, däerfs du d''Ergebnis nëmmen + ënner der nämmlechter Lizenz verbreeden. Kuck d''Auteursrechts- + a Lizenzsäit fir Eenzelheeten.' + legal_title: Rechtlech Hiweiser + legal_1_html: |- + Dës Websäit a vill domat an Zesummenhang stoend Déngschter gi vun der OpenStreetMap Foundation (OSMF) fir d'OSM-Communautéit bedriwwen. D'Benotze vun allen OSMF-bedriwwenen Déngschter gëtt duerch eis „Acceptable Use Policies“ + an eis Dateschutzrichtlinn gereegelt. + partners_title: Partneren copyright: foreign: title: Iwwer dës Iwwersetzung + html: Fir de Fall vun enger Ofwäichung tëscht der virleiender Iwwersetzung + an %{english_original_link}, ass déi engleschsproocheg Säit maßgebend. english_link: den engleschen Original native: title: Iwwer dës Säit native_link: lëtzebuergesch Versioun + mapping_link: mat dem Kaartéieren ufänken legal_babble: title_html: Copyright a Lizenz + credit_title_html: Wéi et op d'Urhiewerschaft vun OpenStreetMap hinzeweise + gëllt + credit_1_html: Mir verlaangen d'Verwendung vum Hiweis „© OpenStreetMap-Matwierkend“. more_title_html: Fir méi ze wëssen + more_2_html: |- + Obwuel OpenStreetMap „Open Data“ ass, kënne mir keng onentgeltlech Kaarten-API fir Drëttparteie bereetstellen. + Kuck eis API-Verwendungsrichtlinn, d'Kachelverwendungsrichtlinn an d'Nominatim-Verwendungsrichtlinn. + contributors_title_html: Eis Matwierkend + contributors_intro_html: 'Eis Matwierkend sinn dausende vun eenzele Mënschen. + Mir bezéien och oppe lizenzéiert Donnéeë vu nationale Kaartenagenturen an + anere Quellen an, dorënner:' + contributors_at_html: |- + Éisträich: Enthält Donnéeë vun der Stad Wien (ënner CC BY), + Land Vorarlberg a Land Tirol (ënner CC BY AT mat Amendementer). + contributors_ca_html: |- + Kanada: Enthält Donnéeë vu GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), a StatCan (Geography Division, + Statistics Canada). + contributors_fr_html: 'Frankräich: Enthält Donnéeë vun der + Direction Générale des Impôts.' + contributors_nz_html: 'Neiséiland: Enthält Donnéeë vum Land + Information New Zealand Data Service an ass fir d''Rëmbenotzen ënner + CC BY 4.0 lizenzéiert.' + contributors_es_html: |- + Spuenien: Enthält Donnéeë vum spuenesche nationale geographeschen Institut (IGN) an nationale kartographesche System (SCNE) + fir d'Rëmbenotzen ënner CC BY 4.0 lizenzéiert. infringement_title_html: Copyright-Verletzung + trademarks_title_html: Markenzeechen + trademarks_1_html: OpenStreetMap, de Luppelogo a „State of the Map“ sinn agedroe + Wouerzeeche vun der OpenStreetMap Foundation. Falls du Froen iwwer d'Verwendung + vu Marken hues, lies wannechgelift eis . index: js_1: Dir hutt entweder e Browser dee JavaScript net ënnerstëtzt oder Dir hutt JavaScript desaktivéiert. + js_2: OpenStreetMap benotzt JavaScript fir d'Kaartenduerstellung permalink: Permanentlink shortlink: Kuerze Link createnote: Eng Notiz derbäisetzen + license: + copyright: Copyright OpenStreetMap a Matwierkend, ënner enger oppener Lizenz edit: not_public: Dir hutt net agestallt datt Är Ännerungen ëffentlech sinn. user_page_link: Benotzersäit @@ -1031,11 +1928,18 @@ lb: manually_select: Sicht manuell eng aner Géigend eraus format_to_export: Format fir z'exportéieren osm_xml_data: OpenStreetMap-XML-Daten + embeddable_html: HTML fir anzebannen licence: Lizenz too_large: + body: Dëse Beräich ass ze grouss, fir als OpenStreetMap-XML-Donnéeën exportéiert + ze ginn. Wannechgelift vergréisseren, e méi klenge Beräich wielen oder eng + vun de folgende Quelle fir Massendonnéeëndownloade benotzen. planet: + title: Planéit OSM description: Regelméisseg aktualiséiert Kopie vun der kompletter OpenStreetMap Datebank + overpass: + title: Overpass API other: title: Aner Quellen description: Zousätzlech Quelle stinn an der OpenStreetMap Wiki @@ -1045,9 +1949,11 @@ lb: max: max image_size: Gréisst vum Bild zoom: Zoom + add_marker: Eng Markéierung op der Kaart bäifügen latitude: 'Geographesch Breet:' longitude: 'Geographesch Längt:' output: Resultat + paste_html: HTML-Code kopéieren, fir en an eng Websäit anzefügen export_button: Exportéieren fixthemap: title: E Probleem mellen / D'Kaart verbesseren @@ -1081,6 +1987,10 @@ lb: wiki: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki + potlatch: + id_html: Alternativ kanns du däi Standardediteur op iD astellen, deen an dengem + Webbrowser wéi virdru Potlach ausgeféiert gëtt. Änner + hei deng Benotzerastellungen. sidebar: search_results: Resultater vum Sichen close: Zoumaachen @@ -1096,6 +2006,7 @@ lb: main_road: Haaptstrooss secondary: Niewestrooss unclassified: Net klasséiert Strooss + track: Spuer bridleway: Wee fir Päerd cycleway: Vëlospiste cycleway_national: Nationale Vëloswee @@ -1106,25 +2017,44 @@ lb: subway: Metro tram: 1: Tram + cable: + - Seelbunn + - Sessellift + runway: + - Start- a Landebunn + - Rullbunn apron: 1: Terminal + admin: Verwaltungsgrenz forest: Bësch wood: Bësch golf: Golfterrain park: Park + common: + - ëffentlech Gréngfläch (brit.) + - Wiss + retail: Akaafszentrum industrial: Industriezone + commercial: Commercëgebitt + heathland: Heed lake: - Séi farm: Bauerenhaff + brownfield: Broochland cemetery: Kierfecht + allotments: Klenggäert + pitch: Sportsterrain + centre: Sportszenter reserve: Naturschutzgebitt military: Militärgebitt school: - Schoul - Universitéit + station: Gare (Eisebunn) summit: - Spëtzt private: Privaten Terrain + destination: Nëmme fir Leit mat Uleies construction: Stroossen am Bau bicycle_shop: Vëlosgeschäft bicycle_parking: Vëlosparking @@ -1140,13 +2070,30 @@ lb: add_a_note: title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi! traces: + visibility: + public: Ëffentlech (gëtt an der Spuerlëscht ugewisen, allerdéngs nëmmen als + anonym, onsortéiert Punktfolleg) + trackable: Verfollegbar (gëtt an der Spuerlëscht als anonym, sortéiert Punktefolleg + mat Zäitstempelen ugewisen) + identifiable: Identifizéierbar (gëtt an der Spuerlëscht als identifizéierbar, + sortéiert Punktfolleg mat Zäitstempel ugewisen) new: visibility_help: wat heescht dat? help: Hëllef + create: + upload_trace: GPS-Spuer eroplueden + traces_waiting: + one: Du hues momentan %{count} Spuer an der Waardeschleef. Wannechgelift waart, + bis e fäerdeg ass, fir d'Veraarbechtung net fir aner Benotzer ze blockéieren. + other: Du hues momentan %{count} Spueren an der Waardeschleef. Wannechgelift + waart, bis dës fäerdeg sinn, fir d'Veraarbechtung net fir aner Benotzer + ze blockéieren. edit: cancel: Ofbriechen + heading: Spuer %{name} beaarbechten visibility_help: wat heescht dat? show: + title: Spuer %{name} ukucken pending: AM SUSPENS filename: 'Numm vum Fichier:' download: eroflueden @@ -1159,25 +2106,42 @@ lb: description: 'Beschreiwung:' tags: 'Markéierungen:' none: Keen + edit_trace: Dës Spuer änneren + trace_not_found: Spuer net fonnt! visibility: 'Visibilitéit:' + confirm_delete: Dës Spuer läschen? trace_paging_nav: showing_page: Säit %{page} + older: Eeler Spueren + newer: Méi nei Spueren trace: count_points: one: 1 Punkt other: '%{count} Punkten' more: méi + trace_details: Detailer vun de Spueren uweisen view_map: Kaart weisen edit_map: Kaart änneren public: ËFFENTLECH private: PRIVAT + trackable: VERFOLLEGBAR by: vum in: an index: + public_traces: Ëffentlech GPS Spueren my_traces: Meng Spueren + public_traces_from: Ëffentlech GPS-Spuere vu(n) %{user} + description: Lescht GPS-Spuer-Uploads duerchsichen + empty_html: Nach keng GPS-Spueren existéierend. Lued + eng nei Spuer héich oder informéier dech op folgender Wikisäit + iwwer d'Opzeechne vun GPS-Spueren. all_traces: All Spuren traces_from: Ëffentlech Spuere vum %{user} remove_tag_filter: Tag-Filter ewechhuelen + destroy: + scheduled_for_deletion: Fir d'Läsche bestëmmt Spuer + georss: + title: OpenStreetMap-GPS-Spueren description: description_without_count: GPX-Fichier vum %{user} application: @@ -1189,12 +2153,17 @@ lb: authorize: allow_read_prefs: Är Benotzerastellunge liesen. allow_write_prefs: Är Benotzerastellungen änneren. + allow_write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen allow_write_api: d'Kaart änneren. + allow_read_gpx: Deng privat GPS-Spueren ausliesen + allow_write_gpx: GPS-Spueren héichlueden allow_write_notes: Notizen änneren. scopes: read_prefs: Benotzerastellunge liesen write_prefs: Benotzerastellungen änneren + write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen write_api: D'Kaart änneren + read_gpx: Privat GPS-Spuere liesen write_gpx: GPS-Tracks eroplueden write_notes: Notizzen änneren oauth_clients: @@ -1205,10 +2174,13 @@ lb: confirm: Sidd Dir sécher? index: title: Meng OAuth Detailer + my_tokens: Meng autoriséiert Applikatiounen revoke: Ophiewen! + my_apps: Meng Clients-Applikatiounen oauth: OAuth oauth2_applications: index: + title: Meng Clients-Applikatiounen oauth_2: OAuth 2 new: Nei Applikatioun registréieren name: Numm @@ -1246,14 +2218,20 @@ lb: title: Mellt Iech un no_auto_account_create: Leider kënne mir den Ament kee Benotzerkont automatesch fir Iech opmaachen. + contact_support_html: Wannechgelift kontaktéier de Support + fir e Benotzerkont ze kréien. – Mir wäerten deng Ufro méiglechst séier beaarbechten. about: header: Fäi a verännerbar email address: 'E-Mail-Adress:' confirm email address: 'E-Mail-Adress confirméieren:' display name: Numm weisen + display name description: Däin ëffentlech ugewisene Benotzernumm. E ka spéider + an den Astellunge geännert ginn. continue: Mellt Iech un terms: heading: Bedingungen + consider_pd: Zousätzlech zu den uewe genannte Konditioune betruechten ech meng + Bäiträg als gemengfräi (domaine public). consider_pd_why: wat ass dat? legale_select: 'Sicht wgl. d''Land eraus wou Dir wunnt:' legale_names: @@ -1268,16 +2246,21 @@ lb: deleted: geläscht show: my diary: Mäi Blog + new diary entry: Neie Blogantrag my edits: Meng Ännerungen + my traces: Meng Spueren my notes: Meng Notizen my messages: Meng Messagen my profile: Mäi Profil my settings: Meng Astellungen my comments: Meng Bemierkungen + my_preferences: Meng Benotzerastellungen + my_dashboard: Meng Iwwersiichtssäit blocks by me: vu Mir Gespaart send message: Message schécken diary: Blog edits: Ännerungen + traces: Spueren notes: Notizen op der Kaart remove as friend: Frënd ewechhuelen add as friend: Frënd derbäisetzen @@ -1285,12 +2268,6 @@ lb: email address: 'E-Mail-Adress:' status: 'Status:' description: Beschreiwung - edit_your_profile: Äre Profil änneren - my friends: Meng Frënn - no friends: Dir hutt nach keng Frënn derbäigesat. - km away: '%{count} km ewech' - m away: '%{count} m ewech' - nearby users: Aner Benotzer nobäi role: administrator: Dëse Benotzer ass en Administrateur moderator: Dëse Benotzer ass e Moderateur @@ -1301,6 +2278,7 @@ lb: administrator: Administrateur-Zougang ofhuelen moderator: Moderateursrechter ewechhuelen block_history: Aktiv Spären + moderator_history: Vergi Spären comments: Bemierkungen create_block: Dëse Benotzer spären activate_user: Dëse Benotzer aktivéieren @@ -1311,8 +2289,6 @@ lb: delete_user: Dëse Benotzer läschen confirm: Confirméieren report: Dëse Benotzer mellen - popup: - friend: Frënn account: title: Benotzerkont änneren my settings: Meng Astellungen @@ -1440,7 +2416,13 @@ lb: view_larger_map: Méi grouss Kaart weisen embed: report_problem: E Probleem mellen + key: + title: Legend + tooltip_disabled: D'Legend ass net fir dëse Niveau verfügbar map: + zoom: + in: Vergréisseren + out: Verklengeren locate: title: Weise wou ech sinn metersPopup: @@ -1452,14 +2434,28 @@ lb: base: standard: Standard cycle_map: Vëloskaart + transport_map: Verkéierskaart hot: Humanitär opnvkarte: Bus-Zuch-Kaart layers: + header: Kaartenniveauen + notes: Hiweiser/Feelermeldungen + data: Kaartendonnéeën gps: Ëffentlech GPS Spueren + overlays: Overlayë fir d’Feelersich aktivéieren + title: Niveauen + copyright: © OpenStreetMap-Matwierkend donate_link_text: + terms: Notzungskonditioune vun der Websäit + an der API site: edit_tooltip: Kaart änneren - edit_disabled_tooltip: Erazoomen fir d'Kaart z'änneren + edit_disabled_tooltip: Vergréissere fir d'Kaart z'änneren + createnote_tooltip: En Hiweis/Feeler zu de Kaartendonnéeë mellen + createnote_disabled_tooltip: Zum Erstelle vun Hiweiser muss vergréissert ginn + map_data_zoom_in_tooltip: Vergréisser d'Kaart, fir 'Donnéeën ze gesinn + queryfeature_tooltip: Objetsoffro + queryfeature_disabled_tooltip: Fir Objetsoffro vergréisseren changesets: show: comment: Bemierkung @@ -1475,12 +2471,15 @@ lb: resolve: Léisen reactivate: Reaktivéieren comment: Bemierkung + edit_help: Vergréisser a verschib d'Kaart un en Uert, deens du beaarbechte wëlls, + a klick hei directions: ascend: Vu kleng op grouss engines: fossgis_osrm_bike: Mam Vëlo (OSRM) fossgis_osrm_car: Auto (OSRM) fossgis_osrm_foot: Zu Fouss (OSRM) + graphhopper_car: Auto (GraphHopper) descend: Vu grouss op kleng directions: Richtungen distance: Distanz @@ -1529,6 +2528,7 @@ lb: directions_to: Heihinn add_note: Eng Notiz hei derbäisetzen show_address: Adress weisen + query_features: Objetsoffro centre_map: Kaart hei zentréieren redactions: show: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index a1d9bf0ca..7567e5cb0 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -396,6 +396,24 @@ lt: timeout: sorry: AtsipraÅ¡ome, jÅ«sų papraÅ¡ytų pakeitimo komentarų iÅ¡traukimas užtruko per ilgai. + dashboards: + contact: + km away: Nutolęs %{count}km + m away: nutolęs %{count}m + popup: + your location: JÅ«sų pozicija + nearby mapper: Å alia esantis žemėlapių kÅ«rėjas + friend: Draugas + show: + my friends: Mano draugai + no friends: JÅ«s dar nepridėjote nei vieno draugo. + nearby users: Kiti greta esantys naudotojai + no nearby users: Dar nėra jokių kitų naudotojų, kurie bÅ«tų pakviesti į žemėlapio + pildymus. + friends_changesets: draugų keitimai + friends_diaries: draugų dienoraščių įraÅ¡ai + nearby_changesets: greta esančių naudotojų keitimai + nearby_diaries: greta esančių naudotojų dienoraščių įraÅ¡ai diary_entries: new: title: Naujas dienoraščio įraÅ¡as @@ -2170,13 +2188,6 @@ lt: spam score: 'Å lamÅ¡to įvertis:' description: ApraÅ¡ymas user location: Naudotojo pozicija - my friends: Mano draugai - no friends: JÅ«s dar nepridėjote nei vieno draugo. - km away: Nutolęs %{count}km - m away: nutolęs %{count}m - nearby users: Kiti greta esantys naudotojai - no nearby users: Dar nėra jokių kitų naudotojų, kurie bÅ«tų pakviesti į žemėlapio - pildymus. role: administrator: Å is naudotojas yra administratorius moderator: Å is naudotojas yra moderatorius @@ -2197,15 +2208,7 @@ lt: unhide_user: Nebeslėpti Å¡io naudotojo delete_user: PaÅ¡alinti šį naudotoją confirm: Patvirtinti - friends_changesets: draugų keitimai - friends_diaries: draugų dienoraščių įraÅ¡ai - nearby_changesets: greta esančių naudotojų keitimai - nearby_diaries: greta esančių naudotojų dienoraščių įraÅ¡ai report: PraneÅ¡ti apie šį naudotoją - popup: - your location: JÅ«sų pozicija - nearby mapper: Å alia esantis žemėlapių kÅ«rėjas - friend: Draugas account: title: Keisti paskyrą my settings: Mano nustatymai diff --git a/config/locales/lv.yml b/config/locales/lv.yml index a3e659691..e7bc2853b 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -338,6 +338,23 @@ lv: index: title_all: Diskusija par izmaiņām OpenStreetMap title_particular: 'Diskusija par OpenStreetMap izmaiņām #%{changeset_id}' + dashboards: + contact: + km away: '%{count} km attālumā' + m away: '%{count} m attālumā' + popup: + your location: JÅ«su atraÅ¡anās vieta + nearby mapper: Kartētājs tuvējā apkārtnē + friend: Draugs + show: + my friends: Mani draugi + no friends: Tu vēl neesi pievienojis draugus. + nearby users: Citi tuvumā esoÅ¡i lietotāji + no nearby users: Nav citu lietotāju kas tuvumā kartētu. + friends_changesets: SkatÄ«t visas draugu izmaiņu kopas + friends_diaries: SkatÄ«t visus draugu dienasgrāmatu ierakstus + nearby_changesets: SkatÄ«t visas tuvējo lietotāju izmaiņu kopas + nearby_diaries: SkatÄ«t visus tuvējo lietotāju dienasgrāmatu ierakstus diary_entries: new: title: Jauns dienasgrāmatas ieraksts @@ -1967,12 +1984,6 @@ lv: spam score: 'Surogātpasta rādÄ«tājs:' description: Apraksts user location: Lietotāja atraÅ¡anās vieta - my friends: Mani draugi - no friends: Tu vēl neesi pievienojis draugus. - km away: '%{count} km attālumā' - m away: '%{count} m attālumā' - nearby users: Citi tuvumā esoÅ¡i lietotāji - no nearby users: Nav citu lietotāju kas tuvumā kartētu. role: administrator: Å is lietotājs ir administrators moderator: Å is lietotājs ir moderators @@ -1993,15 +2004,7 @@ lv: unhide_user: ParādÄ«t Å¡o dalÄ«bnieku delete_user: Dzēst Å¡o dalÄ«bnieku confirm: Apstiprināt - friends_changesets: SkatÄ«t visas draugu izmaiņu kopas - friends_diaries: SkatÄ«t visus draugu dienasgrāmatu ierakstus - nearby_changesets: SkatÄ«t visas tuvējo lietotāju izmaiņu kopas - nearby_diaries: SkatÄ«t visus tuvējo lietotāju dienasgrāmatu ierakstus report: Ziņot par Å¡o lietotāju - popup: - your location: JÅ«su atraÅ¡anās vieta - nearby mapper: Kartētājs tuvējā apkārtnē - friend: Draugs account: title: Rediģēt kontu my settings: Mani iestatÄ«jumi diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 878fed644..f1453e31e 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -435,6 +435,28 @@ mk: timeout: sorry: За жал, на списокот на измени што го побаравте му требаше предолго за да се преземе. + dashboards: + contact: + km away: '%{count} км од вас' + m away: '%{count} м од вас' + popup: + your location: Ваша местоположба + nearby mapper: Соседен картограф + friend: Пријател + show: + title: Моја управувачница + no_home_location_html: '%{edit_profile_link} и задајте ја вашата матична местоположба + за да гледате корисници во близина.' + edit_your_profile: Уредете си го профилот + my friends: Мои пријатели + no friends: Сè уште немате додадено пријатели. + nearby users: Други соседни корисници + no nearby users: Сè уште нема други корисници во вашата околина што признаваат + дека работат на карти. + friends_changesets: измени на пријателите + friends_diaries: дневнички ставки на пријателите + nearby_changesets: измени на соседните корисници + nearby_diaries: дневнички ставки на сосед. корисн. diary_entries: new: title: Нова дневничка ставка @@ -770,6 +792,7 @@ mk: window_construction: Изработка на прозорци winery: Винарија "yes": Занаетчиски дуќан + crossing: Премин emergency: access_point: Пристапна точка ambulance_station: Итна помош @@ -1025,6 +1048,7 @@ mk: hill: Рид hot_spring: Топол извор island: Остров + isthmus: Превлака land: Земја marsh: Бара moor: Пустара @@ -1039,10 +1063,13 @@ mk: sand: Песок scree: Сип scrub: Честак + shingle: Чакал spring: Извор stone: Камен strait: Проток tree: Дрво + tree_row: Дрворед + tundra: Тундра valley: Долина volcano: Вулкан water: Вода @@ -1439,9 +1466,10 @@ mk: intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди за слободна употреба под отворена лиценца. intro_2_create_account: Создајте корисничка сметка - hosting_partners_html: Вдомувањето е поддржано од %{ucl}, %{bytemark} и други - %{partners}. + hosting_partners_html: Вдомувањето е поддржано од %{ucl}, %{fastly}, %{bytemark} + и други %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: вдомителот „Bytemark“ partners_partners: партнери tou: Услови на употреба @@ -1944,10 +1972,9 @@ mk: Покраина Предарлска и Покраина Тирол (под CC-BY AT со исправки). contributors_au_html: |- - Австралија: Содржи податоци преземени од - Општествените картографски заводи на Австралија (PSMA) - ставени на располагање од австралиската држава под лиценцата - CC BY 4.0. + Австралија: Содржи податоци преземени од или разработени врз основа на + © Geoscape Австралија + ставени на располагање од австралиската држава под лиценцата Криејтив Комонс Наведи извор 4.0 Меѓународна (CC BY 4.0). contributors_ca_html: |- Canada: Содржи податоци од GeoBase®, GeoGratis (© Министерство за природни ресурси на Канада), CanVec (© Министерство за природни ресурси на Канада), and StatCan (Географско одделение, @@ -2599,6 +2626,7 @@ mk: my settings: Мои нагодувања my comments: Мои коментари my_preferences: Мои нагодувања + my_dashboard: Моја управувачница blocks on me: Добиени блокови blocks by me: Извршени болокови edit_profile: Уреди профил @@ -2620,16 +2648,6 @@ mk: spam score: 'Оцена за спам:' description: Опис user location: Местоположба на корисникот - no_home_location_html: '%{edit_profile_link} и задајте ја вашата матична местоположба - за да гледате корисници во близина.' - edit_your_profile: Уредете си го профилот - my friends: Мои пријатели - no friends: Сè уште немате додадено пријатели. - km away: '%{count} км од вас' - m away: '%{count} м од вас' - nearby users: Други соседни корисници - no nearby users: Сè уште нема други корисници во вашата околина што признаваат - дека работат на карти. role: administrator: Овој корисник е администратор moderator: Овој корисник е модератор @@ -2650,15 +2668,7 @@ mk: unhide_user: Покажи го корисников delete_user: Избриши го корисников confirm: Потврди - friends_changesets: измени на пријателите - friends_diaries: дневнички ставки на пријателите - nearby_changesets: измени на соседните корисници - nearby_diaries: дневнички ставки на сосед. корисн. report: Пријави го корисников - popup: - your location: Ваша местоположба - nearby mapper: Соседен картограф - friend: Пријател account: title: Уреди сметка my settings: Мои прилагодувања diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 5e89833b7..0f57e08de 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -180,6 +180,9 @@ mo: changesets: user: Утилизатор comment: Коментариу + dashboards: + show: + my friends: Приетений мей diary_entries: form: location: 'Ситуаре:' @@ -637,7 +640,6 @@ mo: my profile: Профилул меу my settings: Реглажеле меле my comments: Коментарииле меле - my friends: Приетений мей account: my settings: Реглажеле меле current email address: 'Адреса де поштэ електроникэ курентэ:' diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 575c07ea0..0aa9b4d09 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -254,6 +254,20 @@ mr: load_more: अधिक प्रभारण करा timeout: sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला. + dashboards: + contact: + km away: '%{count} कि.मी. दूर' + m away: '%{count} मी. दूर' + popup: + your location: आपले ठिकाण + nearby mapper: जवळपासचे नकाशाकार + friend: मित्र + show: + nearby users: जवळपासचे इतर सदस्य + friends_changesets: मित्रांचे बदलसंच + friends_diaries: मित्रांच्या अनुदिनीतील नोंदी + nearby_changesets: जवळपासच्या सदस्यांचे बदलसंच + nearby_diaries: जवळपासच्या सदस्यांच्या अनुदिनीतील नोंदी diary_entries: new: title: अनुदिनीत नवी नोंद @@ -1257,17 +1271,6 @@ mr: latest edit: 'नवीनतम संपादन %{ago}:' status: 'स्थिती:' description: वर्णन - km away: '%{count} कि.मी. दूर' - m away: '%{count} मी. दूर' - nearby users: जवळपासचे इतर सदस्य - friends_changesets: मित्रांचे बदलसंच - friends_diaries: मित्रांच्या अनुदिनीतील नोंदी - nearby_changesets: जवळपासच्या सदस्यांचे बदलसंच - nearby_diaries: जवळपासच्या सदस्यांच्या अनुदिनीतील नोंदी - popup: - your location: आपले ठिकाण - nearby mapper: जवळपासचे नकाशाकार - friend: मित्र account: title: खाते संपादा my settings: माझ्या मांडण्या diff --git a/config/locales/ms.yml b/config/locales/ms.yml index f6f1f5601..4d032f3dd 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -350,6 +350,23 @@ ms: comment: comment: 'Komen baru pada set prubahan #%{changeset_id} oleh %{author}' commented_at_by_html: Dikemaskini %{when} oleh %{user} + dashboards: + contact: + km away: '%{count}km jauhnya' + m away: '%{count}m jauhnya' + popup: + your location: Lokasi anda + nearby mapper: Pemeta berdekatan + friend: Kawan + show: + my friends: Kawan saya + no friends: Anda belum mencari kawan lagi. + nearby users: Pengguna lain yang berdekatan + no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan. + friends_changesets: set ubah kawan-kawan + friends_diaries: catatan diari kawan-kawan + nearby_changesets: set ubah pengguna berdekatan + nearby_diaries: catatan diari pengguna berdekatan diary_entries: new: title: Catatan Diari Baru @@ -1986,12 +2003,6 @@ ms: spam score: 'Markah Spam:' description: Keterangan user location: Lokasi pengguna - my friends: Kawan saya - no friends: Anda belum mencari kawan lagi. - km away: '%{count}km jauhnya' - m away: '%{count}m jauhnya' - nearby users: Pengguna lain yang berdekatan - no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan. role: administrator: Pengguna ini seorang pentadbir moderator: Pengguna ini seorang penyelia @@ -2012,14 +2023,6 @@ ms: unhide_user: tunjukkan pengguna ini delete_user: hapuskan pengguna ini confirm: Sahkan - friends_changesets: set ubah kawan-kawan - friends_diaries: catatan diari kawan-kawan - nearby_changesets: set ubah pengguna berdekatan - nearby_diaries: catatan diari pengguna berdekatan - popup: - your location: Lokasi anda - nearby mapper: Pemeta berdekatan - friend: Kawan account: title: Sunting akaun my settings: Tetapan saya diff --git a/config/locales/my.yml b/config/locales/my.yml index b28f965b8..019efac9a 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: Dr Lotus Black # Author: Ninjastrikers +# Author: ခွန်ပညာႏ(တောင်ႏကီꩻ) # Author: သူထွန်း --- my: @@ -19,7 +20,7 @@ my: create: ပို့ client_application: create: မှတ်ပုံတင်ရန် - update: ပြင်ဆင်ရန် + update: မွမ်းမံ trace: create: တင်ရန် update: ပြောင်းလဲမှုများကို သိမ်းရန် @@ -46,13 +47,13 @@ my: trace: user: အသုံးပြုသူ visible: မြင် - name: အမည် + name: ဖိုင်အမည် size: အရွယ်အစား latitude: လတ္တီကျု longitude: လောင်ဂျီကျု public: အများကြည့် description: ဖော်ပြချက် - visibility: 'မြင်နိုင်မှု:' + visibility: မြင်နိုင်မှု message: sender: ပေးပို့သူ title: အကြောင်းအရာ @@ -62,13 +63,13 @@ my: description: ဖော်ပြချက် user: email: အီးမေးလ် - new_email: 'အီးမေးလ်လိပ်စာ အသစ်:' + new_email: အီးမေးလ်လိပ်စာ အသစ် active: လက်ရှိအသုံးပြုနေသည် display_name: ဖော်ပြမည့်အမည် - description: ဖော်ပြချက် - home_lat: 'လတ္တီကျု:' - home_lon: 'လောင်ဂျီကျု:' - languages: ဘာသာစကားများ + description: ပရိုဖိုင် ဖော်ပြချက် + home_lat: လတ္တီကျု + home_lon: လောင်ဂျီကျု + languages: နှစ်သက်သော ဘာသာစကားများ pass_crypt: စကားဝှက် datetime: distance_in_words_ago: @@ -172,6 +173,13 @@ my: changeset_comments: comment: commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်' + dashboards: + contact: + km away: '%{count}ကီလိုမီတာ အကွာ' + m away: '%{count}မိုင် အကွာ' + popup: + your location: သင်၏ တည်နေရာ + friend: သူငယ်ချင်း diary_entries: form: location: တည်နေရာ @@ -516,6 +524,7 @@ my: user_diaries_tooltip: အသုံးပြုသူများ၏ နေ့စဉ်မှတ်တမ်းများကို ကြည့်ရန် edit_with: '%{editor} ဖြင့် ပြင်ဆင်ရန်' intro_header: OpenStreetMap မှ ကြိုဆိုပါ၏ + partners_fastly: မြန်မြန်ဆန်ဆန် tou: အသုံးပြုခြင်းဆိုင်ရာ သတ်မှတ်ချက်များ help: အ​ကူ​အ​ညီ​ about: အကြောင်း @@ -760,18 +769,13 @@ my: status: 'အခြေအနေ:' description: ဖော်ပြချက် user location: အသုံးပြုသူ တည်နေရာ - km away: '%{count}ကီလိုမီတာ အကွာ' - m away: '%{count}မိုင် အကွာ' role: administrator: ဤအသုံးပြုသူသည် အက်ဒမိန်တစ်ဦးဖြစ်သည် comments: မှတ်ချက်များ create_block: ဤအသုံးပြုသူကို ပိတ်ပင်ရန် confirm: အတည်ပြု - popup: - your location: သင်၏ တည်နေရာ - friend: သူငယ်ချင်း account: - current email address: 'လက်ရှိ အီးမေးလ်လိပ်စာ:' + current email address: လက်ရှိ အီးမေးလ်လိပ်စာ save changes button: ပြောင်းလဲမှုများကို သိမ်းရန် index: title: အသုံးပြုသူများ diff --git a/config/locales/nb.yml b/config/locales/nb.yml index bb8687c66..734022a12 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -435,6 +435,24 @@ nb: title_particular: 'OpenStreetMap-endringssettsdiskusjon #%{changeset_id}' timeout: sorry: Listen over endringssett du ba om tok for lang tid Ã¥ hente. + dashboards: + contact: + km away: '%{count}km unna' + m away: '%{count}m unna' + popup: + your location: Din posisjon + nearby mapper: Bruker i nærheten + friend: Venn + show: + my friends: Vennene mine + no friends: Du har ikke lagt til noen venner ennÃ¥. + nearby users: Andre nærliggende brukere + no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt + omrÃ¥de ennÃ¥. + friends_changesets: venners endringssett + friends_diaries: venners dagbokoppføringer + nearby_changesets: endringssett av brukere i nærheten + nearby_diaries: dagbokoppføringer av brukere i nærheten diary_entries: new: title: Ny dagboksoppføring @@ -2324,13 +2342,6 @@ nb: spam score: 'Spamresultat:' description: Beskrivelse user location: Brukerens posisjon - my friends: Vennene mine - no friends: Du har ikke lagt til noen venner ennÃ¥. - km away: '%{count}km unna' - m away: '%{count}m unna' - nearby users: Andre nærliggende brukere - no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt - omrÃ¥de ennÃ¥. role: administrator: Denne brukeren er en administrator moderator: Denne brukeren er en moderator @@ -2351,15 +2362,7 @@ nb: unhide_user: Slutt Ã¥ skjule denne brukeren delete_user: Slett denne brukeren confirm: Bekreft - friends_changesets: venners endringssett - friends_diaries: venners dagbokoppføringer - nearby_changesets: endringssett av brukere i nærheten - nearby_diaries: dagbokoppføringer av brukere i nærheten report: Rapporter denne brukeren - popup: - your location: Din posisjon - nearby mapper: Bruker i nærheten - friend: Venn account: title: Rediger konto my settings: Mine innstillinger diff --git a/config/locales/nds.yml b/config/locales/nds.yml index fe05d8cd1..812c30e35 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -91,6 +91,16 @@ nds: user: Bruker comment: Kommentar area: Rebeed + dashboards: + contact: + km away: '%{count} km weg' + m away: '%{count} m weg' + popup: + your location: Dien Standoort + nearby mapper: Koortenmaker in de Neegd + friend: Fründ + show: + nearby users: Annere Brukers in de Neegd diary_entries: new: title: Ne’en Dagbook-Indrag @@ -589,13 +599,6 @@ nds: mapper since: 'Koortenmaker sied:' email address: 'E-Mail-Adress:' description: Beschrieven - km away: '%{count} km weg' - m away: '%{count} m weg' - nearby users: Annere Brukers in de Neegd - popup: - your location: Dien Standoort - nearby mapper: Koortenmaker in de Neegd - friend: Fründ account: title: Brukerkonto ännern public editing: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index a291e67a2..e2303cc67 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -301,6 +301,17 @@ ne: index: title_all: OpenStreetMap परिवर्वतन सूची छलफल title_particular: 'OpenStreetMap परिवर्तन सूची #%{changeset_id} छलफल' + dashboards: + contact: + km away: '%{count}किमि टाढा' + m away: '%{count} मि टाढा' + popup: + your location: तपाईँको स्थान + nearby mapper: नजिकको मानचित्रकर्मी + friend: साथी + show: + my friends: मेरा साथीहरू + no friends: तपाईं कुनै साथीहरूलाई जोड्नु भएको छैन diary_entries: new: title: नयाँ दैनिकी प्रविष्टी @@ -1144,18 +1155,10 @@ ne: add as friend: साथी जोड्नुहोस् status: 'स्थिति:' description: वर्णन - my friends: मेरा साथीहरू - no friends: तपाईं कुनै साथीहरूलाई जोड्नु भएको छैन - km away: '%{count}किमि टाढा' - m away: '%{count} मि टाढा' role: administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ comments: टिप्पणी confirm: निश्चित गर्ने - popup: - your location: तपाईँको स्थान - nearby mapper: नजिकको मानचित्रकर्मी - friend: साथी account: my settings: मेरो अनुकुलताहरु openid: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 46ae22b0b..c570531e8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -335,7 +335,7 @@ nl: comment: Reacties (%{count}) hidden_commented_by_html: Verborgen reactie van %{user} %{when} commented_by_html: Reactie van %{user} %{when} - changesetxml: Changeset-XML + changesetxml: Wijzigingenset-XML osmchangexml: osmChange-XML feed: title: Wijzigingenset %{id} @@ -486,6 +486,28 @@ nl: timeout: sorry: Sorry, het oproepen van de lijst met wijzigingensets die u hebt opgevraagd duurde te lang. + dashboards: + contact: + km away: '%{count} km verwijderd' + m away: '%{count} m verwijderd' + popup: + your location: Uw locatie + nearby mapper: Dichtbijzijnde mapper + friend: Vriend + show: + title: Mijn Dashboard + no_home_location_html: '%{edit_profile_link} en stel uw thuislocatie in om gebruikers + in de buurt te zien.' + edit_your_profile: Pas uw profiel aan + my friends: Mijn vrienden + no friends: U hebt nog geen vrienden toegevoegd. + nearby users: Andere dichtbijzijnde gebruikers + no nearby users: Er zijn geen andere gebruikers die hebben opgegeven in de buurt + te mappen. + friends_changesets: wijzigingensets van vrienden + friends_diaries: dagboekberichten van vrienden + nearby_changesets: wijzigingensets van gebruikers in de buurt + nearby_diaries: dagboekberichten van gebruikers in de buurt diary_entries: new: title: Nieuw dagboekbericht @@ -779,7 +801,7 @@ nl: roof: Dak ruins: Vervallen gebouw school: Schoolgebouw - semidetached_house: Halfopen woning + semidetached_house: Twee-onder-een-kap service: Nutsgebouw shed: Schuurtje stable: Stal @@ -791,7 +813,7 @@ nl: warehouse: Pakhuis "yes": Gebouw club: - scout: Scouts + scout: Scouting sport: Sportclub "yes": Club craft: @@ -820,6 +842,7 @@ nl: window_construction: Raamconstructie winery: Wijnboer "yes": Ambachtswinkel + crossing: Oversteekplaats emergency: access_point: Rendez-vouspunt voor reddingsdiensten ambulance_station: Ambulancepost @@ -1075,6 +1098,7 @@ nl: hill: Heuvel hot_spring: Warmwaterbron island: Eiland + isthmus: Landengte land: Land marsh: Moeras moor: Veen @@ -1089,10 +1113,13 @@ nl: sand: Zand scree: Puin scrub: Struikgewas + shingle: Kiezelstrand spring: Bron stone: Steen strait: Zeeëngte tree: Boom + tree_row: Bomenrij + tundra: Toendra valley: Vallei volcano: Vulkaan water: Water @@ -1489,9 +1516,10 @@ nl: intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals u en vrij te gebruiken onder een open licentie. intro_2_create_account: Maak een gebruiker aan - hosting_partners_html: Hosting wordt ondersteund door %{ucl}, %{bytemark}, en - andere %{partners}. + hosting_partners_html: Hosting wordt ondersteund door %{ucl}, %{fastly}, %{bytemark}, + en andere %{partners}. partners_ucl: het UCL VR Centre + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partners tou: Gebruiksvoorwaarden @@ -1892,9 +1920,9 @@ nl: copyright_html: ©OpenStreetMap-
    bijdragers used_by_html: '%{name} levert kaartgegevens aan duizenden websites, mobiele apps en hardware-apparaten' - lede_text: OpenStreetMap wordt gemaakt door een gemeenschap van kaartenmakers - die gegevens over wegen, paden, cafés, treinstations en nog veel meer, over - de hele wereld bijdragen en onderhouden. + lede_text: OpenStreetMap wordt gemaakt door een gemeenschap van mappers die + gegevens over wegen, paden, cafés, treinstations en nog veel meer, over de + hele wereld bijdragen en onderhouden. local_knowledge_title: Lokale kennis local_knowledge_html: OpenStreetMap legt de nadruk op lokale kennis. Bijdragers gebruiken luchtfoto's, gps-apparaten en low-tech veldkaarten om te controleren @@ -1959,7 +1987,7 @@ nl: credit_title_html: Hoe OpenStreetMap te vermelden credit_1_html: |- We vereisen dat u het volgende vermeldt bij gebruik: - “© OpenStreetMap-auteurs”. + “© OpenStreetMap-bijdragers”. credit_2_1_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn onder de Open\nDatabase License, en als u onze kaarttegels gebruikt, dat de cartografie\nde licentie CC BY-SA heeft. U kunt dit doen door te verwijzen @@ -1970,11 +1998,10 @@ nl: naar openstreetmap.org (mogelijk door de naam \"OpenStreetMap\" naar dit webadres uit te breiden), naar opendatacommons.org en naar, indien van toepassing, creativecommons.org." - credit_3_1_html: "De kaarttegels in de “standaard stijl” op www.openstreetmap.org + credit_3_1_html: De kaarttegels in de “standaard stijl” op www.openstreetmap.org zijn een geproduceerd werk van de OpenStreetMap Foundation met OpenStreetMap-gegevens - onder de Open Database Licentie. Als u deze tegels gebruikt, gebruik dan - de volgende omschrijving: \n“Basiskaart en gegevens van OpenStreetMap - en OpenStreetMap Foundation”" + onder de Open Database Licentie. Wanneer deze kaartstijl wordt gebruikt + is dezelfde naamsvermelding nodig als voor de kaart-gegevens. credit_4_html: |- Voor een doorbladerbare, digitale kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden. Bijvoorbeeld: @@ -2003,8 +2030,10 @@ nl: CC BY), Land Vorarlberg en Land Tirol (onder CC BY-AT met aanvullingen). contributors_au_html: |- - Australië: Bevat wijkgegevens - gebaseerd op gegevens van het Australian Bureau of Statistics. + Australië: Bevat of is ontwikkeld met behulp van administratieve grenzen © + Geoscape Australië + vrijgegeven door het Gemenebest van Australië onder de licentie + Creative Commons Naamsvermelding 4.0 Internationaal (CC BY 4.0). contributors_ca_html: |- Canada: Bevat gegevens van GeoBase®, GeoGratis (© Department of Natural @@ -2145,7 +2174,7 @@ nl: instructions_html: |- Klik op of hetzelfde pictogram op de kaartweergave. Er wordt een markering toegevoegd aan de kaart die u kunt verplaatsen - door het te verslepen. Voeg uw bericht toe, klik op "opslaan" en andere kaartenmakers zullen uw melding nagaan. + door het te verslepen. Voeg uw bericht toe, klik op "opslaan" en andere mappers zullen uw melding nagaan. other_concerns: title: Andere aangelegenheden explanation_html: |- @@ -2424,7 +2453,7 @@ nl: upload_trace: Traject uploaden all_traces: Alle trajecten traces_from: Openbare trajecten van %{user} - remove_tag_filter: Tagfilter verwijderen + remove_tag_filter: Labelfilter verwijderen destroy: scheduled_for_deletion: Traject staat op de lijst voor verwijdering make_public: @@ -2665,6 +2694,7 @@ nl: my settings: Instellingen my comments: Mijn reacties my_preferences: Mijn voorkeuren + my_dashboard: Mijn Dashboard blocks on me: Blokkades voor u blocks by me: Blokkades door u edit_profile: Profiel wijzigen @@ -2686,16 +2716,6 @@ nl: spam score: 'Spamscore:' description: Beschrijving user location: Gebruikerslocatie - no_home_location_html: '%{edit_profile_link} en stel uw thuislocatie in om gebruikers - in de buurt te zien.' - edit_your_profile: Pas uw profiel aan - my friends: Mijn vrienden - no friends: U hebt nog geen vrienden toegevoegd. - km away: '%{count} km verwijderd' - m away: '%{count} m verwijderd' - nearby users: Andere dichtbijzijnde gebruikers - no nearby users: Er zijn geen andere gebruikers die hebben opgegeven in de buurt - te mappen. role: administrator: Deze gebruiker is beheerder moderator: Deze gebruiker is moderator @@ -2716,15 +2736,7 @@ nl: unhide_user: Gebruiker zichtbaar maken delete_user: Deze gebruiker verwijderen confirm: Bevestigen - friends_changesets: wijzigingensets van vrienden - friends_diaries: dagboekberichten van vrienden - nearby_changesets: wijzigingensets van gebruikers in de buurt - nearby_diaries: dagboekberichten van gebruikers in de buurt report: Rapporteer deze Gebruiker - popup: - your location: Uw locatie - nearby mapper: Dichtbijzijnde mapper - friend: Vriend account: title: Account bewerken my settings: Mijn instellingen @@ -2987,7 +2999,7 @@ nl: cyclosm: CyclOSM cycle_map: Fietskaart transport_map: Transportkaart - hot: Humanitarian + hot: Humanitair opnvkarte: ÖPNVKarte layers: header: Kaartlagen @@ -2996,7 +3008,7 @@ nl: gps: Openbare gps-trajecten overlays: Overlays inschakelen om fouten in de kaart te helpen identificeren title: Lagen - copyright: © bijdragers OpenStreetMap + copyright: © OpenStreetMap-bijdragers donate_link_text: terms: Website en API-voorwaarden cyclosm: Rasterkaart in de stijl van CyclOSM @@ -3026,7 +3038,7 @@ nl: unhide_comment: zichtbaar maken notes: new: - intro: Een fout gezien of ontbreekt er iets? Laat het andere kaartmakers weten + intro: Een fout gezien of ontbreekt er iets? Laat het andere mappers weten zodat wij het kunnen oplossen. Verplaats de markering naar de correcte positie en beschrijf het probleem. advice: Deze opmerking is openbaar en kan gebruikt worden om de kaart bij diff --git a/config/locales/nn.yml b/config/locales/nn.yml index a84c9c769..6b3a83c18 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -355,6 +355,24 @@ nn: changeset_comments: comment: commented_at_by_html: Oppdatert for %{when} sidan av %{user} + dashboards: + contact: + km away: '%{count}km unna' + m away: '%{count}m unna' + popup: + your location: Posisjonen din + nearby mapper: Brukarar i nærleiken + friend: Ven + show: + my friends: Mine vener + no friends: Du har ikkje lagt til nokon venner enno. + nearby users: Andre brukarar i nærleiken + no nearby users: Det er ingen andre brukarar som innrømmer kartlegging i omrÃ¥det + ditt enno. + friends_changesets: endringssett av vener + friends_diaries: dagbokoppføringar av vener + nearby_changesets: endringssett av naboar + nearby_diaries: dagbokoppføringar av naboar diary_entries: new: title: Ny dagbokoppføring @@ -1774,13 +1792,6 @@ nn: spam score: 'Spamresultat:' description: Skildring user location: Posisjonen til brukaren - my friends: Mine vener - no friends: Du har ikkje lagt til nokon venner enno. - km away: '%{count}km unna' - m away: '%{count}m unna' - nearby users: Andre brukarar i nærleiken - no nearby users: Det er ingen andre brukarar som innrømmer kartlegging i omrÃ¥det - ditt enno. role: administrator: Denne brukaren er ein administrator moderator: Denne brukaren er ein moderator @@ -1801,15 +1812,7 @@ nn: unhide_user: Gøym ikkje lenger denne brukaren delete_user: Slett denne brukaren confirm: Stadfest - friends_changesets: endringssett av vener - friends_diaries: dagbokoppføringar av vener - nearby_changesets: endringssett av naboar - nearby_diaries: dagbokoppføringar av naboar report: Rapporter denne brukaren - popup: - your location: Posisjonen din - nearby mapper: Brukarar i nærleiken - friend: Ven account: title: Rediger konto my settings: Innstellingane mine diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index b47522e18..3c7d55248 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -1344,6 +1344,8 @@ nqo: need_to_see_terms: ߌ ߟߊ߫ API ߟߊߛߐ߬ߘߐ߲߬ߠߌ߲ ߟߊߘߎ߲ߣߍ߲߫ ߦߋ߫ ߥߊ߯ߕߌߣߍ߲߫ ߞߘߐ߫. ߌ ߜߊ߲߬ߞߎ߲߫ ߓߟߐߟߐ ߢߐ߲߯ߕߍߞߣߍ ߟߊ߫ ߞߊ߬ ߓߟߏߡߊߜߍ߲ߠߌ߲ ߛߙߊߕߌ ߟߎ߬ ߦߋ߫. ߌ ߡߊ߬ߞߏ߬ ߕߍ߫ ߘߌ߬ߢߍ ߟߵߊ߬ߟߎ߫ ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫. + settings_menu: + account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫ oauth: authorize: title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 30765f3ee..d596ccdfa 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -383,6 +383,25 @@ oc: timeout: sorry: O planhèm, la lista deis grops de modificacions qu'avètz demandada met tròp de temps per èsser recuperada. + dashboards: + contact: + km away: '%{count} km' + m away: distant de %{count} m + popup: + your location: Vòstre emplaçament + nearby mapper: Mapaire dins los environs + friend: Amic + show: + my friends: los mens amics + no friends: Avètz pas encara apondut cap d'amic + nearby users: Autres utilizaires a proximitat + no nearby users: Cap d'utilizaire a pas encara senhalat que cartografiava a + proximitat. + friends_changesets: Percórrer totes los gropes de modificacions dels amics + friends_diaries: Entradas de jornal dels amics + nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires + a proximitat + nearby_diaries: Entradas de jornal dels utilizaires a proximitat diary_entries: new: title: Novèla entrada de jornau @@ -2050,13 +2069,6 @@ oc: spam score: 'Nòta pel spam :' description: Descripcion user location: Emplaçament de l'utilizaire - my friends: los mens amics - no friends: Avètz pas encara apondut cap d'amic - km away: '%{count} km' - m away: distant de %{count} m - nearby users: Autres utilizaires a proximitat - no nearby users: Cap d'utilizaire a pas encara senhalat que cartografiava a - proximitat. role: administrator: Aqueste utilizaire es un administrator moderator: Aqueste utilizaire es un moderator @@ -2077,16 +2089,7 @@ oc: unhide_user: Reafichar aqueste utilizaire delete_user: Suprimir aqueste utilizaire confirm: Confirmar - friends_changesets: Percórrer totes los gropes de modificacions dels amics - friends_diaries: Entradas de jornal dels amics - nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires - a proximitat - nearby_diaries: Entradas de jornal dels utilizaires a proximitat report: Denonciatz aquel usatgièr - popup: - your location: Vòstre emplaçament - nearby mapper: Mapaire dins los environs - friend: Amic account: title: Modificar lo compte my settings: Meis opcions diff --git a/config/locales/pa.yml b/config/locales/pa.yml index d9af330f0..5ce9af455 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -211,6 +211,16 @@ pa: index: title: ਤਬਦੀਲੀਆਂ load_more: ਹੋਰ ਲੋਡ ਕਰੋ + dashboards: + contact: + km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ' + m away: '%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ' + popup: + your location: ਤੁਹਾਡੀ ਸਥਿਤੀ + friend: ਦੋਸਤ + show: + no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ। + nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ diary_entries: form: location: 'ਸਥਿਤੀ:' @@ -1085,10 +1095,6 @@ pa: status: 'ਦਰਜਾ:' description: ਵੇਰਵਾ user location: ਵਰਤੋਂਕਾਰ ਦੀ ਸਥਿਤੀ - no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ। - km away: '%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ' - m away: '%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ' - nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ role: administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਸ਼ਾਸਕ ਹੈ। moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ। @@ -1104,9 +1110,6 @@ pa: unhide_user: ਇਸ ਵਰਤੋਂਕਾਰ ਦਾ ਉਹਲਾ ਹਟਾਉ delete_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਉ confirm: ਤਸਦੀਕ ਕਰੋ - popup: - your location: ਤੁਹਾਡੀ ਸਥਿਤੀ - friend: ਦੋਸਤ account: title: ਖਾਤਾ ਸੋਧੋ my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 4096ed11c..d1a7f37ef 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -519,6 +519,27 @@ pl: title_particular: 'Dyskusja na temat zestawu zmian #%{changeset_id}' timeout: sorry: Niestety, pobieranie listy żądanych zestawów zmian trwało zbyt długo. + dashboards: + contact: + km away: '%{count} km stąd' + m away: '%{count} m stąd' + popup: + your location: Twoje położenie + nearby mapper: Mapujący z okolicy + friend: Znajomy + show: + no_home_location_html: '%{edit_profile_link} i podaj swoją lokalizację, aby + zobaczyć użytkowników w pobliżu.' + edit_your_profile: Edytuj swój profil + my friends: Moi znajomi + no friends: Nie dodano jeszcze żadnych znajomych. + nearby users: Najbliżsi użytkownicy + no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania + w tej okolicy. + friends_changesets: zestawy zmian znajomych + friends_diaries: wpisy w dziennikach znajomych + nearby_changesets: pobliskie zestawy zmian + nearby_diaries: pobliskie wpisy w dziennikach diary_entries: new: title: Nowy wpis do dziennika @@ -855,6 +876,7 @@ pl: window_construction: Montaż okien winery: Winiarnia "yes": Warsztat + crossing: Przejście emergency: access_point: Punkt dla służb ratowniczych ambulance_station: Stacja pogotowia ratunkowego @@ -1110,6 +1132,7 @@ pl: hill: Wzgórze hot_spring: Źródło termalne island: Wyspa + isthmus: Przesmyk land: Ląd marsh: Bagno moor: Wrzosowisko @@ -1124,10 +1147,13 @@ pl: sand: Piaski scree: Rumowisko skalne scrub: Zarośla + shingle: Plaża kamienista spring: Źródło wodne stone: Głaz strait: Cieśnina tree: Drzewo + tree_row: Rząd drzew + tundra: Tundra valley: Dolina volcano: Wulkan water: Woda @@ -1530,8 +1556,10 @@ pl: intro_text: OpenStreetMap to mapa świata, stworzona przez ludzi, takich jak ty, i z możliwością użycia pod otwartą licencją. intro_2_create_account: Utwórz konto - hosting_partners_html: Hosting obsługuje %{ucl}, %{bytemark}, a także %{partners}. + hosting_partners_html: Hosting obsługuje %{ucl}, %{fastly}, %{bytemark}, a także + %{partners}. partners_ucl: University College London + partners_fastly: Fastly partners_bytemark: Hosting Bytemark partners_partners: partnerzy tou: Warunki użytkowania @@ -2025,9 +2053,10 @@ pl: Land Vorarlberg oraz Land Tyrol (na licencji CC-BY AT z późniejszymi zmianami). contributors_au_html: 'Australia: Zawiera dane oparte na - PSMA - Australia Limited, licencjonowane przez Związek Australijski na podstawie - licencji CC BY 4.0.' + Geoscape + Australia, licencjonowane przez Związek Australijski na podstawie licencji + Creative Commons + Attribution 4.0 International licence (CC BY 4.0).' contributors_ca_html: 'Kanada: Zawiera dane z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) i StatCan (Geography Division, Statistics @@ -2218,7 +2247,7 @@ pl: desktop_html: Nadal można używać edytora Potlatch ściągając aplikację pod Windows lub macOS. id_html: Możesz także ustawić iD jako swój domyślny edytor w przeglądarce. Zmień swoje ustawienia tutaj. + href="%{settings_url}">Zmień swoje preferencje tutaj. sidebar: search_results: Wyniki wyszukiwania close: Zamknij @@ -2476,6 +2505,7 @@ pl: przez stronę WWW, aby zapoznać się z Warunkami Uczestnictwa. Nie masz obowiązku ich akceptować, ale musisz się z nimi zapoznać. settings_menu: + account_settings: Ustawienia konta oauth1_settings: Ustawienia OAuth 1 oauth2_applications: Aplikacje OAuth 2 oauth2_authorizations: Autoryzacje OAuth 2 @@ -2702,13 +2732,6 @@ pl: spam score: 'Punktacja spamu:' description: Opis user location: Położenie użytkownika - my friends: Moi znajomi - no friends: Nie dodano jeszcze żadnych znajomych. - km away: '%{count} km stąd' - m away: '%{count} m stąd' - nearby users: Najbliżsi użytkownicy - no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania - w tej okolicy. role: administrator: Ten użytkownik jest administratorem moderator: Ten użytkownik jest moderatorem @@ -2729,15 +2752,7 @@ pl: unhide_user: Odkryj tego użytkownika delete_user: Usuń tego użytkownika confirm: Potwierdź - friends_changesets: zestawy zmian znajomych - friends_diaries: wpisy w dziennikach znajomych - nearby_changesets: pobliskie zestawy zmian - nearby_diaries: pobliskie wpisy w dziennikach report: zgłoś tego użytkownika - popup: - your location: Twoje położenie - nearby mapper: Mapujący z okolicy - friend: Znajomy account: title: Zmiana ustawień konta my settings: Ustawienia diff --git a/config/locales/ps.yml b/config/locales/ps.yml index fa452a564..db445f17e 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -96,6 +96,9 @@ ps: user: کارن comment: تبصره area: سيمه + dashboards: + popup: + friend: ملگری diary_entries: form: location: 'ځای:' @@ -413,8 +416,6 @@ ps: unhide_user: دا کارن ښکاره کول delete_user: دا کارن ړنگول confirm: تاييد - popup: - friend: ملگری account: my settings: زما امستنې openid: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index bd60b878d..ade21556f 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -479,6 +479,27 @@ pt-BR: timeout: sorry: Desculpe, a lista de comentários do conjunto de alterações que você solicitou demorou muito para ser recuperada. + dashboards: + contact: + km away: '%{count}km de distância' + m away: '%{count}m de distância' + popup: + your location: Sua localização + nearby mapper: Mapeador próximo + friend: Amigo + show: + title: Meu painel + no_home_location_html: '%{edit_profile_link} e defina seu local de origem para + ver usuários próximos.' + edit_your_profile: Editar seu perfil + my friends: Meus amigos + no friends: Você ainda não adicionou amigos. + nearby users: Outros usuários próximos + no nearby users: Ainda não há outros usuários mapeando por perto. + friends_changesets: conjuntos de alterações dos amigos + friends_diaries: publicações no diário dos amigos + nearby_changesets: conjuntos de alterações de usuários próximos + nearby_diaries: publicações no diário dos usuários próximos diary_entries: new: title: Nova publicação no diário @@ -815,6 +836,7 @@ pt-BR: window_construction: Construção de janela winery: Adega "yes": Loja de Artesanato + crossing: Cruzando emergency: access_point: Ponto de acesso ambulance_station: Posto de Ambulâncias @@ -1070,6 +1092,7 @@ pt-BR: hill: Colina hot_spring: Primavera quente island: Ilha + isthmus: Istmo land: Ilha marsh: Pântano moor: Brejo @@ -1084,10 +1107,13 @@ pt-BR: sand: Areia scree: Pedregulhos scrub: Matagal + shingle: Telha spring: Nascente stone: Pedra strait: Estreito tree: Árvore + tree_row: Linha de árvores + tundra: Tundra valley: Vale volcano: Vulcão water: Água @@ -1488,9 +1514,10 @@ pt-BR: intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e de uso livre sob uma licença aberta. intro_2_create_account: Criar uma conta de usuário - hosting_partners_html: A hospedagem é suportada por %{ucl}, %{bytemark} e outros - %{partners}. + hosting_partners_html: O hospedagem é suportada por %{ucl}, %{fastly}, %{bytemark} + e outros %{partners}. partners_ucl: UCL + partners_fastly: Rapidamente partners_bytemark: Hospedagem Bytemark partners_partners: parceiros tou: Termo de uso @@ -1996,9 +2023,11 @@ pt-BR: BY), Land Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas).' - contributors_au_html: |- - Austrália: Contém dados do subúrbio baseado - nos dados do Australian Bureau of Statistics. + contributors_au_html: "Austrália: contém ou foi desenvolvido + usando fronteiras administrativas © \nPSMA + Australia Limited\nlicenciada pela Commonwealth of Australia sob uma + licença\nCreative + Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)." contributors_ca_html: "Canadá: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão @@ -2653,6 +2682,7 @@ pt-BR: my settings: Minhas configurações my comments: Meus comentários my_preferences: Minhas preferências + my_dashboard: Meu painel blocks on me: Bloqueios sobre mim blocks by me: Bloqueios por mim edit_profile: Editar perfil @@ -2674,15 +2704,6 @@ pt-BR: spam score: 'Contagem de Spam:' description: Descrição user location: Local do usuário - no_home_location_html: '%{edit_profile_link} e defina seu local de origem para - ver usuários próximos.' - edit_your_profile: Editar seu perfil - my friends: Meus amigos - no friends: Você ainda não adicionou amigos. - km away: '%{count}km de distância' - m away: '%{count}m de distância' - nearby users: Outros usuários próximos - no nearby users: Ainda não há outros usuários mapeando por perto. role: administrator: Este usuário é um administrador moderator: Este usuário é um moderador @@ -2703,15 +2724,7 @@ pt-BR: unhide_user: Exibir esse usuário delete_user: Excluir este usuário confirm: Confirmar - friends_changesets: conjuntos de alterações dos amigos - friends_diaries: publicações no diário dos amigos - nearby_changesets: conjuntos de alterações de usuários próximos - nearby_diaries: publicações no diário dos usuários próximos report: Denunciar este usuário - popup: - your location: Sua localização - nearby mapper: Mapeador próximo - friend: Amigo account: title: Editar conta my settings: Minhas configurações diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 4651907c3..193a29fbe 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -242,6 +242,9 @@ pt-PT: x_years: one: há 1 ano other: há %{count} anos + printable_name: + with_version: '%{id}, v%{version}' + with_name_html: '%{name} (%{id})' editor: default: Padrão (atualmente %{name}) id: @@ -471,6 +474,28 @@ pt-PT: timeout: sorry: Lamentamos, a lista de comentários sobre conjuntos de alterações que pediste demorou demasiado tempo a ser obtida. + dashboards: + contact: + km away: '%{count} km de distância' + m away: '%{count} m de distância' + popup: + your location: A tua localização + nearby mapper: Mapeador próximo de ti + friend: Amigo + show: + title: Painel de Controlo + no_home_location_html: '%{edit_profile_link} e define a localização da tua morada + para veres utilizadores próximos.' + edit_your_profile: Editar perfil + my friends: Os meus amigos + no friends: Ainda não adicionaste nenhum amigo. + nearby users: Outros mapeadores nas redondezas + no nearby users: Não há outros mapeadores que admitam estar a editar o mapa + nas redondezas. + friends_changesets: conjuntos de alterações dos amigos + friends_diaries: publicações nos diários dos amigos + nearby_changesets: conjuntos de alterações de utilizadores próximos + nearby_diaries: publicações no diário de utilizadores próximos diary_entries: new: title: Criar nova publicação no diário @@ -807,6 +832,7 @@ pt-PT: window_construction: Caixilharia winery: Adega "yes": Loja de artesanato + crossing: Passadeira emergency: access_point: Ponto de acesso ambulance_station: Estação de ambulâncias @@ -1062,6 +1088,7 @@ pt-PT: hill: Colina hot_spring: Nascente geotérmica island: Ilha + isthmus: Istmo land: Terra marsh: Pântano moor: Paul @@ -1076,10 +1103,13 @@ pt-PT: sand: Areia scree: Detritos de talude scrub: Matagal + shingle: Seixos spring: Nascente stone: Pedra strait: Estreito tree: Árvore + tree_row: Linha de árvores + tundra: Tundra valley: Vale volcano: Vulcão water: Água @@ -1477,9 +1507,10 @@ pt-PT: intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como tu e de uso livre sob uma licença aberta. intro_2_create_account: Cria uma conta de utilizador - hosting_partners_html: O alojamento é suportado por %{ucl}, %{bytemark} e outros - %{partners}. + hosting_partners_html: O alojamento é suportado por %{ucl}, %{fastly}, %{bytemark} + e outros %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: parceiros tou: Condições de utilização @@ -1981,11 +2012,11 @@ pt-PT: BY), Land Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas).' - contributors_au_html: |- - Austrália: contém dados provenientes da - PSMA Australia Limited - licenciada pela Commonwealth of Australia sob uma licença - CC BY 4.0. + contributors_au_html: "Austrália: contém ou foi desenvolvido + usando fronteiras administrativas © \nPSMA + Australia Limited\nlicenciada pela Commonwealth of Australia sob uma + licença\nCreative + Commons Attribuição 4.0 Licença Internacional (CC BY 4.0)." contributors_ca_html: 'Canadá: contém dados de GeoBase®, GeoGratis (© Departmento de Recursos Naturais do Canadá), CanVec (© Departmento de Recursos Naturais do Canadá) e StatCan (Divisão de Geografia, @@ -2174,7 +2205,7 @@ pt-PT: a aplicação desktop para Mac e Windows. id_html: Alternativamente, podes definir o teu editor padrão para o iD, que é executado no teu navegador de Internet tal como o Potlatch fazia. Altera - as tuas definições de utilizador aqui. + as tuas definições aqui. sidebar: search_results: Resultados da Pesquisa close: Fechar @@ -2342,6 +2373,7 @@ pt-PT: title: A editar a rota %{name} heading: A editar a rota %{name} visibility_help: o que significa isto? + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces update: updated: Rota atualizada trace_optionals: @@ -2431,6 +2463,7 @@ pt-PT: inicia sessão na página web do OpenStreetMap para veres os Termos de Contribuidor. Não precisas de aceitar os termos, mas tens de os ver. settings_menu: + account_settings: Definições oauth1_settings: Definições OAuth 1 oauth2_applications: Aplicações OAuth 2 oauth2_authorizations: Autorizações OAuth 2 @@ -2640,6 +2673,7 @@ pt-PT: my settings: Definições my comments: Comentários my_preferences: Preferências + my_dashboard: Painel de Controlo blocks on me: Quem me bloqueou blocks by me: Os meus bloqueios edit_profile: Editar Perfil @@ -2661,13 +2695,6 @@ pt-PT: spam score: 'Contagem de Spam:' description: Descrição user location: Localização do utilizador - my friends: Os meus amigos - no friends: Ainda não adicionaste nenhum amigo. - km away: '%{count} km de distância' - m away: '%{count} m de distância' - nearby users: Outros mapeadores nas redondezas - no nearby users: Não há outros mapeadores que admitam estar a editar o mapa - nas redondezas. role: administrator: Este utilizador é um administrador moderator: Este utilizador é um moderador @@ -2688,15 +2715,7 @@ pt-PT: unhide_user: Mostrar este utilizador delete_user: Eliminar este utilizador confirm: Confirmar - friends_changesets: conjuntos de alterações dos amigos - friends_diaries: publicações nos diários dos amigos - nearby_changesets: conjuntos de alterações de utilizadores próximos - nearby_diaries: publicações no diário de utilizadores próximos report: Denunciar este utilizador - popup: - your location: A tua localização - nearby mapper: Mapeador próximo de ti - friend: Amigo account: title: Editar conta my settings: Definições diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 92938703d..70dea87af 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -15,6 +15,7 @@ # Author: Popetedenis # Author: Ruila # Author: Strainu +# Author: WebSourceContentRO # Author: Wintereu --- ro: @@ -40,6 +41,9 @@ ro: client_application: create: Înregistrează update: Actualizează + doorkeeper_application: + create: Înregistrare + update: Actualizează redaction: create: Creați redacție update: Salvați redacția @@ -113,6 +117,9 @@ ro: language: Limbă doorkeeper/application: name: Nume + redirect_uri: Redirectează URI-uri + confidential: Aplicație confidențială? + scopes: Permisiuni friend: user: Utilizator friend: Prieten @@ -155,6 +162,11 @@ ro: pass_crypt: Parolă pass_crypt_confirmation: Confirmă Parola help: + doorkeeper/application: + confidential: Aplicația va fi utilizată acolo unde cheia secretă a clientului + poate fi păstrată confidențial (aplicațiile mobile native și aplicațiile + cu o singură pagină nu sunt confidențiale) + redirect_uri: Folosiți o linie pentru fiecare URI trace: tagstring: utilizează virgule user_block: @@ -442,6 +454,24 @@ ro: timeout: sorry: Ne pare rău, lista de comenzi modificate pe care le-ați solicitat a durat prea mult timp pentru a fi preluate. + dashboards: + contact: + km away: '%{count} km depărtare' + m away: '%{count} m depărtare' + popup: + your location: Locația utilizatorului + nearby mapper: Cartograful din apropiere + friend: Prieten + show: + my friends: Prietenii mei + no friends: Nu ați adăugat încă niciun prieten. + nearby users: Alți utilizatori din apropriere + no nearby users: Nu există alți utilizatori care să admită cartografiere în + apropiere. + friends_changesets: changeset prieteni + friends_diaries: intrările prietenilor în jurnal + nearby_changesets: schimbări de setări ale utilizatorilor + nearby_diaries: intrările în jurnalul utilizatorului din apropiere diary_entries: new: title: O nouă înregistrare în jurnal @@ -515,11 +545,17 @@ ro: comments: has_commented_on: '%{display_name} a comentat pe următoarele înregistrări din jurnal' + no_comments: Fără comentarii din jurnal post: Postează when: Când comment: Comentariu newer_comments: Comentarii mai noi older_comments: Comentarii mai vechi + doorkeeper: + flash: + applications: + create: + notice: Aplicație înregistrată. friendships: make_friend: heading: Adăugați %{user} ca prieten? @@ -527,6 +563,8 @@ ro: success: '%{name} este acum prietenul tău!' failed: Ne pare rău, nu a reușit să adăugați %{name} ca prieten. already_a_friend: Sunteți deja prieteni cu %{name} + limit_exceeded: V-ați împrietenit cu mulți utilizatori recent. Vă rugăm să așteptați + puțin înainte de a încerca să vă mai împrieteniți. remove_friend: heading: Scoate de la prieteni pe %{user}? button: Scoate din lista de prieteni @@ -1434,9 +1472,10 @@ ro: intro_text: OpenStreetMap este o hartă a lumii, creată de oameni ca tine și liberă pentru utilizare sub o licență deschisă. intro_2_create_account: Creează un cont de utilizator - hosting_partners_html: Gazduirea este susținută de %{ucl}, %{bytemark} și alți - %{partners}. + hosting_partners_html: Gazduirea este susținută de %{ucl}, %{fastly}, %{bytemark} + și alți %{partners}. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Găzduire Bytemark partners_partners: parteneri tou: Termeni de Utilizare @@ -1468,10 +1507,15 @@ ro: %{subject}:' footer: De asemenea, puteți citi comentariul la %{readurl} și puteți să comentați la %{commenturl} sau să răspundeți la %{replyurl} + footer_html: De asemenea, puteți citi comentariul la %{readurl} și puteți comenta + la %{commenturl} sau să trimiteți un mesaj autorului la %{replyurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Salut, %{to_user}, header: '%{from_user} v-a trimis un mesaj prin OpenStreetMap cu subiectul %{subject}:' + header_html: '%{from_user} v-a trimis un mesaj OpenStreetMap cu subiectul %{subject}:' + footer: De asemenea, puteți citi mesajul la %{readurl} și trimite unul autorului + la %{replyurl} footer_html: De asemenea, puteți citi mesajul la %{readurl} și puteți răspunde la %{replyurl} friendship_notification: @@ -1481,6 +1525,7 @@ ro: see_their_profile: Puteți vedea profilul lor la %{userurl}. see_their_profile_html: Puteți vedea profilul respectiv la %{userurl}. befriend_them: De asemenea, îi puteți adăuga ca prieten la %{befriendurl} + befriend_them_html: Le puteți adăuga și ca prieten la %{befriendurl}. gpx_failure: hi: Salut %{to_user}, failed_to_import: 'nu a reușit să importe. Iată eroarea:' @@ -2477,13 +2522,6 @@ ro: spam score: 'Scorul spam:' description: Descriere user location: Locația utilizatorului - my friends: Prietenii mei - no friends: Nu ați adăugat încă niciun prieten. - km away: '%{count} km depărtare' - m away: '%{count} m depărtare' - nearby users: Alți utilizatori din apropriere - no nearby users: Nu există alți utilizatori care să admită cartografiere în - apropiere. role: administrator: Acest utilizator este un administrator moderator: Acest utilizator este un moderator @@ -2504,15 +2542,7 @@ ro: unhide_user: Descoperă acest utilizator delete_user: Șterge acest utilizator confirm: Confirmă - friends_changesets: changeset prieteni - friends_diaries: intrările prietenilor în jurnal - nearby_changesets: schimbări de setări ale utilizatorilor - nearby_diaries: intrările în jurnalul utilizatorului din apropiere report: Reclamă acest utilizator - popup: - your location: Locația utilizatorului - nearby mapper: Cartograful din apropiere - friend: Prieten account: title: Modificare cont my settings: Setările mele diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 6557d4fcc..539d71724 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -21,6 +21,7 @@ # Author: Cjaushe4ka # Author: D1g # Author: DCamer +# Author: DDPAT # Author: Diralik # Author: Dmitry-s93 # Author: Dr&mx @@ -538,6 +539,26 @@ ru: timeout: sorry: К сожалению, список пакетов правок, который вы запросили, требует слишком много времени для извлечения. + dashboards: + contact: + km away: '%{count} км от вас' + m away: '%{count} м от вас' + popup: + your location: Ваше местоположение + nearby mapper: Ближайший картограф + friend: Друг + show: + title: Моя панель + edit_your_profile: Править свой профиль + my friends: Друзья + no friends: Вы не добавили ещё ни одного друга. + nearby users: Другие ближайшие пользователи + no nearby users: Пока нет других пользователей, признающих, что занимающихся + составлением карты поблизости. + friends_changesets: наборы правок друзей + friends_diaries: дневники друзей + nearby_changesets: правки соседей + nearby_diaries: дневники соседей diary_entries: new: title: Новая запись в дневнике @@ -1471,7 +1492,8 @@ ru: intro_text: OpenStreetMap является картой мира, созданной такими же людьми, как и вы, и может свободно использоваться под открытой лицензией. intro_2_create_account: Создайте учётную запись - hosting_partners_html: Хостинг поддерживается %{ucl}, %{bytemark} и другими %{partners}. + hosting_partners_html: Хостинг поддерживается %{ucl}, %{fastly}, %{bytemark} и + другими %{partners}. partners_ucl: UCL partners_bytemark: Bytemark Hosting partners_partners: партнёрами @@ -1956,9 +1978,7 @@ ru: credit_3_1_html: |- Фрагменты карты в “standard style” на сайте www.openstreetmap.org представляют собой Выполненную работу OpenStreetMap Foundation с использованием данных OpenStreetMap - под лицензией Open Database License. Если вы используете эти фрагменты, используйте - следующую атрибуцию: - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + под лицензией Open Database License. При использовании этого стиля карты требуется такая же атрибуция, как и для данных карты. credit_4_html: |- В случае электронной карты с прокруткой, ссылка должна всегда находиться в углу окна просмотра карты. Например: @@ -1982,8 +2002,11 @@ ru: contributors_at_html: |- Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и Тироля (на условиях CC BY AT с дополнениями). - contributors_au_html: Австралия. Данные пригородов от Австралийского - бюро статистики. + contributors_au_html: |- + Австралия: Включено или разработано с использованием административных границ и копии; + Geoscape Australia + под лицензией Содружества Австралии по + международной лицензии Creative Commons Attribution 4.0 (CC BY 4.0). contributors_ca_html: Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). @@ -2169,8 +2192,7 @@ ru: приложение для Mac и Windows. id_html: В качестве альтернативы вы можете установить в качестве редактора по умолчанию iD, который запускается в вашем веб-браузере, как раньше это делал - Potlatch. Измените свои пользовательские настройки - здесь. + Potlatch. Измените свои настройки здесь. sidebar: search_results: Результаты поиска close: Закрыть @@ -2655,13 +2677,6 @@ ru: spam score: 'Оценка спама:' description: Описание user location: Местонахождение пользователя - my friends: Друзья - no friends: Вы не добавили ещё ни одного друга. - km away: '%{count} км от вас' - m away: '%{count} м от вас' - nearby users: Другие ближайшие пользователи - no nearby users: Пока нет других пользователей, признающих, что занимающихся - составлением карты поблизости. role: administrator: Этот пользователь является администратором moderator: Этот пользователь является модератором @@ -2682,15 +2697,7 @@ ru: unhide_user: Отобразить этого пользователя delete_user: Удалить этого пользователя confirm: Подтвердить - friends_changesets: наборы правок друзей - friends_diaries: дневники друзей - nearby_changesets: правки соседей - nearby_diaries: дневники соседей report: Сообщить об этом пользователе - popup: - your location: Ваше местоположение - nearby mapper: Ближайший картограф - friend: Друг account: title: Изменить учетную запись my settings: Мои настройки diff --git a/config/locales/sat.yml b/config/locales/sat.yml index d169e3e66..65647a814 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -207,6 +207,13 @@ sat: area: ᱡᱟᱭᱜᱟ index: load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ + dashboards: + popup: + your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ + friend: ᱜᱟᱛᱮ + show: + my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ + no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾ diary_entries: new: title: ᱱᱟᱶᱟ ᱰᱟᱭᱨᱤ ᱟᱫᱮᱨ @@ -651,13 +658,8 @@ sat: status: 'ᱫᱚᱥᱟ:' description: ᱵᱤᱵᱨᱚᱱ user location: ᱵᱮᱵᱷᱟᱨᱤᱡ-ᱟ ᱡᱟᱭᱜᱟ - my friends: ᱤᱧᱭᱟᱜ ᱜᱟᱛᱮ ᱠᱚ - no friends: ᱱᱤᱛ ᱫᱷᱟᱹᱵᱤᱡ ᱢᱤᱛᱴᱮᱱ ᱜᱟᱛᱮᱠᱩ ᱦᱚᱸ ᱵᱟᱢ ᱥᱮᱞᱮᱫ ᱠᱟᱛ ᱠᱚᱣᱟ᱾ comments: ᱚᱠᱛᱟᱠᱚ confirm: ᱜᱚᱴᱟᱭ ᱢᱮ - popup: - your location: ᱟᱢᱟᱜ ᱡᱟᱭᱜᱟ - friend: ᱜᱟᱛᱮ account: title: ᱠᱷᱟᱛᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ my settings: ᱤᱧᱟᱜ ᱥᱟᱡᱟᱣᱠᱚ diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 5b5a00454..1f99a4726 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -10,6 +10,8 @@ sc: formats: friendly: '%e %B %Y a is %H:%M' helpers: + file: + prompt: Issèbera unu documentu submit: diary_comment: create: Sarva @@ -22,7 +24,9 @@ sc: create: Imbia client_application: create: Registra·ti - update: Modìfica + update: Agiorna + doorkeeper_application: + update: Agiorna redaction: create: Crea una revisione trace: @@ -72,33 +76,36 @@ sc: latitude: Latitùdine longitude: Longitùdine language: Limba + doorkeeper/application: + name: Nùmene friend: user: Impreadore friend: Amigu trace: user: Impreadore visible: Visìbile - name: Nùmene + name: Nùmene de su documentu size: Mannesa latitude: Latitùdine longitude: Longitùdine public: Pùblicu description: Descritzione - visibility: 'Visibilidade:' - tagstring: 'Etichetas:' + visibility: Visibilidade + tagstring: Etichetas message: title: Ogetu body: Corpus recipient: Destinatàriu redaction: + title: Tìtulu description: Descritzione user: email: E-lìtera active: Ativu - description: Descritzione - home_lat: 'Latitùdine:' - home_lon: 'Longitùdine:' - languages: Limbas + description: Descritzione de su profilu + home_lat: Latitùdine + home_lon: Longitùdine + languages: Limbas preferidas pass_crypt: Crae datetime: distance_in_words_ago: @@ -111,7 +118,7 @@ sc: description: iD (acontzadore in lìnia) remote: name: Controllu Remotu - description: Controllu Remotu (JOSM o Merkaartor) + description: Controllu Remotu (JOSM, Potlatch o Merkaartor) auth: providers: openid: OpenID @@ -194,9 +201,12 @@ sc: id: ID user: Impitadore comment: Cummentu + dashboards: + popup: + friend: Amigu diary_entries: form: - location: 'Logu:' + location: Logu show: leave_a_comment: Lassa unu cummentu login: Intra @@ -922,8 +932,6 @@ sc: edits: Modìficas description: Descritzione confirm: Cunfirma - popup: - friend: Amigu account: save changes button: Sarva sas modìficas user_role: @@ -933,8 +941,8 @@ sc: confirm: Cunfirma user_blocks: show: - created: Creadu - status: Istadu + created: 'Creadu:' + status: 'Istadu:' edit: Modìfica block: edit: Modìfica diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 801cff130..b36398a77 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -88,14 +88,14 @@ scn: trace: user: Utenti visible: Visìbbili - name: Nomu + name: Nomu dû file size: Grannizza latitude: Latitùdini longitude: Loncitùdini public: Pùbblicu description: Discrizzioni - gpx_file: 'Carricari lu file GPX:' - visibility: 'Visibbilità:' + gpx_file: Carricari file GPX + visibility: Visibbilità tagstring: Etichetti message: sender: Mittenti @@ -212,7 +212,7 @@ scn: relation: title_html: 'Rilazzioni: %{name}' history_title_html: 'Crunuluggìa dâ rilazzioni: %{name}' - members: Membri + members: Mèmmiri relation_member: entry_role_html: '%{type} %{name} comu %{role}' type: @@ -324,11 +324,28 @@ scn: title_all: Discussioni supra ô gruppu di canciamenti d'OpenStreetMap title_particular: 'Discussioni supra ô gruppu di canciamenti d''OpenStreetMap #%{changeset_id}' + dashboards: + contact: + km away: luntanu %{count} km + m away: luntanu %{count} m + popup: + your location: La tò pusizzioni + nearby mapper: Mappaturi vicinu + friend: Amicu + show: + no friends: Ancora nun agghiuncisti nuddu amicu. + nearby users: Àutri utenti vicinu + no nearby users: Ancora nun ci sunnu àutri utenti chi si dichiàranu mappatura + ccà vicinu. + friends_changesets: gruppa di canciamenti di l'amici + friends_diaries: vuci dî diarî di l'amici + nearby_changesets: gruppa di canciamenti di l'utenti vicini + nearby_diaries: vuci dî diarî di l'utenti vicini diary_entries: new: title: Vuci nova dû diariu form: - location: 'Locu:' + location: Locu use_map_link: adòpira la cartina index: title: Diarî di l'utenti @@ -935,7 +952,7 @@ scn: intro_text: OpenStreetMap è na cartina dû munnu, criata di genti comu a tìa e lìbbira a adupirari secunnu na licenza graputa. intro_2_create_account: Crea un cuntu d'utenti - partners_ucl: the UCL VR Centre + partners_ucl: UCL partners_bytemark: Bytemark Hosting partners_partners: cullabburatura osm_offline: La basi di dati d'OpenStreetMap comu a ora nun è n lìnia pirchì si @@ -1229,6 +1246,13 @@ scn: title: Nesci heading: Nesci d'OpenStreetMap logout_button: Nesci + shared: + markdown_help: + text: Testu + image: Mmàggini + richtext_field: + edit: Cancia + preview: Antiprima site: about: next: Appressu @@ -1786,6 +1810,7 @@ scn: no_apps_html: Hai n'applicazzzioni chi vulissi riggistrari p'usàrila cu nuàutri adupirannu lu standard %{oauth}? La tò applicazzioni web s'havi a riggistrari prima chi poi fari addumannati OAuth unni stu sirvizziu. + oauth: OAuth registered_apps: 'Hai riggistrati st''applicazzioni clienti:' register_new: Riggistra la tò applicazzioni form: @@ -1878,19 +1903,13 @@ scn: ct status: 'Cunnizzioni di cuntribbuzzioni:' ct undecided: Nun dicisi ct declined: Rifiutati - latest edit: 'Ùrtimu canciamentu %{ago}:' + latest edit: 'Ùrtimu canciamentu (%{ago}):' email address: 'Nnirizzu di posta elittrònica:' created from: 'Criatu di:' status: 'Statu:' spam score: 'Punteggiu di Spam:' description: Discrizzioni user location: Pusizzioni di l'utenti - no friends: Ancora nun agghiuncisti nuddu amicu. - km away: luntanu %{count} km - m away: luntanu %{count} m - nearby users: Àutri utenti vicinu - no nearby users: Ancora nun ci sunnu àutri utenti chi si dichiàranu mappatura - ccà vicinu. role: administrator: St'utenti è n'amministraturi moderator: St'utenti è nu mudiraturi @@ -1911,24 +1930,16 @@ scn: unhide_user: Ammustra a st'utenti delete_user: Cancella a st'utenti confirm: Cunferma - friends_changesets: gruppa di canciamenti di l'amici - friends_diaries: vuci dî diarî di l'amici - nearby_changesets: gruppa di canciamenti di l'utenti vicini - nearby_diaries: vuci dî diarî di l'utenti vicini - popup: - your location: La tò pusizzioni - nearby mapper: Mappaturi vicinu - friend: Amicu account: title: Cancia lu cuntu my settings: Li mè mpustazzioni - current email address: 'Nnirizzu di posta elittrònica attuali:' - external auth: 'Autinticazzioni esterna:' + current email address: Nnirizzu email attuali + external auth: Autinticazzioni esterna openid: link: http://wiki.openstreetmap.org/wiki/IT:OpenID link text: chi voli diri? public editing: - heading: 'Canciamenti pùbblici:' + heading: Canciamenti pùbblici enabled: Attivati. Nun sî anònimu e poi canciari li dati. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: chi voli diri? @@ -1946,13 +1957,14 @@ scn: è pùbblicatu.
  • Sta dicisioni nun si pò annullari, e a accuminzari d'ora tutti l'utenti novi sù pùbblici comu mpustazzioni pridifinuta.
    • contributor terms: - heading: 'Cunnizzioni di cuntribbuzzioni:' + heading: Cunnizzioni di cuntribbuzzioni agreed: Accittasti li cunnizzioni di cuntribbuzzioni novi. not yet agreed: Ancora nun accittasti li cunnizzioni di cuntribbuzzioni novi. review link text: Quannu voi tu vai nta stu link pi lèggiri e accittari li cunnizzioni di cuntribbuzzioni novi. agreed_with_pd: Dichiarasti macari chi cunzìddiri li tò canciamenti ntô Duminiu Pùbblicu. + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: chi voli diri? save changes button: Sarva li canciamenti make edits public button: Arrenni tutti li mè canciamenti pùbblici @@ -1979,6 +1991,7 @@ scn: suspended: title: Cuntu suspinnutu heading: Cuntu suspinnutu + support: supportu body_html: |-

    Purtroppu, lu tò cuntu fu suspinnutu di manera autumàtica pi attività suspetti. @@ -2053,7 +2066,7 @@ scn: title: Rèvuca dû bloccu di %{block_on} heading_html: Rèvuca dû bloccu di %{block_on} fattu di %{block_by} time_future: Stu bloccu finisci tra %{time}. - past: Stu bloccu finìu %{time} fa e ora nun si pò arrivucari cchiù. + past: Stu bloccu finìu %{time} e ora nun si pò arrivucari cchiù. confirm: Sî sicuru chi voi arrivucari stu bloccu? revoke: Rèvuca! flash: Stu bloccu fu arrivucatu. diff --git a/config/locales/sco.yml b/config/locales/sco.yml index b4bf9f1ca..2c38144e6 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: AmaryllisGardener +# Author: ChrisFleming # Author: John Reid # Author: MJL --- @@ -12,7 +13,7 @@ sco: helpers: submit: diary_comment: - create: Hain + create: Save activerecord: models: acl: Access Control Leet @@ -136,8 +137,8 @@ sco: history_title_html: 'Way History: %{name}' nodes: Nodes also_part_of_html: - one: paurt o way %{related_ways} - other: pairt o ways %{related_ways} + one: pairt o wey %{related_ways} + other: pairt o weys %{related_ways} relation: title_html: 'Relation: %{name}' history_title_html: 'Relation History: %{name}' @@ -146,7 +147,7 @@ sco: entry_role_html: '%{type} %{name} as %{role}' type: node: Node - way: Way + way: Wey relation: Relation containing_relation: entry_html: Relation %{relation_name} diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e7e9a5039..d410f2b8e 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -327,6 +327,23 @@ sk: load_more: NačítaÅ¥ ďalÅ¡ie timeout: sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliÅ¡ dlho. + dashboards: + contact: + km away: vzdialený %{count}km + m away: vzdialený %{count}m + popup: + your location: VaÅ¡a poloha + nearby mapper: Používateľ v okolí + friend: Priateľ + show: + my friends: Moji priatelia + no friends: EÅ¡te nemáte pridaných žiadnych priateľov. + nearby users: Ďalší používatelia v okolí + no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí. + friends_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien priateľov + friends_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy priateľov + nearby_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien používateľov v okolí + nearby_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy používateľov v okolí diary_entries: new: title: Nový záznam denníka @@ -1840,12 +1857,6 @@ sk: spam score: 'Spam skóre:' description: Popis user location: Poloha používateľa - my friends: Moji priatelia - no friends: EÅ¡te nemáte pridaných žiadnych priateľov. - km away: vzdialený %{count}km - m away: vzdialený %{count}m - nearby users: Ďalší používatelia v okolí - no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí. role: administrator: Tento používateľ je administrátor moderator: Tento používateľ je moderátor @@ -1866,15 +1877,7 @@ sk: unhide_user: ZobraziÅ¥ tohoto používateľa delete_user: OdstrániÅ¥ tohoto používateľa confirm: PotvrdiÅ¥ - friends_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien priateľov - friends_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy priateľov - nearby_changesets: PrechádzaÅ¥ vÅ¡etky sady zmien používateľov v okolí - nearby_diaries: PrechádzaÅ¥ vÅ¡etky denníkové záznamy používateľov v okolí report: NahlásiÅ¥ tohto používateľa - popup: - your location: VaÅ¡a poloha - nearby mapper: Používateľ v okolí - friend: Priateľ account: title: UpraviÅ¥ účet my settings: Moje nastavenia diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 4946a8ccc..d94a38d44 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -414,6 +414,24 @@ sl: index: title_all: Razprava o paketu sprememb OpenStreetMap title_particular: 'Razprava o paketu sprememb OpenStreetMap #%{changeset_id}' + dashboards: + contact: + km away: oddaljen %{count} km + m away: oddaljen %{count} m + popup: + your location: VaÅ¡a lokacija + nearby mapper: Bližnji kartograf + friend: Prijatelj + show: + my friends: Moji prijatelji + no friends: Niste Å¡e dodali nobenih prijateljev. + nearby users: Drugi bližnji uporabniki + no nearby users: Ni Å¡e drugih uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i + bližini. + friends_changesets: paketi sprememb prijateljev + friends_diaries: dnevniki prijateljev + nearby_changesets: paketi sprememb bližnjih uporabnikov + nearby_diaries: dnevniÅ¡ki vnosi bližnjih uporabnikov diary_entries: new: title: Nov zapis v dnevnik @@ -2048,13 +2066,6 @@ sl: spam score: 'Rezultat spama:' description: Opis user location: Lokacija uporabnika - my friends: Moji prijatelji - no friends: Niste Å¡e dodali nobenih prijateljev. - km away: oddaljen %{count} km - m away: oddaljen %{count} m - nearby users: Drugi bližnji uporabniki - no nearby users: Ni Å¡e drugih uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i - bližini. role: administrator: Ta uporabnik je administrator moderator: Ta uporabnik je moderator @@ -2075,15 +2086,7 @@ sl: unhide_user: Prikaži uporabnika delete_user: IzbriÅ¡i uporabnika confirm: Potrdi - friends_changesets: paketi sprememb prijateljev - friends_diaries: dnevniki prijateljev - nearby_changesets: paketi sprememb bližnjih uporabnikov - nearby_diaries: dnevniÅ¡ki vnosi bližnjih uporabnikov report: Prijavi tega uporabnika - popup: - your location: VaÅ¡a lokacija - nearby mapper: Bližnji kartograf - friend: Prijatelj account: title: Urejanje uporabniÅ¡kega računa my settings: Moje nastavitve diff --git a/config/locales/sq.yml b/config/locales/sq.yml index d429ad468..eb334ac49 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -294,6 +294,18 @@ sq: index: title_all: Diskutimi mbi ndryshimet në OpenStreetMap title_particular: 'Diskutimi mbi grupin e ndryshimeve #%{changeset_id} të OpenStreetMap' + dashboards: + contact: + km away: '%{count}km larg' + m away: '%{count}m larg' + popup: + your location: Vendndodhja e jote + nearby mapper: Hartuesi aty pranë + friend: Mik + show: + no friends: Akoma nuk ke shtuar ndonjë mik. + nearby users: Përdoruesit e tjerë aty pranë + no nearby users: Nuk ka përdorues tjerë aty pranë, të cilët pranojnë të hartografojnë. diary_entries: new: title: Shënim i ri në Ditar @@ -1452,11 +1464,6 @@ sq: spam score: 'Rezultati me Spam:' description: Përshkrimi user location: Vendi i përdoruesit - no friends: Akoma nuk ke shtuar ndonjë mik. - km away: '%{count}km larg' - m away: '%{count}m larg' - nearby users: Përdoruesit e tjerë aty pranë - no nearby users: Nuk ka përdorues tjerë aty pranë, të cilët pranojnë të hartografojnë. role: administrator: Ky përdorues është një administrator moderator: Ky përdorues është një moderator @@ -1477,10 +1484,6 @@ sq: delete_user: fshi këtë përdorues confirm: Konfirmo report: Raporto ķëtë përdorues - popup: - your location: Vendndodhja e jote - nearby mapper: Hartuesi aty pranë - friend: Mik account: title: Redakto llogarinë my settings: Preferencat e mia diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 2239e88db..3b5bce6a9 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1,4 +1,4 @@ -# Messages for Serbian (Latin script) (srpski (latinica)‎) +# Messages for Serbian (Latin script) (srpski (latinica)) # Exported from translatewiki.net # Export driver: phpyaml # Author: Macofe @@ -196,6 +196,22 @@ sr-Latn: title_nearby: Izmene od okolnih korisnika timeout: sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak. + dashboards: + contact: + km away: udaljeno %{count} km + m away: udaljeno %{count} m + popup: + your location: VaÅ¡a lokacija + nearby mapper: Obližnji kartograf + friend: Prijatelj + show: + no friends: Niste dodali nijednog prijatelja. + nearby users: 'Ostali obližnji korisnici:' + no nearby users: JoÅ¡ uvek nema obližnjih korisnika koji mapiraju. + friends_changesets: Sve izmene prijatelja + friends_diaries: Pregled svih zapisa u dnevniku prijatelja + nearby_changesets: Pregled svih izmena okolnih korisnika + nearby_diaries: Pregled svih zapisa u dnevniku okolnih korisnika diary_entries: new: title: Novi unos u dnevniku @@ -1342,11 +1358,6 @@ sr-Latn: spam score: 'Ocena spama:' description: Opis user location: BoraviÅ¡te korisnika - no friends: Niste dodali nijednog prijatelja. - km away: udaljeno %{count} km - m away: udaljeno %{count} m - nearby users: 'Ostali obližnji korisnici:' - no nearby users: JoÅ¡ uvek nema obližnjih korisnika koji mapiraju. role: administrator: Ovaj korisnik je administrator moderator: Ovaj korisnik je urednik @@ -1367,14 +1378,6 @@ sr-Latn: unhide_user: otkrij ovog korisnika delete_user: obriÅ¡i ovog korisnika confirm: Potvrdi - friends_changesets: Sve izmene prijatelja - friends_diaries: Pregled svih zapisa u dnevniku prijatelja - nearby_changesets: Pregled svih izmena okolnih korisnika - nearby_diaries: Pregled svih zapisa u dnevniku okolnih korisnika - popup: - your location: VaÅ¡a lokacija - nearby mapper: Obližnji kartograf - friend: Prijatelj account: title: Uredi nalog my settings: Postavke diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 6eec7481c..61353f26c 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1,4 +1,4 @@ -# Messages for Serbian (Cyrillic script) (српски (ћирилица)‎) +# Messages for Serbian (Cyrillic script) (српски (ћирилица)) # Exported from translatewiki.net # Export driver: phpyaml # Author: Acamicamacaraca @@ -371,6 +371,23 @@ sr: timeout: sorry: Преузимање списка коментара за скупове промена који сте тражили трајало је предуго. + dashboards: + contact: + km away: удаљено %{count} км + m away: удаљено %{count} м + popup: + your location: Ваша локација + nearby mapper: Оближњи картограф + friend: Пријатељ + show: + my friends: Моји пријатељи + no friends: Нисте додали ниједног пријатеља. + nearby users: 'Остали оближњи корисници:' + no nearby users: Још увек нема оближњих корисника који мапирају. + friends_changesets: Спискови промена пријатеља + friends_diaries: Дневник пријатеља + nearby_changesets: Спискови промена корисника у околини + nearby_diaries: Дневници корисника у околини diary_entries: new: title: Нови унос у дневнику @@ -2163,12 +2180,6 @@ sr: spam score: 'Оцена спама:' description: Опис user location: Боравиште корисника - my friends: Моји пријатељи - no friends: Нисте додали ниједног пријатеља. - km away: удаљено %{count} км - m away: удаљено %{count} м - nearby users: 'Остали оближњи корисници:' - no nearby users: Још увек нема оближњих корисника који мапирају. role: administrator: Овај корисник је администратор moderator: Овај корисник је уредник @@ -2189,15 +2200,7 @@ sr: unhide_user: Откриј корисника delete_user: Избриши корисника confirm: Потврди - friends_changesets: Спискови промена пријатеља - friends_diaries: Дневник пријатеља - nearby_changesets: Спискови промена корисника у околини - nearby_diaries: Дневници корисника у околини report: Пријави овог корисника - popup: - your location: Ваша локација - nearby mapper: Оближњи картограф - friend: Пријатељ account: title: Уреди налог my settings: Поставке diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 199b810ed..c60f375a5 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -470,6 +470,24 @@ sv: timeout: sorry: Tyvärr, listan med ändringssetskommentar du begärde kunde inte hämtas dÃ¥ begäran tog för lÃ¥ng tid. + dashboards: + contact: + km away: '%{count}km bort' + m away: '%{count}m bort' + popup: + your location: Din position + nearby mapper: Användare i närheten + friend: Vän + show: + my friends: Mina vänner + no friends: Du har inte lagt till nÃ¥gra vänner ännu. + nearby users: Andra användare nära dig + no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger + nära dig. + friends_changesets: vänners ändringsset + friends_diaries: vänners dagboksinlägg + nearby_changesets: närbelägna användares ändringsset + nearby_diaries: närbelägna användares dagboksinlägg diary_entries: new: title: Nytt dagboksinlägg @@ -1392,8 +1410,9 @@ sv: intro_text: OpenStreetMap är en karta över världen, skapad av människor som du och fri att använda under en öppen licens. intro_2_create_account: Skapa ett användarkonto - hosting_partners_html: Drivs via %{ucl}, %{bytemark} och andra %{partners}. + hosting_partners_html: Drivs via %{ucl}, %{fastly}, %{bytemark} och andra %{partners}. partners_ucl: University College London + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: partners tou: Användarvillkor @@ -2499,13 +2518,6 @@ sv: spam score: 'Spam-poäng:' description: Beskrivning user location: Användarposition - my friends: Mina vänner - no friends: Du har inte lagt till nÃ¥gra vänner ännu. - km away: '%{count}km bort' - m away: '%{count}m bort' - nearby users: Andra användare nära dig - no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger - nära dig. role: administrator: Den här användaren är en administratör moderator: Den här användaren är en moderator @@ -2526,15 +2538,7 @@ sv: unhide_user: Sluta dölja användare delete_user: Radera denna användare confirm: Bekräfta - friends_changesets: vänners ändringsset - friends_diaries: vänners dagboksinlägg - nearby_changesets: närbelägna användares ändringsset - nearby_diaries: närbelägna användares dagboksinlägg report: Rapportera denna användare - popup: - your location: Din position - nearby mapper: Användare i närheten - friend: Vän account: title: Redigera konto my settings: Mina inställningar diff --git a/config/locales/ta.yml b/config/locales/ta.yml index a8e354142..4362d0200 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -237,6 +237,17 @@ ta: index: title: மாற்றங்கள் load_more: மேலும் படிக்க + dashboards: + contact: + km away: '%{count}கிமீ தாண்டி' + m away: '%{count}மீ தாண்டி' + popup: + your location: உங்களது இருப்பிடம் + friend: நண்பர் + show: + my friends: எனது நண்பர்கள் + no friends: நீங்கள் இதுவரை எந்த நண்பர்களையும் சேர்க்கவில்லை + nearby users: மற்ற அருகிலுள்ள பயனர்கள் diary_entries: new: title: புதிய டைரி உள்ளீடு @@ -778,11 +789,6 @@ ta: status: 'நிலை:' description: விளக்கம் user location: பயனர் அமைவிடம் - my friends: எனது நண்பர்கள் - no friends: நீங்கள் இதுவரை எந்த நண்பர்களையும் சேர்க்கவில்லை - km away: '%{count}கிமீ தாண்டி' - m away: '%{count}மீ தாண்டி' - nearby users: மற்ற அருகிலுள்ள பயனர்கள் role: administrator: இந்த பயனர் ஒரு நிர்வாகி moderator: இந்த பயனர் ஒரு நடுவர் @@ -803,9 +809,6 @@ ta: unhide_user: இந்த பயனரை மறைத்ததை நீக்கு delete_user: இப்பயனரை நீக்கவும் confirm: உறுதிசெய் - popup: - your location: உங்களது இருப்பிடம் - friend: நண்பர் account: title: கணக்கை திருத்து my settings: என் அமைப்புகள் diff --git a/config/locales/te.yml b/config/locales/te.yml index f86b105eb..4de30371a 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -180,6 +180,15 @@ te: title: మార్పుల సమితులు title_user: '%{user} చేసిన మార్పులసమితులు' load_more: మరిన్ని చూపించు + dashboards: + contact: + km away: '%{count}కిమీ దూరంలో' + m away: '%{count}మీ దూరంలో' + popup: + your location: మీ ప్రాంతం + show: + no friends: మీరు ఇంకా స్నేహితులెవరినీ చేర్చలేదు. + nearby users: 'దగ్గరలోని వాడుకరులు:' diary_entries: new: title: కొత్త దినచర్య పద్దు @@ -759,18 +768,12 @@ te: status: 'స్థితి:' description: వివరణ user location: వాడుకరి ప్రాంతం - no friends: మీరు ఇంకా స్నేహితులెవరినీ చేర్చలేదు. - km away: '%{count}కిమీ దూరంలో' - m away: '%{count}మీ దూరంలో' - nearby users: 'దగ్గరలోని వాడుకరులు:' role: administrator: ఈ వాడుకరి ఒక నిర్వాహకులు comments: వ్యాఖ్యలు create_block: ఈ వాడుకరిని నిరోధించు delete_user: ఈ వాడుకరిని తొలగించు confirm: నిర్ధారించు - popup: - your location: మీ ప్రాంతం account: title: ఖాతా మార్పు my settings: నా అమరికలు diff --git a/config/locales/th.yml b/config/locales/th.yml index 2c0f788e8..f5326403b 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -398,6 +398,21 @@ th: title_particular: 'การอภิปรายชุดการเปลี่ยนแปลง OpenStreetMap #%{changeset_id}' timeout: sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น + dashboards: + contact: + km away: ห่างออกไป %{count}km + m away: ห่างออกไป %{count}m + popup: + your location: ตำแหน่งของคุณ + nearby mapper: คนทำแผนที่ ที่อยู่ใกล้เคียง + friend: เพื่อน + show: + my friends: รายการเพื่อน + no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ + nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง + no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง + friends_diaries: บันทึกของเพื่อน + nearby_diaries: บันทึกของผู้ใช้ข้างเคียง diary_entries: new: title: สร้างรายการบันทึกใหม่ @@ -2067,12 +2082,6 @@ th: spam score: 'คะแนนสแปม:' description: คำอธิบาย user location: ตำแหน่งผู้ใช้ - my friends: รายการเพื่อน - no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ - km away: ห่างออกไป %{count}km - m away: ห่างออกไป %{count}m - nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง - no nearby users: ไม่ได้มีผู้ใดแสดงตัวว่าทำแผนที่อยู่ใกล้เคียง role: administrator: คนนี้เป็นผู้ดูแลระบบ moderator: ผู้ใช้นี้เป็นผู้ดูแล @@ -2088,13 +2097,7 @@ th: activate_user: เปิดใช้งานผู้ใช้นี้ deactivate_user: ปิดใช้งานผู้ใช้นี้ confirm: ยืนยัน - friends_diaries: บันทึกของเพื่อน - nearby_diaries: บันทึกของผู้ใช้ข้างเคียง report: แจ้งปัญหาเกี่ยวกับผู้ใช้คนนี้ - popup: - your location: ตำแหน่งของคุณ - nearby mapper: คนทำแผนที่ ที่อยู่ใกล้เคียง - friend: เพื่อน account: title: แก้ไขบัญชี my settings: การตั้งค่าของฉัน diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 2e59c9548..3b86fd4ef 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -295,6 +295,23 @@ tl: changeset_comments: comment: comment: 'Bagong puna sa pangkat ng pagbabago #%{changeset_id} ni %{author}' + dashboards: + contact: + km away: '%{count}km ang layo' + m away: '%{count}m ang layo' + popup: + your location: Kinalalagyan mo + nearby mapper: Malapit na tagapagmapa + friend: Kaibigan + show: + my friends: Aking mga kaibigan + no friends: Hindi ka pa nagdaragdag ng sinumang mga kaibigan. + nearby users: Iba pang kalapit na mga tagagamit + no nearby users: Wala pang ibang mga tagagamit na umaamin sa pagmamapa ng malapitan. + friends_changesets: mga pagbabago ng mga kaibigan + friends_diaries: mga lahok ng mga kaibigan + nearby_changesets: mga pagtatakda ng pagbabago mula sa kalapit na mga tagagamit + nearby_diaries: mga inilahok sa talaarawan ng kalapit na mga tagagamit diary_entries: new: title: Bagong Pagpapasok sa Talaarawan @@ -494,7 +511,7 @@ tl: viaduct: Tulay na Tubo "yes": Tulay building: - apartments: Bloke ng Apartamento + apartments: Mga apartamento chapel: Kapilya church: Simbahan commercial: Gusaling Pangkalakal @@ -1748,12 +1765,6 @@ tl: spam score: 'Puntos ng Basurang Liham:' description: Paglalarawan user location: Kinalalagyan ng tagagamit - my friends: Aking mga kaibigan - no friends: Hindi ka pa nagdaragdag ng sinumang mga kaibigan. - km away: '%{count}km ang layo' - m away: '%{count}m ang layo' - nearby users: Iba pang kalapit na mga tagagamit - no nearby users: Wala pang ibang mga tagagamit na umaamin sa pagmamapa ng malapitan. role: administrator: Isang tagapangasiwa ang tagagamit na ito moderator: Isang tagapamagitan ang tagagamit na ito @@ -1774,14 +1785,6 @@ tl: unhide_user: Huwag itago ang Tagagamit na ito delete_user: Burahin ang Tagagamit na ito confirm: Tiyakin - friends_changesets: mga pagbabago ng mga kaibigan - friends_diaries: mga lahok ng mga kaibigan - nearby_changesets: mga pagtatakda ng pagbabago mula sa kalapit na mga tagagamit - nearby_diaries: mga inilahok sa talaarawan ng kalapit na mga tagagamit - popup: - your location: Kinalalagyan mo - nearby mapper: Malapit na tagapagmapa - friend: Kaibigan account: title: Baguhin ang akawnt my settings: Mga pagtatakda ko diff --git a/config/locales/tr.yml b/config/locales/tr.yml index f019201a1..817fc82ff 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -485,6 +485,27 @@ tr: timeout: sorry: Üzgünüz, talep ettiğiniz değişiklik kaydı yorumlarının alınması çok uzun sürdü. + dashboards: + contact: + km away: '%{count} km uzak' + m away: '%{count} metre yakın' + popup: + your location: Konumum + nearby mapper: Komşu haritacı + friend: Arkadaş + show: + title: Gösterge Panelim + no_home_location_html: '%{edit_profile_link} ve yakındaki kullanıcıları görmek + için ev konumunuzu ayarlayın.' + edit_your_profile: Profilinizi düzenleyin + my friends: Arkadaşlarım + no friends: Henüz herhangi bir arkadaş eklemediniz. + nearby users: Yakın çevrede bulunan kullanıcılar + no nearby users: Yakın çevrede herhangi başka kullanıcı henüz yok. + friends_changesets: arkadaşların değişiklik kayıtları + friends_diaries: arkadaşların günlük girdileri + nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları + nearby_diaries: yakınlarındaki kullanıcıların günlük girdileri diary_entries: new: title: Yeni Günlük Girdisi @@ -571,7 +592,7 @@ tr: notice: Uygulama Kayıtlı. friendships: make_friend: - heading: '%{user} adlı kullanıcı arkadaş olarak eklensin mi?' + heading: '%{user}, arkadaş olarak eklensin mi?' button: Arkadaş olarak ekle success: '%{name} arkadaş listesine eklendi!' failed: Üzgünüz, %{name} arkadaş olarak eklenemedi. @@ -822,6 +843,7 @@ tr: window_construction: Pencere Üreticisi winery: Şaraphane "yes": El Sanatları Mağazası + crossing: Geçit emergency: access_point: Erişim Noktası ambulance_station: Ambulans Ä°stasyonu @@ -1077,6 +1099,7 @@ tr: hill: Tepe hot_spring: Kaplıca island: Ada + isthmus: Kıstak land: Kara marsh: Bataklık moor: Bataklık @@ -1091,10 +1114,13 @@ tr: sand: Kum scree: Kayşat scrub: Çalılık + shingle: Çakıl tabanlı sahil plaj spring: Ä°lkbahar stone: Taş strait: Boğaz tree: Ağaç + tree_row: Ağaç Sırası + tundra: Tundra valley: Dere/vadi volcano: Yanardağ water: Su @@ -1434,12 +1460,12 @@ tr: comment_created: Yorumunuz başarıyla oluşturuldu reports: new: - title_html: Bildir %{link} + title_html: 'Bildir: %{link}' missing_params: Yeni rapor oluşturulamadı disclaimer: intro: 'Raporunuzu site moderatörlerine göndermeden önce, lütfen şunlardan emin olun:' - not_just_mistake: Sorunun yalnızca bir hata olmadığından eminsiniz + not_just_mistake: Sorunun yalnızca bir hata olmadığından eminseniz unable_to_fix: Sorunu kendiniz veya diğer topluluk üyelerinin yardımıyla düzeltemiyorsanız resolve_with_user: Sorunu ilgili kullanıcıyla çözmeyi denediyseniz categories: @@ -1455,9 +1481,9 @@ tr: other_label: Diğer user: spam_label: Bu kullanıcı profili spam içeriyor - offensive_label: Bu kullanıcı profili müstehcen/saldırgan + offensive_label: Bu kullanıcının profili müstehcen/saldırgan threat_label: Bu kullanıcının profili bir tehdit içeriyor - vandal_label: Bu kullanıcı bir vandal + vandal_label: Bu kullanıcı, bir vandal other_label: Diğer note: spam_label: Bu not bir spam @@ -1493,9 +1519,10 @@ tr: intro_text: OpenStreetMap; senin gibi kişiler tarafından oluşturulan, kullanımı serbest ve açık lisans altında olan bir dünya haritasıdır. intro_2_create_account: hesap oluşturunuz - hosting_partners_html: Barındırma hizmeti; %{ucl}, %{bytemark} ve diğer %{partners} - tarafından desteklenmektedir. + hosting_partners_html: Barındırma hizmeti; %{ucl}, %{fastly}, %{bytemark} ve diğer + %{partners} tarafından desteklenmektedir. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: ortaklar tou: Kullanım Şartları @@ -2006,10 +2033,11 @@ tr: Avusturya: Stadt Wien (CC BY lisansı altında), Land Vorarlberg ve Land Tirol'dan (değişiklikleriyle CC BY AT lisansı altında) veriler içermektedir. - contributors_au_html: 'Avustralya: CC - BY 4.0 kapsamında Commonwealth of Australia tarafından lisanslanan PSMA Australia Limited''ten - alınan verileri içerir.' + contributors_au_html: |- + Avustralya: Ä°dari Sınırlar kullanılarak birleştirilir veya geliştirilir © + Geoscape Avustralya, + Avustralya Topluluğu tarafından + Creative Commons Atıf 4.0 Uluslararası lisansı (CC BY 4.0) ile lisanslanmıştır. contributors_ca_html: "Kanada: GeoBase®, GeoGratis \n(© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) ve StatCan'den (Geography Division,\nStatistics Canada) veriler @@ -2668,6 +2696,7 @@ tr: my settings: Ayarlarım my comments: Yorumlarım my_preferences: Tercihlerim + my_dashboard: Gösterge Panelim blocks on me: Engellendiklerim blocks by me: Engellediklerim edit_profile: Profili Düzenle @@ -2689,18 +2718,9 @@ tr: spam score: 'Spam puanı:' description: Açıklama user location: Kullanıcının konumu - no_home_location_html: '%{edit_profile_link} ve yakındaki kullanıcıları görmek - için ev konumunuzu ayarlayın.' - edit_your_profile: Profilinizi düzenleyin - my friends: Arkadaşlarım - no friends: Henüz herhangi bir arkadaş eklemediniz. - km away: '%{count} km uzak' - m away: '%{count} metre yakın' - nearby users: Yakın çevrede bulunan kullanıcılar - no nearby users: Yakın çevrede herhangi başka kullanıcı henüz yok. role: - administrator: Bu kullanıcı bir yönetici dir. - moderator: Bu kullanıcı bir moderatör dür. + administrator: Bu kullanıcı, bir yöneticidir. + moderator: Bu kullanıcı, bir moderatördür. grant: administrator: Yönetici erişim hakkı moderator: Moderatör erişim izni @@ -2710,23 +2730,15 @@ tr: block_history: Etkin Engellemeler moderator_history: Verilen Engellemeler comments: Yorumlar - create_block: Bu Kullanıcıyı engelle + create_block: Bu kullanıcıyı engelle activate_user: Bu Kullanıcıyı Etkinleştir deactivate_user: Bu Kullanıcıyı Devre Dışı Bırak - confirm_user: Bu Kullanıcıyı Onaylayın + confirm_user: Bu Kullanıcıyı Onayla hide_user: Bu Kullanıcıyı Gizle unhide_user: Bu Kullanıcıyı Göster delete_user: Bu Kullanıcıyı Sil confirm: Onayla - friends_changesets: arkadaşların değişiklik kayıtları - friends_diaries: arkadaşların günlük girdileri - nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları - nearby_diaries: yakınlarındaki kullanıcıların günlük girdileri report: Bu kullanıcıyı rapor et - popup: - your location: Konumum - nearby mapper: Komşu haritacı - friend: Arkadaş account: title: Hesabı düzenle my settings: Ayarlarım diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 3af5ba1d5..a4bdb86ee 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -201,6 +201,11 @@ tt: index: title: Үзгәрешләр пакетлары load_more: Күбрәк төяү + dashboards: + popup: + friend: Дус + show: + my friends: Дусларым diary_entries: form: location: 'Урын:' @@ -707,10 +712,7 @@ tt: latest edit: 'Соңгы төзәтмә (%{ago}):' email address: 'Электрон почта адресы:' status: 'Халәт:' - my friends: Дусларым confirm: Раслау - popup: - friend: Дус account: public editing: enabled link text: бу нәрсә? diff --git a/config/locales/uk.yml b/config/locales/uk.yml index b66fb05c6..934f7e36c 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -94,30 +94,30 @@ uk: language: Мова message: Повідомлення node: Точка - node_tag: Теґ точки + node_tag: Тег точки notifier: Сповіщувач old_node: Стара точка - old_node_tag: Старий теґ точки + old_node_tag: Старий тег точки old_relation: Старий зв’язок old_relation_member: Старий елемент зв’язку - old_relation_tag: Старий теґ зв’язку + old_relation_tag: Старий тег зв’язку old_way: Стара лінія old_way_node: Стара точка лінії - old_way_tag: Старий теґ лінії + old_way_tag: Старий тег лінії relation: Зв’язок relation_member: Елемент зв’язку - relation_tag: Теґ зв’язку + relation_tag: Тег зв’язку report: Звіт session: Сеанс trace: Трек tracepoint: Точка треку - tracetag: Теґ треку + tracetag: Тег треку user: Користувач user_preference: Налаштування користувача user_token: Код підтвердження користувача way: Лінія way_node: Точка лінії - way_tag: Теґ лінії + way_tag: Тег лінії attributes: client_application: name: Назва (Обов’язково) @@ -384,11 +384,11 @@ uk: relation: title_html: 'Зв’язок: %{name}' history_title_html: 'Історія зв’язку: %{name}' - members: Учасники + members: Член members_count: - one: '%{count} учасник' - few: '%{count} учасники' - many: '%{count} учасників' + one: '%{count} член' + few: '%{count} члени' + many: '%{count} членів' other: "" relation_member: entry_role_html: '%{type} %{name} як %{role}' @@ -401,7 +401,7 @@ uk: entry_role_html: Зв’язок %{relation_name} (як %{relation_role}) not_found: title: Не знайдено - sorry: На жаль, об’єкт „%{type}“ № %{id} не знайдено. + sorry: На жаль, об’єкт «%{type}» № %{id} не знайдено. type: node: точка way: лінія @@ -508,6 +508,28 @@ uk: timeout: sorry: На жаль, перелік наборів змін, який ви запросили, потребує забагато часу для завантаження. + dashboards: + contact: + km away: '%{count} км від вас' + m away: '%{count} м від вас' + popup: + your location: Ваше місце розташування + nearby mapper: Користувач поруч з вами + friend: Друг + show: + title: Інформація + no_home_location_html: '%{edit_profile_link} і встановіть своє місце розташування, + щоб бачити користувачів поблизу.' + edit_your_profile: Редагувати ваш профіль + my friends: Друзі + no friends: Ви не додали ще жодного друга. + nearby users: Інші користувачі поруч + no nearby users: Поблизу поки немає користувачів, які займаються складанням + мапи. + friends_changesets: набори змін друзів + friends_diaries: записи в щоденниках друзів + nearby_changesets: набори змін користувачів, що знаходяться поруч з вами + nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами diary_entries: new: title: Створити новий запис у щоденнику @@ -842,6 +864,7 @@ uk: window_construction: Майстер віконних конструкцій winery: Виноробня "yes": Товари для рукоділля + crossing: Переправа emergency: access_point: Точка доступу ambulance_station: Станція швидкої медичної допомоги @@ -1097,6 +1120,7 @@ uk: hill: Пагорб hot_spring: Гаряче джерело island: Острів + isthmus: Перешийок land: Суша marsh: Болото moor: Якірна стоянка @@ -1111,10 +1135,13 @@ uk: sand: Пісок scree: Щебінь scrub: Чагарник + shingle: Черепиця spring: Джерело stone: Камінь strait: Протока tree: Дерево + tree_row: Дерево ряду + tundra: Тундра valley: Долина volcano: Вулкан water: Вода @@ -1518,8 +1545,10 @@ uk: intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для вільного використання під відкритою ліцензією. intro_2_create_account: Створіть обліковий запис - hosting_partners_html: Хостинг підтримується %{ucl}, %{bytemark} та іншими %{partners}. + hosting_partners_html: Хостинг підтримується %{ucl}, %{fastly}, %{bytemark} та + іншими %{partners}. partners_ucl: UCL + partners_fastly: Швидко partners_bytemark: Bytemark Hosting partners_partners: партнерами tou: Умови використання @@ -2020,10 +2049,9 @@ uk: Stadt Wien (на умовах ліцензії CC BY), Land Vorarlberg та Земля Тіроль (на умовах CC-BY AT з виправленнями). contributors_au_html: |- - Австралія: Містить дані, отримані з - PSMA Australia Limited - за ліцензією Австралійської Співдружності за - CC BY 4.0. + Австралія: Включено або розроблено за допомогою адміністративних кордонів © + Geoscape Australia, ліцензованих Австралійською Співдружністю за міжнародною + ліцензією Creative Commons Attribution 4.0 (CC BY 4.0). contributors_ca_html: 'Канада: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство @@ -2206,7 +2234,8 @@ uk: desktop_html: Ви можете використовувати Potlatch завантаживши його у вигляді застосунку для Mac чи Windows. id_html: Або ж ви можете встановити типовим редактором iD, який працює у вебоглядачі, - так само як до цього працював Potlatch. Змініть ваші налаштування. + так само як до цього працював Potlatch. Змініть + свої налаштування тут. sidebar: search_results: Результати пошуку close: Закрити @@ -2225,7 +2254,7 @@ uk: table: entry: motorway: Автомагістраль - main_road: Головна дорога + main_road: Важливі дороги trunk: Шосе primary: Головна дорога secondary: Другорядна дорога @@ -2472,6 +2501,7 @@ uk: в систему, через веб-інтерфейс для перегляду Умов Участі. Вам не обов’язково погоджуватись, але ви повинні переглянути їх. settings_menu: + account_settings: Налаштування облікового запису oauth1_settings: налаштування OAuth 1 oauth2_applications: застосунки OAuth 2 oauth2_authorizations: авторизації OAuth 2 @@ -2680,6 +2710,7 @@ uk: my settings: Налаштування my comments: Мої коментарі my_preferences: Налаштування + my_dashboard: Інформація blocks on me: Мої блокування blocks by me: Заблоковано мною edit_profile: Редагування профілю @@ -2701,13 +2732,6 @@ uk: spam score: 'Оцінка Спаму:' description: Опис user location: Місце знаходження користувача - my friends: Друзі - no friends: Ви не додали ще жодного друга. - km away: '%{count} км від вас' - m away: '%{count} м від вас' - nearby users: Інші користувачі поруч - no nearby users: Поблизу поки немає користувачів, які займаються складанням - мапи. role: administrator: Цей користувач є адміністратором moderator: Цей користувач є модератором @@ -2728,15 +2752,7 @@ uk: unhide_user: Показати цього користувача delete_user: Вилучити цього користувача confirm: Підтвердити - friends_changesets: набори змін друзів - friends_diaries: записи в щоденниках друзів - nearby_changesets: набори змін користувачів, що знаходяться поруч з вами - nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами report: Поскаржитись на цього користувача - popup: - your location: Ваше місце розташування - nearby mapper: Користувач поруч з вами - friend: Друг account: title: Редагувати обліковий запис my settings: Налаштування diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e7b13d6f3..4fadbfda8 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -441,6 +441,27 @@ vi: timeout: sorry: Rất tiếc, việc lấy danh sách lời tóm lược bộ thay đổi tốn quá nhiều thì giờ. + dashboards: + contact: + km away: cách %{count} km + m away: cách %{count} m + popup: + your location: Vị trí của bạn + nearby mapper: Người vẽ bản đồ ở gần + friend: Người bạn + show: + title: Bảng điều khiển + no_home_location_html: '%{edit_profile_link} và đặt vị trí nhà ở để xem những + người dùng lân cận.' + edit_your_profile: Sá»­a đổi hồ sÆ¡ của bạn + my friends: Bạn bè của tôi + no friends: Bạn chÆ°a thêm bạn bè. + nearby users: Người dùng khác ở gần + no nearby users: Không có người dùng nào nhận rằng họ ở gần. + friends_changesets: bộ thay đổi của bạn bè + friends_diaries: mục nhật ký của bạn bè + nearby_changesets: bộ thay đổi của người dùng ở gần + nearby_diaries: mục nhật ký của người dùng ở gần diary_entries: new: title: Mục nhật ký mới @@ -1352,9 +1373,10 @@ vi: intro_text: OpenStreetMap là bản đồ thế giới do những người nhÆ° bạn xây dá»±ng và cho phép sá»­ dụng thoải mái theo một giấy phép nguồn mở. intro_2_create_account: Mở tài khoản mới - hosting_partners_html: Dịch vụ lÆ°u trữ nhờ sá»± hỗ trợ của %{ucl}, %{bytemark}, + hosting_partners_html: Dịch vụ lÆ°u trữ nhờ sá»± hỗ trợ của %{ucl}, %{fastly}, %{bytemark}, và %{partners} khác. partners_ucl: UCL + partners_fastly: Fastly partners_bytemark: Bytemark Hosting partners_partners: các công ty bảo trợ tou: Điều khoản sá»­ dụng @@ -1844,8 +1866,12 @@ vi: BY), Bang Vorarlberg, và Bang Tyrol (theo bản sá»­a đổi CC BY Áo).' - contributors_au_html: 'Úc: Bao gồm dữ liệu về ngoại ô dá»±a - trên dữ liệu của Cục Thống kê Úc.' + contributors_au_html: |- + Úc: Bao gồm dữ liệu về ngoại ô dá»±a trên dữ liệu của Cục Thống kê Úc. + Úc: Bao gồm dữ liệu hoặc được phát triển theo các biên giới hành chính © + Geoscape Australia + được Thịnh vượng chung Úc phát hành dưới + giấy phép Creative Commons Ghi công 4.0 Quốc tế (CC BY 4.0). contributors_ca_html: 'Canada: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada).' @@ -2279,6 +2305,7 @@ vi: giao diện Web để đọc các Điều khoản Đóng góp. Bạn không cần phải chấp nhận các điều khoản nhÆ°ng ít nhất phải đọc chúng. settings_menu: + account_settings: Thiết lập Tài khoản oauth1_settings: Thiết lập OAuth 1 oauth2_applications: Ứng dụng OAuth 2 oauth2_authorizations: Ủy quyền OAuth 2 @@ -2484,6 +2511,7 @@ vi: my settings: Tùy chọn my comments: Bình luận của Tôi my_preferences: Tùy chỉnh + my_dashboard: Bảng điều khiển blocks on me: Tác vụ Cấm Tôi blocks by me: Tác vụ Cấm bởi Tôi edit_profile: Sá»­a đổi Hồ sÆ¡ @@ -2505,12 +2533,6 @@ vi: spam score: 'Điểm số Spam:' description: Miêu tả user location: Vị trí của người dùng - my friends: Bạn bè của tôi - no friends: Bạn chÆ°a thêm bạn bè. - km away: cách %{count} km - m away: cách %{count} m - nearby users: Người dùng khác ở gần - no nearby users: Không có người dùng nào nhận rằng họ ở gần. role: administrator: Người dùng này là quản lý viên moderator: Người dùng này là điều hành viên @@ -2531,15 +2553,7 @@ vi: unhide_user: Hiện Tài khoản Này delete_user: Xóa Tài khoản Này confirm: Xác nhận - friends_changesets: bộ thay đổi của bạn bè - friends_diaries: mục nhật ký của bạn bè - nearby_changesets: bộ thay đổi của người dùng ở gần - nearby_diaries: mục nhật ký của người dùng ở gần report: Báo cáo Người dùng này - popup: - your location: Vị trí của bạn - nearby mapper: Người vẽ bản đồ ở gần - friend: Người bạn account: title: Chỉnh sá»­a tài khoản my settings: Tùy chọn diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 7613e3113..d59292262 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,4 +1,4 @@ -# Messages for Simplified Chinese (中文（简体）‎) +# Messages for Simplified Chinese (中文（简体）) # Exported from translatewiki.net # Export driver: phpyaml # Author: )8 @@ -31,6 +31,7 @@ # Author: Ken418 # Author: Koalberry # Author: Lakejason0 +# Author: Lantx # Author: LaoShuBaby # Author: Lepus # Author: Liangent @@ -48,6 +49,7 @@ # Author: SkyEye FAST # Author: StephDC # Author: TianyinLee +# Author: TsuyaMarisa # Author: Vikarna # Author: VulpesVulpes825 # Author: WQL @@ -56,6 +58,7 @@ # Author: Xiaomingyan # Author: Yfdyh000 # Author: Zazzzz +# Author: Zfshuo # Author: Zhang8569 # Author: 乌拉跨氪 # Author: 予弦 @@ -484,6 +487,26 @@ zh-CN: title_particular: 'OpenStreetMap 变更集 #%{changeset_id} 讨论' timeout: sorry: 抱歉，您所请求的变更集评论时间区间过长。 + dashboards: + contact: + km away: '%{count}千米外' + m away: '%{count}米外' + popup: + your location: 您的位置 + nearby mapper: 附近绘图者 + friend: 朋友 + show: + title: 我的综合面板 + no_home_location_html: '%{edit_profile_link}并设定你的家庭地址来查看附近的用户。' + edit_your_profile: 编辑你的档案 + my friends: 我的朋友 + no friends: 您还没有添加任何好友。 + nearby users: 其他附近的用户 + no nearby users: 附近没有在进行制图的用户。 + friends_changesets: 朋友的变更集 + friends_diaries: 朋友的日记文章 + nearby_changesets: 附近用户的变更集 + nearby_diaries: 附近用户的日记文章 diary_entries: new: title: 新日记文章 @@ -520,7 +543,7 @@ zh-CN: posted_by_html: '%{link_user}在%{created}用%{language_link}发布' updated_at_html: 最后一次更新于%{updated}。 comment_link: 评论该文章 - reply_link: 向作者发送信息 + reply_link: 向作者发送消息 comment_count: zero: 没有评论 one: '%{count} 个评论' @@ -676,6 +699,7 @@ zh-CN: loading_dock: 装卸码头 love_hotel: 爱情旅馆 marketplace: 商场 + mobile_money_agent: 移动货币代理 monastery: 修道院 money_transfer: 汇款处 motorcycle_parking: 摩托车停车场 @@ -816,6 +840,7 @@ zh-CN: window_construction: 窗户施工 winery: 酿酒厂 "yes": 工艺品店 + crossing: 十字路口 emergency: ambulance_station: 救护站 assembly_point: 集合地点 @@ -1069,6 +1094,7 @@ zh-CN: hill: 希尔地貌 hot_spring: 温泉 island: 岛 + isthmus: 地峡 land: 陆地 marsh: 沼泽 moor: 停泊区 @@ -1083,10 +1109,13 @@ zh-CN: sand: 沙滩 scree: 岩屑堆 scrub: 灌木丛 + shingle: 鹅卵石 spring: 泉 stone: 石 strait: 海峡 tree: 树 + tree_row: 树列 + tundra: 苔原 valley: 山谷 volcano: 火山 water: æ°´ @@ -1483,8 +1512,9 @@ zh-CN: intro_header: 欢迎访问 OpenStreetMap！ intro_text: OpenStreetMap 是一个世界地图，由像您一样的人们所构筑，可依据开放许可协议自由使用。 intro_2_create_account: 创建用户账户 - hosting_partners_html: 主机由%{ucl}、%{bytemark}，以及其他%{partners}所支持。 + hosting_partners_html: 主机由%{ucl}、%{fastly}、%{bytemark}，以及其他%{partners}所支持。 partners_ucl: 伦敦大学学院 + partners_fastly: 快速的 partners_bytemark: Bytemark主机 partners_partners: 合作伙伴 tou: 使用条款 @@ -1515,7 +1545,7 @@ zh-CN: message_notification: subject: '[OpenStreetMap] %{message_title}' hi: 您好，%{to_user}： - header: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的信息：' + header: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的私信：' header_html: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的信息：' footer: 您也可以在%{readurl}阅读此消息并在%{replyurl}向作者发送信息 footer_html: 您还可以在%{readurl}阅读这条信息并在%{replyurl}向作者发送信息 @@ -1594,6 +1624,7 @@ zh-CN: commented_changeset: '%{commenter}在%{time}对你监视的%{changeset_author}创建的变更集留下评论' commented_changeset_html: '%{commenter}于%{time}在您监视的由%{changeset_author}创建的一个地图变更集中留下评论' partial_changeset_with_comment: 带评论“%{changeset_comment}” + partial_changeset_with_comment_html: 带有评论“%{changeset_comment}” partial_changeset_without_comment: 没有评论 details: 更多关于变更集的详细信息可以在 %{url} 找到。 details_html: 更多有关变更集的详细信息，请参见 %{url}。 @@ -1641,13 +1672,13 @@ zh-CN: reply_button: 回复 destroy_button: 删除 new: - title: 发信息 + title: 发消息 send_message_to_html: 发送新信息给%{name} subject: 主题 body: 正文 back_to_inbox: 返回收件箱 create: - message_sent: 信息已发出 + message_sent: 消息已发出 limit_exceeded: 您刚发送了很多消息。在尝试发送其他消息之前，请稍等一会儿。 no_such_message: title: 无此消息 @@ -1789,6 +1820,8 @@ zh-CN: logout_button: 退出 shared: markdown_help: + title_html: 使用 kramdown + 解析 headings: 标题 heading: 标题 subheading: 副标题 @@ -1856,9 +1889,8 @@ zh-CN: href="https://www.openstreetmap.org/copyright">此版权页以注明。另外，若您要以数据形式发布 OSM，您可以属名并直接链接协议。若某些媒介无法进行链接(如印刷品)，我们建议您引导您的读者至 openstreetmap.org (或 OpenStreetMap 的完整网址)、opendatacommons.org，及可能相关的 creativecommons.org。 - credit_3_1_html: |- - 在 www.openstreetmap.org 上的“标准样式”地图图块是由 OpenStreetMap 基金会使用基于开放数据库授权的的 OpenStreetMap 数据制作的作品。如果您有使用这些图块，请使用以下署名： - “基础地图和数据来自 OpenStreetMap 和 OpenStreetMap 基金会”。 + credit_3_1_html: 在 www.openstreetmap.org 上的“标准样式”地图图块是由 OpenStreetMap + 基金会使用基于开放数据库授权的的 OpenStreetMap 数据制作的作品。使用此地图样式时，需要与地图数据具有相同的署名。 credit_4_html: |- 对于可浏览的电子地图，标记会出现在地图的右下角。 例如： @@ -1880,8 +1912,8 @@ zh-CN: Vorarlberg及 Land Tirol (修订的 CC-BY AT协议)的数据。 contributors_au_html: |- - 澳大利亚：包含来自 - PSMA 澳大利亚有限公司是的资料，依据CC BY 4.0 国际澳大利亚联邦条款授权。 + 澳大利亚：使用行政边界纳入或开发© + Geoscape澳大利亚依据知识共享署名4.0国际许可协议（CC BY 4.0）由澳大利亚联邦条款授权。 contributors_ca_html: 加拿大：含有来自GeoBase®ï¼ŒGeoGratis（© 加拿大自然资源部），CanVec（© 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。 contributors_fi_html: 芬兰：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 对不起，您的帐户已因可疑 @@ -2609,7 +2627,7 @@ zh-CN: time_future: 此封禁将于 %{time} 结束。 past: 此封禁已在%{time}结束，现在不能撤销。 confirm: 您确定要撤销该封禁？ - revoke: 撤销！ + revoke: 撤销 flash: 该封禁已经被撤销。 helper: time_future_html: 结束于 %{time}。 @@ -2648,7 +2666,7 @@ zh-CN: status: 状态 show: 显示 edit: 编辑 - revoke: 撤销！ + revoke: 撤销 confirm: 您确定吗？ reason: 封禁的原因： back: 查看所有封禁 @@ -2658,7 +2676,7 @@ zh-CN: not_revoked: (未撤销) show: 显示 edit: 编辑 - revoke: 撤销！ + revoke: 撤销 blocks: display_name: 封禁的用户 creator_name: 创建者 @@ -2690,9 +2708,10 @@ zh-CN: short_link: 短链接 geo_uri: Geo URI embed: HTML - custom_dimensions: 设定自定义尺寸 + custom_dimensions: 设定自定义区域 format: 格式： scale: 比例： + image_dimensions: 将以%{width} x %{height}的尺寸按标准图层输出图像 download: 下载 short_url: 短URL include_marker: 包含标记 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 8478c9b41..24cb564da 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1,4 +1,4 @@ -# Messages for Traditional Chinese (中文（繁體）‎) +# Messages for Traditional Chinese (中文（繁體）) # Exported from translatewiki.net # Export driver: phpyaml # Author: A Retired User @@ -456,6 +456,26 @@ zh-TW: title_particular: OpenStreetMap 變更集 %{changeset_id} 討論 timeout: sorry: 很抱歉，您請求的變更集評論過長無法讀取 + dashboards: + contact: + km away: '%{count} 公里遠' + m away: '%{count} 公尺遠' + popup: + your location: 您的位置 + nearby mapper: 附近的製圖者 + friend: 好友 + show: + title: 我的功能面板 + no_home_location_html: '%{edit_profile_link}並編輯您的家位置，來查看附近的使用者。' + edit_your_profile: 編輯您的個人檔案 + my friends: 我的好友 + no friends: 您尚未加入任何好友。 + nearby users: 其他附近的使用者 + no nearby users: 附近沒有已加入製圖的使用者。 + friends_changesets: 好友的變更集 + friends_diaries: 好友的日記項目 + nearby_changesets: 附近使用者的變更集 + nearby_diaries: 附近使用者的日記項目 diary_entries: new: title: 新日記項目 @@ -789,6 +809,7 @@ zh-TW: window_construction: 窗戶建設 winery: 酒廠 "yes": 工藝品店 + crossing: 路口 emergency: access_point: 進入點 ambulance_station: 急救站 @@ -1044,6 +1065,7 @@ zh-TW: hill: 小山 hot_spring: 溫泉 island: 島嶼 + isthmus: 地峽 land: 陸地 marsh: 河川濕地 moor: 停泊處 @@ -1058,10 +1080,13 @@ zh-TW: sand: 沙地 scree: 碎石堆 scrub: 灌木 + shingle: 礫石 spring: 泉 stone: 巨石 strait: 海峡 tree: 樹木 + tree_row: 行列樹木 + tundra: 苔原 valley: 谷地 volcano: 火山 water: æ°´ @@ -1459,8 +1484,9 @@ zh-TW: intro_header: 歡迎來到 OpenStreetMap！ intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。 intro_2_create_account: 建立使用者帳號 - hosting_partners_html: 主機由%{ucl}、%{bytemark}，和其他%{partners}所支援。 + hosting_partners_html: 由%{ucl}、%{fastly}、%{bytemark}，和其他%{partners}支援託管。 partners_ucl: 倫敦大學學院 + partners_fastly: Fastly partners_bytemark: Bytemark 主機代管 partners_partners: 合作夥伴 tou: 使用條款 @@ -1872,8 +1898,8 @@ zh-TW: Vorarlberg及 Land Tirol (修訂的CC-BY AT授權) 的資料。 contributors_au_html: |- - 澳大利亞：包含來自 - PSMA 澳大利亞有限公司的資料來源，並依據姓名標示 4.0 國際澳大利亞聯邦條款授權。 + 澳大利亞：使用行政區劃納入或開發© + Geoscape 澳大利亞是依據姓名標示 4.0 國際（CC BY 4.0）澳大利亞聯邦條款授權。 contributors_ca_html: |- 加拿大：包含來自 GeoBase®ï¼ŒGeoGratis (© Department of Natural Resources Canada) ，CanVec (© Department of Natural @@ -2443,6 +2469,7 @@ zh-TW: my settings: 我的設定值 my comments: 我的評論 my_preferences: 我的偏好設定 + my_dashboard: 我的功能面板 blocks on me: 對我的封鎖 blocks by me: 我所設的封鎖 edit_profile: 編輯個人資料 @@ -2464,14 +2491,6 @@ zh-TW: spam score: 垃圾郵件分數： description: 說明 user location: 使用者位置 - no_home_location_html: '%{edit_profile_link}並編輯您的家位置，來查看附近的使用者。' - edit_your_profile: 編輯您的個人檔案 - my friends: 我的好友 - no friends: 您尚未加入任何好友。 - km away: '%{count} 公里遠' - m away: '%{count} 公尺遠' - nearby users: 其他附近的使用者 - no nearby users: 附近沒有已加入製圖的使用者。 role: administrator: 這個使用者是一個管理員 moderator: 這個使用者是一個仲裁員 @@ -2492,15 +2511,7 @@ zh-TW: unhide_user: 取消隱藏這位使用者 delete_user: 刪除這位使用者 confirm: 確認 - friends_changesets: 好友的變更集 - friends_diaries: 好友的日記項目 - nearby_changesets: 附近使用者的變更集 - nearby_diaries: 附近使用者的日記項目 report: 回報此使用者 - popup: - your location: 您的位置 - nearby mapper: 附近的製圖者 - friend: 好友 account: title: 編輯帳號 my settings: 我的設定值 diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index a30d03c8d..f715296d2 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -1,4 +1,4 @@ -# Messages for Chinese (Hong Kong) (中文（香港）‎) +# Messages for Chinese (Hong Kong) (中文（香港）) # Exported from translatewiki.net # Export driver: phpyaml # Author: C933103 @@ -239,6 +239,10 @@ zh-hk: no_more_area: 此區域沒有更多變更集。 no_more_user: 此用戶沒有更多變更集。 load_more: 載入更多 + dashboards: + show: + nearby users: 其他附近的用戶 + no nearby users: 附近還沒有已加入製圖的用戶。 diary_entries: form: location: 位置： @@ -815,8 +819,6 @@ zh-hk: show: my settings: 我的設定 user location: 用戶位置 - nearby users: 其他附近的用戶 - no nearby users: 附近還沒有已加入製圖的用戶。 report: 舉報此用戶 account: my settings: 我的設定 diff --git a/config/routes.rb b/config/routes.rb index dc10818b9..f4c19f88c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -240,6 +240,7 @@ OpenStreetMap::Application.routes.draw do match "/user/:display_name/account" => "users#account", :via => [:get, :post], :as => "user_account" post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user + resource :dashboard, :only => [:show] resource :preferences, :only => [:show, :edit, :update] resource :profile, :only => [:edit, :update] diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 8e8f4c185..f3de0682b 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -1428,7 +1428,6 @@ module Api get changeset_download_path(changeset) assert_response :success - assert_template nil # print @response.body # FIXME: needs more assert_select tests assert_select "osmChange[version='#{Settings.api_version}'][generator='#{Settings.generator}']" do diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index e85bc86f8..8fc19145c 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -187,6 +187,15 @@ module Api check_current_version(node_with_versions) end + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_xml_format + old_node = create(:old_node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i) + + get api_node_history_path(:id => old_node.node_id, :version => old_node.version) + assert_match(/lat="0.0000400"/, response.body) + assert_match(/lon="0.0000800"/, response.body) + end + ## # test the redaction of an old version of a node, while not being # authorised. diff --git a/test/controllers/api/tracepoints_controller_test.rb b/test/controllers/api/tracepoints_controller_test.rb index a904e8127..7d561522c 100644 --- a/test/controllers/api/tracepoints_controller_test.rb +++ b/test/controllers/api/tracepoints_controller_test.rb @@ -148,5 +148,14 @@ module Api assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}" end end + + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_xml_format + create(:tracepoint, :latitude => (0.00004 * GeoRecord::SCALE).to_i, :longitude => (0.00008 * GeoRecord::SCALE).to_i) + + get trackpoints_path(:bbox => "0,0,0.1,0.1") + assert_match(/lat="0.0000400"/, response.body) + assert_match(/lon="0.0000800"/, response.body) + end end end diff --git a/test/controllers/dashboards_controller_test.rb b/test/controllers/dashboards_controller_test.rb new file mode 100644 index 000000000..5073df8cc --- /dev/null +++ b/test/controllers/dashboards_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +class DashboardsControllerTest < ActionDispatch::IntegrationTest + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/dashboard", :method => :get }, + { :controller => "dashboards", :action => "show" } + ) + end + + def test_show_no_friends + user = create(:user) + session_for(user) + + get dashboard_path + end + + def test_show_with_friends + user = create(:user, :home_lon => 1.1, :home_lat => 1.1) + friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) + create(:friendship, :befriender => user, :befriendee => friend_user) + create(:changeset, :user => friend_user) + session_for(user) + + get dashboard_path + + # Friends should be visible as we're now logged in + assert_select "div#friends-container" do + assert_select "div.contact-activity", :count => 1 + end + end +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 10c5c3bee..6e156375b 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -556,10 +556,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :not_found # Test a normal user - user = create(:user, :home_lon => 1.1, :home_lat => 1.1) - friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) - create(:friendship, :befriender => user, :befriendee => friend_user) - create(:changeset, :user => friend_user) + user = create(:user) get user_path(user) assert_response :success @@ -626,11 +623,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0 end - # Friends should be visible as we're now logged in - assert_select "div#friends-container" do - assert_select "div.contact-activity", :count => 1 - end - # Login as a moderator session_for(create(:moderator_user)) @@ -658,22 +650,22 @@ class UsersControllerTest < ActionDispatch::IntegrationTest get user_path(agreed_user) assert_response :success assert_select "div#userinformation" do - assert_select "p", :count => 0, :text => /Contributor terms/ + assert_select "dt", :count => 0, :text => /Contributor terms/ end get user_path(seen_user) assert_response :success # put @response.body assert_select "div#userinformation" do - assert_select "p", :count => 1, :text => /Contributor terms/ - assert_select "p", /Declined/ + assert_select "dt", :count => 1, :text => /Contributor terms/ + assert_select "dd", /Declined/ end get user_path(not_seen_user) assert_response :success assert_select "div#userinformation" do - assert_select "p", :count => 1, :text => /Contributor terms/ - assert_select "p", /Undecided/ + assert_select "dt", :count => 1, :text => /Contributor terms/ + assert_select "dd", /Undecided/ end end diff --git a/test/helpers/user_roles_helper_test.rb b/test/helpers/user_roles_helper_test.rb index dfd790a0b..9c9d31e60 100644 --- a/test/helpers/user_roles_helper_test.rb +++ b/test/helpers/user_roles_helper_test.rb @@ -12,7 +12,7 @@ class UserRolesHelperTest < ActionView::TestCase icon = role_icon(create(:moderator_user), "moderator") expected = <<~HTML.delete("\n") - + This user is a moderator HTML @@ -27,7 +27,7 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant moderator access @@ -39,7 +39,7 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Revoke moderator access @@ -56,7 +56,7 @@ class UserRolesHelperTest < ActionView::TestCase icons = role_icons(create(:moderator_user)) expected = <<~HTML.delete("\n") - + This user is a moderator HTML @@ -65,11 +65,11 @@ class UserRolesHelperTest < ActionView::TestCase icons = role_icons(create(:super_user)) expected = <<~HTML.delete("\n") - + This user is an administrator - + This user is a moderator HTML @@ -84,13 +84,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant administrator access - + Grant moderator access @@ -102,13 +102,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Grant administrator access - + Revoke moderator access @@ -120,13 +120,13 @@ class UserRolesHelperTest < ActionView::TestCase expected = <<~HTML.delete("\n") - + Revoke administrator access - + Revoke moderator access diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb index eade6130a..cc0e0d8c2 100644 --- a/test/models/old_node_test.rb +++ b/test/models/old_node_test.rb @@ -68,14 +68,6 @@ class OldNodeTest < ActiveSupport::TestCase assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001 end - # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 - def test_lat_lon_xml_format - old_node = build(:old_node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE) - - assert_match(/lat="0.0000400"/, old_node.to_xml.to_s) - assert_match(/lon="0.0000800"/, old_node.to_xml.to_s) - end - def test_node_tags node_v1 = create(:old_node, :version => 1) node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2) diff --git a/test/models/tracepoint_test.rb b/test/models/tracepoint_test.rb index a672b7c62..2ffbef09f 100644 --- a/test/models/tracepoint_test.rb +++ b/test/models/tracepoint_test.rb @@ -7,12 +7,4 @@ class TracepointTest < ActiveSupport::TestCase tracepoint.timestamp = nil assert_not tracepoint.valid? end - - # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 - def test_lat_lon_xml_format - tracepoint = build(:tracepoint, :latitude => 0.00004 * GeoRecord::SCALE, :longitude => 0.00008 * GeoRecord::SCALE) - - assert_match(/lat="0.0000400"/, tracepoint.to_xml_node.to_s) - assert_match(/lon="0.0000800"/, tracepoint.to_xml_node.to_s) - end end diff --git a/test/system/confirmation_resend.rb b/test/system/confirmation_resend_test.rb similarity index 100% rename from test/system/confirmation_resend.rb rename to test/system/confirmation_resend_test.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 6c8a798aa..421ae8698 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -264,14 +264,14 @@ module ActiveSupport el = XML::Node.new "node" el["id"] = node.id.to_s - OMHelper.add_metadata_to_xml_node(el, node, {}, {}) + add_metadata_to_xml_node(el, node, {}, {}) if node.visible? el["lat"] = node.lat.to_s el["lon"] = node.lon.to_s end - OMHelper.add_tags_to_xml_node(el, node.node_tags) + add_tags_to_xml_node(el, node.node_tags) el end @@ -286,7 +286,7 @@ module ActiveSupport el = XML::Node.new "way" el["id"] = way.id.to_s - OMHelper.add_metadata_to_xml_node(el, way, {}, {}) + add_metadata_to_xml_node(el, way, {}, {}) # make sure nodes are output in sequence_id order ordered_nodes = [] @@ -302,7 +302,7 @@ module ActiveSupport el << node_el end - OMHelper.add_tags_to_xml_node(el, way.way_tags) + add_tags_to_xml_node(el, way.way_tags) el end @@ -317,7 +317,7 @@ module ActiveSupport el = XML::Node.new "relation" el["id"] = relation.id.to_s - OMHelper.add_metadata_to_xml_node(el, relation, {}, {}) + add_metadata_to_xml_node(el, relation, {}, {}) relation.relation_members.each do |member| member_el = XML::Node.new "member" @@ -327,13 +327,49 @@ module ActiveSupport el << member_el end - OMHelper.add_tags_to_xml_node(el, relation.relation_tags) + add_tags_to_xml_node(el, relation.relation_tags) el end - class OMHelper - extend ObjectMetadata + def add_metadata_to_xml_node(el, osm, changeset_cache, user_display_name_cache) + el["changeset"] = osm.changeset_id.to_s + el["redacted"] = osm.redaction.id.to_s if osm.redacted? + el["timestamp"] = osm.timestamp.xmlschema + el["version"] = osm.version.to_s + el["visible"] = osm.visible.to_s + + if changeset_cache.key?(osm.changeset_id) + # use the cache if available + else + changeset_cache[osm.changeset_id] = osm.changeset.user_id + end + + user_id = changeset_cache[osm.changeset_id] + + if user_display_name_cache.key?(user_id) + # use the cache if available + elsif osm.changeset.user.data_public? + user_display_name_cache[user_id] = osm.changeset.user.display_name + else + user_display_name_cache[user_id] = nil + end + + unless user_display_name_cache[user_id].nil? + el["user"] = user_display_name_cache[user_id] + el["uid"] = user_id.to_s + end + end + + def add_tags_to_xml_node(el, tags) + tags.each do |tag| + tag_el = XML::Node.new("tag") + + tag_el["k"] = tag.k + tag_el["v"] = tag.v + + el << tag_el + end end end end diff --git a/yarn.lock b/yarn.lock index 15b11abd4..350ccbf85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -93,9 +93,9 @@ ansi-colors@^3.2.1: integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -548,9 +548,9 @@ jquery-simulate@^1.0.2: integrity sha512-Bq610fSrwTwvH5d06z5oskYaX/79s0BNrKiJZjZOiXRib3iL4ZkSn/wvLwzhf3P9KeXCEpk9wlIaGui/1arOpQ== js-cookie@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.0.tgz#db1661d5459920ec95aaf186ccf74ceb4a495164" - integrity sha512-oUbbplKuH07/XX2YD2+Q+GMiPpnVXaRz8npE7suhBH9QEkJe2W7mQ6rwuMXHue3fpfcftQwzgyvGzIHyfCSngQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414" + integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== js-tokens@^4.0.0: version "4.0.0"