From: Tom Hughes Date: Thu, 24 Jun 2021 07:43:18 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3177' X-Git-Tag: live~2603 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d76be71bbb8a799cbf0627dee170f26ade5a11f?hp=8e19f2c7f0a216fa1f1e2d20ccd5791379fbbb50 Merge remote-tracking branch 'upstream/pull/3177' --- diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4bf0f5f57..d718dcfa7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,4 +33,5 @@ jobs: curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island' - name: Test Complete Suite run: | - docker-compose run --rm web bundle exec rails test:db + docker-compose run --rm web bundle exec rails db:test:prepare + docker-compose run --rm web bundle exec rails test:all diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f452d8445..aa9de33e2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -41,7 +41,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -65,14 +65,14 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-${{ env.os }}-${{ env.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: node_modules key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }} @@ -100,7 +100,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ee2a85862..d6a06b549 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: ubuntu: [18.04, 20.04] - ruby: [2.5, 2.7, 3.0] + ruby: [2.7, 3.0] runs-on: ubuntu-${{ matrix.ubuntu }} env: RAILS_ENV: test @@ -21,14 +21,14 @@ jobs: with: ruby-version: ${{ matrix.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: node_modules key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} @@ -66,7 +66,7 @@ jobs: - name: Install node modules run: bundle exec rake yarn:install - name: Run tests - run: bundle exec rake test:db + run: bundle exec rails test:all - name: Report completion to Coveralls uses: coverallsapp/github-action@v1.1.2 with: diff --git a/.rubocop.yml b/.rubocop.yml index 628589d69..aa60df305 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ require: - rubocop-rake AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 NewCops: enable Exclude: - 'vendor/**/*' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e922a4b79..a0b57f586 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -19,7 +19,7 @@ require: # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: - Max: 254 + Max: 270 # Offense count: 36 # Configuration parameters: AllowSafeAssignment. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 568566c17..474c80b4f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ functionality. You can run the existing test suite with: ``` -bundle exec rake test +bundle exec rails test:all ``` You can view test coverage statistics by browsing the `coverage` directory. diff --git a/DOCKER.md b/DOCKER.md index ce0430939..1def8b1cb 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -56,7 +56,7 @@ Run the Rails database migrations: Run the test suite by running: - docker-compose run --rm web bundle exec rake test:db + docker-compose run --rm web bundle exec rails test:all ### Loading an OSM extract diff --git a/Gemfile.lock b/Gemfile.lock index 1effb0b34..d7b7f441e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,19 +74,19 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.2) - autoprefixer-rails (10.2.5.0) - execjs (< 2.8.0) + autoprefixer-rails (10.2.5.1) + execjs (> 0) aws-eventstream (1.1.1) - aws-partitions (1.457.0) - aws-sdk-core (3.114.0) + aws-partitions (1.470.0) + aws-sdk-core (3.114.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.43.0) + aws-sdk-kms (1.44.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.1) + aws-sdk-s3 (1.96.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -115,12 +115,12 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (5.0.1) + brakeman (5.0.4) browser (5.3.1) builder (3.2.4) bzip2-ffi (1.1.0) ffi (~> 1.0) - cancancan (3.2.1) + cancancan (3.3.0) canonical-rails (0.2.11) rails (>= 4.1, < 6.2) capybara (3.35.3) @@ -135,7 +135,7 @@ GEM coderay (1.1.3) composite_primary_keys (13.0.0) activerecord (~> 6.1.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) @@ -158,10 +158,10 @@ GEM dry-configurable (0.12.1) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) - dry-container (0.7.2) + dry-container (0.8.0) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.5.0) + dry-core (0.6.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) @@ -198,23 +198,27 @@ GEM rubocop smart_properties erubi (1.10.0) - execjs (2.7.0) + execjs (2.8.1) exifr (1.3.9) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.4.1) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) - ffi (1.15.0) + ffi (1.15.3) ffi-libarchive (1.0.17) ffi (~> 1.0) fspath (3.1.2) @@ -229,7 +233,7 @@ GEM http_accept_language (2.1.1) i18n (1.8.10) concurrent-ruby (~> 1.0) - i18n-js (3.8.2) + i18n-js (3.8.3) i18n (>= 0.6.6) image_optim (0.30.0) exifr (~> 1.2, >= 1.2.2) @@ -255,7 +259,7 @@ GEM thor (>= 0.14, < 2.0) json (2.5.1) jwt (2.2.3) - kgio (2.11.3) + kgio (2.11.4) kramdown (2.3.1) rexml libxml-ruby (3.2.1) @@ -265,7 +269,7 @@ GEM logstasher (2.1.5) activesupport (>= 5.2) request_store - loofah (2.9.1) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -275,14 +279,14 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.14.4) msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.7) - nokogiri (1.11.4) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.5) @@ -339,7 +343,7 @@ GEM popper_js (1.16.0) progress (3.6.0) public_suffix (4.0.6) - puma (5.3.1) + puma (5.3.2) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -399,23 +403,23 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.15.0) + rubocop (1.17.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.7.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) + rubocop-ast (1.7.0) parser (>= 3.0.1.1) - rubocop-minitest (0.12.1) + rubocop-minitest (0.13.0) rubocop (>= 0.90, < 2.0) rubocop-performance (1.11.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.10.1) + rubocop-rails (2.11.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -458,7 +462,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.6) + strong_migrations (0.7.7) activerecord (>= 5) thor (1.1.0) tilt (2.0.10) @@ -474,7 +478,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) diff --git a/INSTALL.md b/INSTALL.md index c8811fc3f..c317c8a9d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -48,9 +48,9 @@ For Fedora, you can install the minimum requirements with: ``` sudo dnf install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ - libxml2-devel js \ + libxml2-devel nodejs \ gcc gcc-c++ git \ - postgresql postgresql-server postgresql-contrib \ + postgresql postgresql-server postgresql-contrib libpq-devel \ perl-podlators ImageMagick libffi-devel gd-devel libarchive-devel \ bzip2-devel nodejs-yarn ``` @@ -219,7 +219,7 @@ bundle exec rake db:migrate To ensure that everything is set up properly, you should now run: ``` -bundle exec rake test:db +bundle exec rails test:all ``` This test will take a few minutes, reporting tests run, assertions, and any errors. If you receive no errors, then your installation is successful. diff --git a/VAGRANT.md b/VAGRANT.md index ff4cb5737..ed84eed57 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -32,7 +32,7 @@ Within this login shell, you can do development, run the server or the tests. Fo ``` cd /srv/openstreetmap-website/ -rake test +bundle exec rails test:all ``` To access the web pages you run the following commands then access the site in your [local browser](http://localhost:3000): @@ -40,7 +40,7 @@ To access the web pages you run the following commands then access the site in y ``` vagrant ssh cd /srv/openstreetmap-website/ -rails server --binding=0.0.0.0 +bundle exec rails server --binding=0.0.0.0 ``` You edit the code on your computer using the code editor you are used to using, then through shared folders the code is updated on the VM instantly. diff --git a/app/assets/images/banners/banner_community_survey_200124.png b/app/assets/images/banners/banner_community_survey_200124.png deleted file mode 100644 index 2664ca860..000000000 Binary files a/app/assets/images/banners/banner_community_survey_200124.png and /dev/null differ diff --git a/app/assets/images/banners/sotm_2021.png b/app/assets/images/banners/sotm_2021.png new file mode 100644 index 000000000..52d34ba9b Binary files /dev/null and b/app/assets/images/banners/sotm_2021.png differ diff --git a/app/assets/images/key/cyclemap/cycleway_regional.png b/app/assets/images/key/cyclemap/cycleway_regional.png index 7e3306e46..92249992e 100644 Binary files a/app/assets/images/key/cyclemap/cycleway_regional.png and b/app/assets/images/key/cyclemap/cycleway_regional.png differ diff --git a/app/assets/images/key/cyclemap/cycleway_regional13.png b/app/assets/images/key/cyclemap/cycleway_regional13.png index 9b3409fdf..519570454 100644 Binary files a/app/assets/images/key/cyclemap/cycleway_regional13.png and b/app/assets/images/key/cyclemap/cycleway_regional13.png differ diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg deleted file mode 100644 index b0bbdef73..000000000 --- a/app/assets/images/yahoo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 07ad64def..b6a388d81 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -55,12 +55,12 @@ OSM.initializeBrowse = function (map) { .text(I18n.t("browse.start_rjs.load_data")) .prepend($("").click(cancel))) .append( - $("
") + $("
") .append( $("

") .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))) .append( - $("") + $("") .val(I18n.t("browse.start_rjs.load_data")) .click(add)))); } diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 18466864b..5040e7f3e 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -256,7 +256,7 @@ OSM.Directions = function (map) { var html = "

" + "" + I18n.t("javascripts.directions.directions") + - "

" + + "

" + I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " + I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."; if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { @@ -264,7 +264,7 @@ OSM.Directions = function (map) { I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " + I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."; } - html += "

"; + html += "

"; $("#sidebar_content") .html(html); @@ -312,7 +312,7 @@ OSM.Directions = function (map) { $("#turnbyturn").append(row); }); - $("#sidebar_content").append("

" + + $("#sidebar_content").append("

" + I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) + "

"); diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 411e6167b..736125bed 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -362,6 +362,10 @@ body.compact-nav { display: none; } + #sidebar_content { + padding: $spacer; + } + > div { position: relative; float: left; @@ -370,7 +374,6 @@ body.compact-nav { } h2 { - padding: $lineheight $lineheight $lineheight/2; font-size: 1.5rem; } @@ -676,6 +679,10 @@ body.compact-nav { margin-left: auto; margin-right: auto; } + + > div { + padding: $spacer; + } } #sidebar { @@ -739,13 +746,6 @@ header .search_forms, /* Rules for routing */ -#sidebar_content>table { - padding: 5px 20px 10px 15px; - width: 100%; - border-collapse: separate; - border-spacing: 0; -} - div.direction { background-image: image-url('routing-sprite.png'); width: 20px; @@ -756,10 +756,6 @@ div.direction { div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; } } -p#routing_summary { - padding: 0 $lineheight $lineheight/4; -} - td.instruction, td.distance { padding-top: $lineheight/5; padding-bottom: $lineheight/5; @@ -821,7 +817,8 @@ tr.turn:hover { #sidebar_content { .browse-section { - padding: $lineheight/2 $lineheight; + padding-bottom: $spacer; + margin-bottom: $spacer; border-bottom: 1px solid $grey; h4:first-child { @@ -942,17 +939,8 @@ tr.turn:hover { margin: 0 0 10px 10px; } - .query-intro p { - padding: $lineheight $lineheight $lineheight/2; - } - .query-results { display: none; - padding-bottom: $lineheight/2; - - h3 { - padding: 0 $lineheight; - } ul { li { @@ -981,8 +969,6 @@ tr.turn:hover { /* Rules for export sidebar */ .export_form { - padding: $lineheight; - .export_area_inputs, .export_button { text-align: center; @@ -1026,15 +1012,6 @@ tr.turn:hover { } } -/* Rules for the routing sidebar */ - -#sidebar_content { - #routing_credit { - text-align: center; - padding: 0.5em; - } -} - /* Rules for edit pages */ .site-edit { @@ -1427,25 +1404,6 @@ tr.turn:hover { &.notice { background-color: #CBEEA7; } - - div.message { - display: inline-block; - margin-left: $lineheight / 2; - vertical-align: middle; - - p { - margin-top: $lineheight * 0.5; - margin-bottom: $lineheight * 0.5; - - &:first-child { - margin-top: 0px; - } - - &:last-child { - margin-bottom: 0px; - } - } - } } /* Rules for highlighting fields with rails validation errors */ @@ -1578,18 +1536,6 @@ div.secondary-actions { text-align: center; } -/* Utility for managing inner content areas */ - -.inner22 { padding: $lineheight;} - -.inner12 { padding: $lineheight/2 $lineheight;} - -.inner11 { padding: $lineheight/2;} - -.inner20 { padding: $lineheight 0;} - -.inner02 { padding: 0 $lineheight;} - .buttons { min-width: 200px; input[type="submit"], diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss index 530d7b7e6..2247b4bbe 100644 --- a/app/assets/stylesheets/small.scss +++ b/app/assets/stylesheets/small.scss @@ -20,10 +20,6 @@ body.small-nav { min-height: $headerHeight; background: #fff; - h1 { - padding-bottom: 15px; - } - &.closed nav { display: none; } @@ -107,7 +103,7 @@ body.small-nav { .overlay-sidebar { #sidebar { position: absolute; - width: 300px; + width: 350px; height: auto; overflow: hidden; } diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index b77ed09b3..372ac2a70 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -66,7 +66,7 @@ class ConfirmationsController < ApplicationController flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name] else UserMailer.signup_confirm(user, user.tokens.create).deliver_later - flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email + flash[:notice] = { :partial => "confirmations/resend_success_flash", :locals => { :email => user.email, :sender => Settings.email_from } } end redirect_to login_path diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index cd3584f02..f30ece3ec 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -50,6 +50,7 @@ class IssuesController < ApplicationController # Status Transistions def resolve if @issue.resolve + @issue.updated_by = current_user.id @issue.save! redirect_to @issue, :notice => t(".resolved") else diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index 0d3a1aa33..b4853c6b8 100644 --- a/app/controllers/traces_controller.rb +++ b/app/controllers/traces_controller.rb @@ -67,7 +67,6 @@ class TracesController < ApplicationController # final helper vars for view @target_user = target_user - @display_name = target_user.display_name if target_user end def mine diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 43933041c..00d427ac9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -42,7 +42,7 @@ class UsersController < ApplicationController if current_user current_user.terms_seen = true - flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save + flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save if params[:referer] redirect_to safe_referer(params[:referer]) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ed01ad89b..faf538fa9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,7 @@ module ApplicationHelper end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end def body_class @@ -68,4 +68,14 @@ module ApplicationHelper data end + + # If the flash is a hash, then it will be a partial with a hash of locals, so we can call `render` on that + # This allows us to render html into a flash message in a safe manner. + def render_flash(flash) + if flash.is_a?(Hash) + render flash.with_indifferent_access + else + flash + end + end end diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index b91810e95..4c0236b6b 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -12,11 +12,11 @@ module ChangesetsHelper def changeset_details(changeset) if changeset.closed_at > Time.now action = :created - time = time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago') + time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago") title = l(changeset.created_at) else action = :closed - time = time_ago_in_words(changeset.closed_at, :scope => :'datetime.distance_in_words_ago') + time = time_ago_in_words(changeset.closed_at, :scope => :"datetime.distance_in_words_ago") title = safe_join([t("browse.created"), ": ", l(changeset.created_at), " ".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)]) end diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 73425edec..95b6cb600 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -26,9 +26,11 @@ module UserBlocksHelper end def block_duration_in_words(duration) + # Ensure the requested duration isn't negative, even by a millisecond + duration = 0 if duration.negative? parts = ActiveSupport::Duration.build(duration).parts if duration < 1.day - t("user_blocks.helper.block_duration.hours", :count => parts[:hours]) + t("user_blocks.helper.block_duration.hours", :count => parts.fetch(:hours, 0)) elsif duration < 1.week t("user_blocks.helper.block_duration.days", :count => parts[:days]) elsif duration < 1.month diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 79e7cc012..15231f4d0 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,6 +1,6 @@ module UserRolesHelper def role_icons(user) - safe_join(UserRole::ALL_ROLES.collect { |role| role_icon(user, role) }.compact, " ") + safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ") end def role_icon(user, role) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index ae176c321..7bbe65ec5 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -194,8 +194,7 @@ class UserMailer < ApplicationMailer avatar = user&.avatar if avatar&.attached? if avatar.variable? - image = avatar.variant(:resize_to_limit => [50, 50]).processed - image.service.download(image.key) + avatar.variant(:resize_to_limit => [50, 50]).download else avatar.blob.download end diff --git a/app/views/application/_sidebar_header.html.erb b/app/views/application/_sidebar_header.html.erb index 5413b4205..da1f6bf45 100644 --- a/app/views/application/_sidebar_header.html.erb +++ b/app/views/application/_sidebar_header.html.erb @@ -2,7 +2,7 @@

<%= title %>

-
+
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 3748f2f65..356207754 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -4,7 +4,7 @@

- <% if common_details.changeset.tags['comment'].present? %> + <% if common_details.changeset.tags["comment"].present? %> <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> <%= t "browse.no_comment" %> @@ -13,7 +13,7 @@

<%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", - :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'), + :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"), :user => changeset_user_link(common_details.changeset), :title => l(common_details.timestamp) %> · diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 079915fcf..9ede3df32 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -2,7 +2,7 @@ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %> -
+

<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>

diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb index 1786c260f..a9937c4bc 100644 --- a/app/views/browse/new_note.html.erb +++ b/app/views/browse/new_note.html.erb @@ -2,7 +2,7 @@ <%= render "sidebar_header", :title => t("browse.note.new_note") %> -
+

<%= t("javascripts.notes.new.intro") %>

diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb index 084c247dc..36ee4c883 100644 --- a/app/views/browse/not_found.html.erb +++ b/app/views/browse/not_found.html.erb @@ -2,6 +2,6 @@ <%= render "sidebar_header", :title => t(".title") %> -
+

<%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 6dcd46e76..0180e26ca 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -2,7 +2,7 @@ <%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %> -
+

<%= t(".description") %>

<%= h(@note_comments.first.body.to_html) %> diff --git a/app/views/browse/query.html.erb b/app/views/browse/query.html.erb index 65231641c..53eca9747 100644 --- a/app/views/browse/query.html.erb +++ b/app/views/browse/query.html.erb @@ -2,14 +2,14 @@ <%= render "sidebar_header", :title => t(".title") %> -
+

<%= t(".introduction") %>

<%= t(".nearby") %>

<%= image_tag "searching.gif", :class => "loader" %> -
+
    @@ -17,7 +17,7 @@

    <%= t(".enclosing") %>

    <%= image_tag "searching.gif", :class => "loader" %> -
    +
      diff --git a/app/views/browse/timeout.html.erb b/app/views/browse/timeout.html.erb index 084c247dc..36ee4c883 100644 --- a/app/views/browse/timeout.html.erb +++ b/app/views/browse/timeout.html.erb @@ -2,6 +2,6 @@ <%= render "sidebar_header", :title => t(".title") %> -
      +

      <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>

      diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb index cb80787a7..b601057f6 100644 --- a/app/views/changesets/history.html.erb +++ b/app/views/changesets/history.html.erb @@ -13,6 +13,6 @@ <%= render "sidebar_header", :title => @heading %> -
      +
      <%= image_tag "searching.gif", :class => "loader" %>
      diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb index e9e620062..3ead2abda 100644 --- a/app/views/changesets/index.html.erb +++ b/app/views/changesets/index.html.erb @@ -9,9 +9,9 @@
      <% end -%> <% elsif params[:bbox] %> -
      <%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %>
      +

      <%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %>

      <% elsif params[:display_name] %> -
      <%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %>
      +

      <%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %>

      <% else %> -
      <%= t(params[:max_id] ? ".no_more" : ".empty") %>
      +

      <%= t(params[:max_id] ? ".no_more" : ".empty") %>

      <% end %> diff --git a/app/views/confirmations/_resend_success_flash.html.erb b/app/views/confirmations/_resend_success_flash.html.erb new file mode 100644 index 000000000..e9763e276 --- /dev/null +++ b/app/views/confirmations/_resend_success_flash.html.erb @@ -0,0 +1,2 @@ +

      <%= t ".confirmation_sent", :email => email %>

      +

      <%= t ".whitelist", :sender => sender %>

      diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb index 290fba35e..5f08f8d30 100644 --- a/app/views/diary_entries/comments.html.erb +++ b/app/views/diary_entries/comments.html.erb @@ -17,7 +17,7 @@ <% @comments.each do |comment| -%>
      "> - + <% end -%> diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 9f19be48a..8502227de 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -3,8 +3,8 @@ <%= render "sidebar_header", :title => t("site.sidebar.search_results") %> <% @sources.each do |source| %> -

      <%= t(".title.#{source}_html") %>

      -
      "> +

      <%= t(".title.#{source}_html") %>

      +
      "> <%= image_tag "searching.gif", :class => "loader" %>
      <% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9fd8f1167..0aa9fea50 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -62,10 +62,10 @@
      diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb index a4d93cc0e..cfb8d712c 100644 --- a/app/views/layouts/_content.html.erb +++ b/app/views/layouts/_content.html.erb @@ -5,7 +5,7 @@ <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> <% if content_for? :heading %>
      -
      +
      <%= yield :heading %>
      diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index 0f39c4a47..f8eabaeb3 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,29 +1,35 @@ <% if flash[:error] %> -
      - - " type="image/svg+xml" /> - <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %> - -
      <%= flash[:error] %>
      +
      +
      + + " type="image/svg+xml" /> + <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %> + +
      +
      <%= render_flash(flash[:error]) %>
      <% end %> <% if flash[:warning] %> -
      - - " type="image/svg+xml"> - <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %> - -
      <%= flash[:warning] %>
      +
      +
      + + " type="image/svg+xml"> + <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %> + +
      +
      <%= render_flash(flash[:warning]) %>
      <% end %> <% if flash[:notice] %> -
      - - " type="image/svg+xml"> - <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %> - -
      <%= flash[:notice] %>
      +
      +
      + + " type="image/svg+xml"> + <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %> + +
      +
      <%= render_flash(flash[:notice]) %>
      <% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 06823e18f..fe5bf23c5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ -
      +

      diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 0403bc889..7a0ca0ed7 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -39,9 +39,9 @@

      <% unless current_user %> -
      +
      <%= render "sidebar_header", :title => t("layouts.intro_header") %> -
      +

      <%= t "layouts.intro_text" %>

      <%= t "layouts.hosting_partners_html", :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 69ea7d8fd..fa0747c9c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -44,7 +44,6 @@ <% if Settings.key?(:wikipedia_auth_id) -%>

    • <%= auth_button "wikipedia", "wikipedia" %>
      • <% end -%> -
    • <%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %>
    • <%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %>
    • <%= auth_button "aol", "openid", :openid_url => "aol.com" %>
      • diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index d6db3908b..9cbee91da 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -30,11 +30,11 @@
      <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>
      - -

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

      -
      +

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

      + +
      <%= t ".too_large.overpass.title" %>
      <%= t ".too_large.overpass.description" %>
      diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 7dc20c203..44de2ef06 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -30,7 +30,7 @@

      - <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %> + <%= time_ago_in_words(trace.timestamp, :scope => :"datetime.distance_in_words_ago") %> <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %> <% if !trace.tags.empty? %> diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb index b38436c0a..693de7e1a 100644 --- a/app/views/traces/index.html.erb +++ b/app/views/traces/index.html.erb @@ -1,25 +1,62 @@ +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

      <%= @title %>

      -
        -
      • <%= t(".description") %>
        • -
      • <%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %>
        • -
      • <%= link_to t(".upload_trace"), new_trace_path %>
        • - <% if @tag %> -
      • <%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %>
        • -
      • <%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %>
        • - <% else %> - <% if @display_name %> -
      • <%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %>
        • +

        + <%= t(".description") %> + <% if params[:tag] %> + <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil }, { :class => "border-left ml-2 pl-2" } %> + <% end %> +

        +
          + <% if @target_user.blank? %> + +
        • + <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %> +
          • + <% if current_user %> +
        • + <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %> +
          • <% end %> + <% elsif current_user && current_user == @target_user %> +
        • + <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %> +
          • + +
        • + <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %> +
          • + <% else %> + +
        • + <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %> +
          • <% if current_user && current_user != @target_user %> -
        • <%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %>
          • +
        • + <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %> +
          • <% end %> +
        • + <%= link_to t(".public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %> +
          • <% end %> + +
        • +
        • +
          + <%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm" }) do %> + + + + <% end -%> + <%= link_to t(".upload_trace"), new_trace_path, :class => "btn btn-secondary btn-sm" %> +
          +
        <% end %> <% content_for :auto_discovery_link_tag do %> -<%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @display_name, :tag => @tag %> + <%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @target_user&.display_name, :tag => params[:tag] %> <% end %> <% if @traces.size > 0 %> diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 1899e5145..9ece75bb5 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -28,6 +28,6 @@ <% else %>

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

        <% end %> diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index a5b29411c..c7e10c060 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -21,7 +21,7 @@

        <% 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')) %> + <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %> <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %> <%= link_to(comment, { :controller => "browse", :action => "changeset", :id => changeset.id }, diff --git a/app/views/users/_terms_declined_flash.html.erb b/app/views/users/_terms_declined_flash.html.erb new file mode 100644 index 000000000..9c9d793db --- /dev/null +++ b/app/views/users/_terms_declined_flash.html.erb @@ -0,0 +1 @@ +<%= t ".terms_declined_html", :terms_declined_link => link_to(t(".terms_declined_link"), t(".terms_declined_url")) %> diff --git a/config/banners.yml b/config/banners.yml index 1b206e20d..83aaf3f7b 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -1,6 +1,6 @@ -survey_2021: - id: survey_2021 - alt: OpenStreetMap Community Survey 2021 - link: https://osmf.limequery.org/281662 - img: banners/banner_community_survey_200124.png - enddate: 2021-feb-14 +sotm_2021: + id: sotm_2021 + alt: State of the Map 2021 + link: https://2021.stateofthemap.org/ + img: banners/sotm_2021.png + enddate: 2021-jul-11 diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 9179e431f..57b89564f 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -16,7 +16,7 @@ module OAuth def unescape(value) value.to_s.gsub(/%\h{2}/) do |c| - c[1..-1].to_i(16).chr + c[1..].to_i(16).chr end.force_encoding(Encoding::UTF_8) end end @@ -52,12 +52,12 @@ module OpenStreetMap module ClassMethods def included(controller) controller.class_eval do - def self.before_filter(*names, &blk) - before_action(*names, &blk) + def self.before_filter(...) + before_action(...) end - def self.skip_before_filter(*names, &blk) - skip_before_action(*names, &blk) + def self.skip_before_filter(...) + skip_before_action(...) end end diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index c97762a37..f09759fa6 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -26,8 +26,13 @@ csp_policy[:img_src] << Settings.storage_url if Settings.key?(:storage_url) csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_url) +cookie_policy = { + :httponly => { :only => ["_osm_session"] } +} + SecureHeaders::Configuration.default do |config| config.hsts = SecureHeaders::OPT_OUT + config.referrer_policy = "strict-origin-when-cross-origin" if Settings.csp_enforce config.csp = csp_policy @@ -39,4 +44,6 @@ SecureHeaders::Configuration.default do |config| config.csp = SecureHeaders::OPT_OUT config.csp_report_only = SecureHeaders::OPT_OUT end + + config.cookies = cookie_policy end diff --git a/config/locales/README b/config/locales/README index e8dc83288..136afb014 100644 --- a/config/locales/README +++ b/config/locales/README @@ -5,9 +5,9 @@ Do NOT edit any translations in here, please use translatewiki.net instead. The only file in this directory that should be edited by hand is en.yml, when localisation strings change or new translations are introduced. All other languages _need_ to be edited using translatewiki.net. Please make sure that you -run the tests using *rake test* to make sure that there are no errors, as there -is at least one test that makes sure that all translations are valid (we'll -makes sure that they won't cause the site to not work). +run the tests using *bundle exec rails test:all* to make sure that there are no +errors, as there is at least one test that makes sure that all translations are +valid (we'll makes sure that they won't cause the site to not work). There is more information about translating the website on the wiki at http://wiki.openstreetmap.org/wiki/Website_Internationalization. diff --git a/config/locales/af.yml b/config/locales/af.yml index e0bfdfb05..8fd0139a2 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -14,6 +14,8 @@ af: formats: friendly: '%e %B %Y om %H:%M' helpers: + file: + prompt: Lêer kies submit: diary_comment: create: Stoor @@ -26,7 +28,7 @@ af: create: Stuur client_application: create: Registreer - update: Redigeer + update: Opdateer redaction: create: Skep redaksie update: Stoor redaksie @@ -40,7 +42,7 @@ af: errors: messages: invalid_email_address: dit lyk nie of dit 'n geldige e-posadres is nie - email_address_not_routable: kan nie geruil word nie + email_address_not_routable: is nie aanstuurbaar nie models: acl: Toegangsbeheerlys changeset: Wysigingstel @@ -49,6 +51,7 @@ af: diary_comment: Dagboekopmerking diary_entry: Dagboekinskrywing friend: Vriend + issue: Probleem language: Taal message: Boodskap node: Knooppunt @@ -77,7 +80,17 @@ af: way_tag: Weg-merker attributes: client_application: + name: Naam (verplig) + url: Hoof-URL van toepassing (verplig) + callback_url: Callback-URL support_url: Ondersteunings-URL + allow_read_prefs: lees hul gebruikersvoorkeure + allow_write_prefs: verander hul gebruikersvoorkeure + allow_write_diary: skep dagboekinskrywings, lewer kommentaar en ontmoet vriende + allow_write_api: die kaart wysig + allow_read_gpx: lees hul privaat GPS-spore + allow_write_gpx: laai GPS-spore op + allow_write_notes: wysig notas diary_comment: body: Teks diary_entry: @@ -92,7 +105,7 @@ af: trace: user: Gebruiker visible: Sigbaar - name: Naam + name: Spoornaam size: Grootte latitude: Breedtegraad longitude: Lengtegraad @@ -106,22 +119,41 @@ af: title: Onderwerp body: Teks recipient: Ontvanger + redaction: + title: Titel + description: Beskrywing report: + category: 'Kies ''n rede vir u verslag:' details: Verskaf asseblief meer besonderhede oor die probleem (verlang). user: + auth_provider: Verifikasie verskaffer + auth_uid: Verifikasie UID email: E-pos + email_confirmation: Emailbevestiging new_email: 'Nuwe e-posadres:' active: Bedrywig display_name: Skermnaam - description: Beskrywing + description: 'Profielbeskrywing:' home_lat: 'Breedtegraad:' home_lon: 'Lengtegraad:' - languages: Tale + languages: 'Voorkeurtale:' + preferred_editor: Voorkeurprogram vir kaart redigering pass_crypt: Wagwoord + pass_crypt_confirmation: Bevestig wagwoord help: trace: tagstring: komma afgebaken + user_block: + reason: Die red hoekom die gebruiker geblokkeer word. Bly kalm en redelik + en gee soveel moontlike details oor die situasie. Dié berig is vir enigiemand + sigbaar. Hou in gedagte dat nie alle gebruikers die gemeenskapsterme begryp + nie, sp probeer leketaal gebruik sover moontlik. + needs_view: Moet die gebruiker aanmeld voordat dié versperring verwyder word? user: + email_confirmation: U adres word nie openbaar gemaak nie; raadpleeg ons privaatheidsbeleid + vir verdere inligting. new_email: (word nooit openbaar vertoon nie) datetime: distance_in_words_ago: @@ -169,7 +201,16 @@ af: description: iD (aanlynredigeerder) remote: name: Afstandsbeheer - description: Afstandsbeheer (JOSM of Merkaartor) + description: Afstandsbeheer (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Geen + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -207,6 +248,12 @@ af: anonymous: anoniem no_comment: (geen kommentaar) part_of: Deel van + part_of_relations: + one: 1 verhouding + other: '%{count} verhoudings' + part_of_ways: + one: 1 weg + other: '%{count} weë' download_xml: Laai XML af view_history: Beskou geskiedenis view_details: Bekyk detail @@ -241,6 +288,9 @@ af: title_html: 'Weg: %{name}' history_title_html: 'Weggeskiedenis: %{name}' nodes: Knooppunte + nodes_count: + one: 1 nodus + other: '%{count} nodusse' also_part_of_html: one: gedeelte van weg %{related_ways} other: gedeelte van weë %{related_ways} @@ -248,6 +298,9 @@ af: title_html: 'Verwantskap: %{name}' history_title_html: 'Verwantskapgeskiedenis: %{name}' members: Lede + members_count: + one: 1 lid + other: '%{count} lede' relation_member: entry_role_html: '%{type} %{name} as %{role}' type: @@ -258,6 +311,7 @@ af: entry_html: Verwantskap %{relation_name} entry_role_html: Verwantskap %{relation_name} (as %{relation_role}) not_found: + title: Kon nie gevind word sorry: 'Jammer, %{type} #%{id} blyk onverkrygbaar.' type: node: knooppunt @@ -266,6 +320,7 @@ af: changeset: wysigingstel note: nota timeout: + title: Tydlimiet oorskry sorry: Jammer, die gegewens vir die %{type} met die id %{id} neem te lank om op te soek. type: @@ -301,6 +356,9 @@ af: title: 'Nota: %{id}' new_note: Nuwe nota description: Beskrywing + open_title: 'Onopgeloste nota #%{note_name}' + closed_title: 'Opgeloste nota #%{note_name}' + hidden_title: 'Verborge nota #%{note_name}' opened_by_html: Geskep deur %{user} %{when} opened_by_anonymous_html: Geskep deur anoniem %{when} ago @@ -351,6 +409,8 @@ af: comment: comment: 'Nuwe opmerking oor veranderingset #%{changeset_id} deur %{author}' commented_at_by_html: '%{when} gelede deur %{user} bygewerk' + comments: + comment: 'Nuwe opmerking oor veranderingstel #%{changeset_id} deur %{author}' index: title_all: OpenStreetMap bespreking oor wysigingstelle title_particular: 'OpenStreetMap veranderingset #%{changeset_id} bespreking' @@ -362,7 +422,7 @@ af: title: Nuwe dagboekinskrywing form: location: 'Ligging:' - use_map_link: gebruik kaart + use_map_link: Kies op kaart index: title: Gebruikersdagboeke title_friends: Dagboeke van vriende @@ -371,6 +431,7 @@ af: in_language_title: Dagboekinkrywings in %{language} new: Nuwe dagboekinskrywing new_title: Maak 'n nuwe inskrywing in jou dagboek + my_diary: My Dagboek no_entries: Geen dagboekinskrywings nie recent_entries: Onlangse dagboekinskrywings older_entries: Vorige Inskrywings @@ -390,9 +451,10 @@ af: body: Jammer, geen dagboekinskrywing of kommentaar met die id %{id} bestaan nie. Gaan u spelling na, of u het moontlik op 'n foutiewe skakel geklik. diary_entry: - posted_by_html: Plasing deur %{link_user} op %{created} in %{language_link} + posted_by_html: Plasing deur %{link_user} op %{created} in %{language_link}. + updated_at_html: Laas opgedateer op %{updated}. comment_link: Lewer hierop kommentaar - reply_link: Antwoord hierop + reply_link: Stuur 'n boodskap aan die outeur comment_count: zero: Geen opmerkings one: '%{count} opmerking' @@ -425,6 +487,7 @@ af: description: Onlangse dagboekinskrywings deur OpenStreetMap-gebruikers comments: has_commented_on: '%{display_name} het kommentaar gelewer op die volgende dagboekinskrywings' + no_comments: Geen dagboekeopmerkings post: Inskrywing when: Wanneer comment: Kommentaar @@ -432,11 +495,16 @@ af: older_comments: Ouer Kommentaar friendships: make_friend: + heading: '%{user} as vriend toevoeg?' button: As vriend byvoeg success: '%{name} is nou u vriend!' failed: Jammer, kon nie %{name} as 'n vriend byvoeg nie. already_a_friend: U is reeds met %{name} bevriend. + limit_exceeded: U het onlangs baie vriendskapsversoeke gestuur. Wag 'n tyd voordat + u nuwe versoeke probeer stuur. remove_friend: + heading: '%{user} as vriend verwyder?' + button: Verwyder as vriend success: '%{name} is uit u vriendekring verwyder.' not_a_friend: '%{name} is nie een van u vriende nie.' geocoder: @@ -457,10 +525,12 @@ af: chair_lift: Stoelhyser drag_lift: Sleephysbak gondola: Gondel lift + magic_carpet: Towertapythyser platter: Platter Lift pylon: Spantoring station: Lugwegstasie t-bar: T-bar hysbak + "yes": Kabelbaan aeroway: aerodrome: Vliegveld airstrip: Landingstrook @@ -469,11 +539,15 @@ af: hangar: Loods helipad: Helikopterplatform holding_position: Hou Posisie + navigationaid: Lugvaartnavigasiehulp parking_position: Parkeerplek runway: Aanloopbaan + taxilane: Taxibaan taxiway: Rybaan terminal: Terminaal + windsock: Windkous amenity: + animal_boarding: Dierehotel animal_shelter: Dierebeskermingsvereniging arts_centre: Kunssentrum atm: OTM @@ -483,7 +557,9 @@ af: bench: Bankie bicycle_parking: Fietsparkering bicycle_rental: Fietshuur + bicycle_repair_station: Fietsherstelstasie biergarten: Biertuin + blood_bank: Bloedbank boat_rental: Boothuur brothel: Bordeel bureau_de_change: Wisselkantoor @@ -500,6 +576,7 @@ af: clock: Klok college: Kollege community_centre: Gemeenskapsentrum + conference_centre: Konverensiesentrum courthouse: Hof crematorium: Krematorium dentist: Tandarts @@ -507,6 +584,7 @@ af: drinking_water: Drinkwater driving_school: Bestuurskool embassy: Ambassade + events_venue: Onthaallokaal fast_food: Wegneemetes ferry_terminal: Pontterminaal fire_station: Brandweerstasie @@ -519,16 +597,22 @@ af: hospital: Hospitaal hunting_stand: Jagtoring ice_cream: Roomys + internet_cafe: Internetkafee kindergarten: Kleuterskool + language_school: Taalskool library: Biblioteek + loading_dock: Laaistasie marketplace: Markplein + mobile_money_agent: Mobiele betalingagent monastery: Monnikeklooster motorcycle_parking: Motorfietsparkering + music_school: Musiekskool nightclub: Nagklub nursing_home: Verpleging- en versorgingshuis parking: Parkering parking_entrance: Parkeeringang parking_space: Parkeerplek + payment_terminal: Betaalautomaat pharmacy: Apteek place_of_worship: Plek van aanbidding police: Polisie @@ -536,9 +620,13 @@ af: post_office: Poskantoor prison: Tronk pub: Kroeg + public_bath: Openbare bad + public_bookcase: Ruilboekrak public_building: Openbare gebou + ranger_station: Veldwagtershut recycling: Herwinningspunt restaurant: Restaurant + sanitary_dump_station: Sanitêre stortstasie school: Skool shelter: Skuiling shower: Stort @@ -551,18 +639,27 @@ af: theatre: Teater toilets: Toilette townhall: Stadsaal + training: Opleidingsfasiliteit university: Universiteit + vehicle_inspection: Voertuiginspeksie vending_machine: Verkoopmasjien veterinary: Veearts village_hall: Dorpsaal waste_basket: Snippermandjie waste_disposal: Stortingsterrein + waste_dump_site: Afvalstortterrein + watering_place: Drinkplek water_point: Waterpunt + weighbridge: Weegbrug + "yes": Infrastruktuur boundary: + aboriginal_lands: Reservaat administrative: Administratiewe grens census: Sensusgrens national_park: Nasionale park + political: Kiesgrens protected_area: Beskermingsgebied + "yes": Grens bridge: aqueduct: Waterbrug boardwalk: Boardwalk @@ -571,43 +668,93 @@ af: viaduct: Viaduk "yes": Brug building: - apartments: Woonstelblok + apartment: Woonstel + apartments: Woonstelle + barn: Skuur + bungalow: Kothuis + cabin: Blokhut chapel: Kapel - church: Kerk + church: Kerkgebou + civic: Openbare gebou + college: Kollege gebou commercial: Kommersiële-gebou + construction: Gebou in aanbou + detached: Alleenstaande woning dormitory: Studentehuis - farm: Plaasgebou + duplex: Duplekshuis + farm: Plaashuis + farm_auxiliary: Hulpplaashuis garage: Garage + garages: Vulstasies + greenhouse: Kweekhuis + hangar: Loods hospital: Hospitaal-gebou - hotel: Hotel + hotel: Hotelgebou house: Huis + houseboat: Huisboot + hut: Hut industrial: Industriële gebou + kindergarten: Kleuterskoolgebou + manufacture: Produksiegebou office: Kantoorgebou public: Openbare gebou residential: Residensiële gebou retail: Kleinhandel-gebou + roof: Dak + ruins: Vervalle gebou school: Skoolgebou - terrace: Terras - train_station: Spoorwegstasie + semidetached_house: Halfgekoppelde huis + service: Diensgebou + shed: Skuur + stable: Stalle + static_caravan: Karavaan + temple: Tempelgebou + terrace: Terrasgebou + train_station: Spoorwegstasiegebou university: Universiteitsgebou + warehouse: Pakhuis "yes": Gebou + club: + sport: Sportklub + "yes": Klub craft: + beekeper: Byeboer + blacksmith: Smid brewery: Brouery carpenter: Skrynwerker + caterer: Spysenier + confectionery: Gebak + dressmaker: Kleremaker electrician: Elektrisiën + electronics_repair: Elektronieseherstelwerk gardener: Tuinier + glaziery: Glaswerk + handicraft: Handwerk + hvac: Verwarming/ventilasie + metal_construction: Metaalwerk painter: Verwer photographer: Fotograaf plumber: Loodgieter + roofer: Dakdekker + sawmill: Saagmeule shoemaker: Skoenmaker + stonemason: Klipkapper tailor: Snyer + window_construction: Vensterraamwerk + winery: Wynboer "yes": Handwerkwinkel emergency: + access_point: Reddingsdienstoegangspunt ambulance_station: Ambulansstasie assembly_point: Vergaderingspunt defibrillator: Defibrillator + fire_xtinguisher: Brandblusser + fire_water_pond: Bluswaterdam landing_site: Noodlandingsarea + life_ring: Reddingsboei phone: Noodtelefoon + siren: Noodsirene + suction_point: Bluswateropsuigpunt water_tank: Noodwatertenk "yes": Noodgeval highway: @@ -620,6 +767,7 @@ af: cycleway: Fietspad elevator: Hysbak emergency_access_point: Noodtoeganspunt + emergency_bay: Noodstopplek footway: Voetpad ford: Drif give_way: Toegeeteken @@ -649,18 +797,23 @@ af: tertiary: Tersiêre pad tertiary_link: Tersiêre pad track: Spoor + traffic_mirror: Verkeerspieël traffic_signals: Verkeerstekens + trailhead: Wandelvertrekpunt trunk: Hoofroete trunk_link: Hoofroete turning_loop: Draailus unclassified: Ongeklassifiseerde pad "yes": Straat historic: + aircraft: Historiese Vliegtuig archaeological_site: Argeologiese terrein + bomb_crater: Historiese bomkrater battlefield: Slagveld boundary_stone: Grenspaal building: Historiese gebou bunker: Bomskuiling + cannon: Historiese kanon castle: Kasteel church: Kerk city_gate: Stadspoort @@ -670,9 +823,11 @@ af: house: Huis manor: Landgoed memorial: Gedenkteken + milestone: Historiese myl paal mine: Myn mine_shaft: Mynskag monument: Monument + railway: Historiese spoorlyn roman_road: Romeinse pad ruins: Ruïnes stone: Steen @@ -686,6 +841,7 @@ af: "yes": Verkeersaansluiting landuse: allotments: Volkstuine + aquaculture: Akwakultuur basin: Kom cemetery: Begraafplaas commercial: Handelsarea @@ -703,18 +859,24 @@ af: military: Militêre gebied mine: Myn orchard: Vrugteboord + plant_nursery: Kwekery quarry: Steengroef railway: Spoorweg recreation_ground: Ontspanningsterrein reservoir: Reservoir residential: Woongebied retail: Kleinhandel + village_green: Braak vineyard: Wingerd "yes": Landgebruik leisure: + adult_gaming_centre: Spelsentrum vir volwassenes + amusement_arcade: Arkadesaal beach_resort: Strandoord bird_hide: Voëlkykhuisie + bleachers: Paviljoen common: Gemeenskaplike land + dance: Danssaal dog_park: Hondepark firepit: Vuurgat fishing: Visvanggebied @@ -728,6 +890,7 @@ af: miniature_golf: Mini-gholf nature_reserve: Natuurreservaat park: Park + picnic_table: Piekniektafel pitch: Sportveld playground: Speelgrond recreation_ground: Ontspanningsterrein @@ -742,18 +905,28 @@ af: "yes": Vrye tyd man_made: adit: Horisontale skag + advertising: Reklame + antenna: Antenna + avalanche_protection: Sneeustortingbeskerming beacon: Baken + beam: Balk beehive: Byekorf breakwater: Golfbreker bridge: Brug bunker_silo: Bunker + cairn: Steenhoop chimney: Skoorsteen + communications_tower: Antennatoring crane: Kraan + cross: Kruis + dolphin: Meerpaal + dyke: Dyk embankment: Wal flagpole: Vlagpaal groyne: Krip kiln: Oond lighthouse: Vuurtoring + manhole: Mangat mast: Mas mine: Myn mineshaft: Mynskag @@ -761,12 +934,17 @@ af: petroleum_well: Oliebron pier: Pier pipeline: Pypleiding + pumping_station: Pompstasie + reservoir_covered: Bedekte Reservoir silo: Silo + snow_cannon: Sneeukanon storage_tank: Opgaartenk surveillance: Toesig + telescope: Teleskoop tower: Toring wastewater_plant: Rioolaanleg watermill: Watermeul + water_tap: Waterkraan water_tower: Watertoring water_well: Put water_works: Waterwerke @@ -777,10 +955,13 @@ af: airfield: Miliêre vliegveld barracks: Barakke bunker: Bomskuiling + trench: Loopgraaf "yes": Militêre mountain_pass: "yes": Bergpas natural: + atoll: Atol + bare_rock: Kaal rots bay: Baai beach: Strand cape: Kaap @@ -797,12 +978,14 @@ af: grassland: Grasveld heath: Heide hill: Heuwel + hot_spring: Warmwaterbron island: Eiland land: Land marsh: Moeras moor: Vleiland mud: Modder peak: Piek + peninsula: Skiereiland point: Punt reef: Rif ridge: Bergrif @@ -823,22 +1006,33 @@ af: office: accountant: Boekhouer administrative: Administrasie + advertising_agency: Advetensieagentskap architect: Argitek association: Vereniging company: Maatskappy + diplomatic: Diplomatiekekantoor educational_institution: Opvoedkundige instelling employment_agency: Werksagentskap + energy_supplier: Energieverskafferkantoor estate_agent: Eiendomsagent + financial: Finansieële kantoor government: Regeringskantoor insurance: Versekeringskantoor it: IT-kantoor lawyer: Prokureur + logistics: Logistieke kantoor + newspaper: Koerant kantoor ngo: NRO-kantoor + notary: Notaris + religion: Godsdienskantoor + research: Navorsingskantoor + tax_advisor: Belastingadviseur telecommunication: Telekommunikasiekantoor travel_agent: Reisagent "yes": Kantoor place: allotments: Toekennings + archipelago: Argipel city: Stad city_block: Stadsblok country: Land @@ -887,10 +1081,14 @@ af: switch: Spoogwegpunte tram: Tremspoor tram_stop: Tremhalte + yard: Spoorwegterrein shop: + agrarian: Landbouwinkel alcohol: Drankwinkel antiques: Antiek / Oudhede + appliance: Toestellewinkel art: Kunswinkel + baby_goods: Babaware bakery: Bakkery beauty: Skoonheidsalon beverages: Drankgoedwinkel @@ -904,8 +1102,11 @@ af: car_repair: Motorherstel carpet: Mat-/tapytwinkel charity: Liefdadigheidswinkel + cheese: Kaaswinkel chemist: Apteek + chocolate: Sjokolade clothes: Klerewinkel + coffee: Koffiewinkel computer: Rekenaarwinkel confectionery: Banketbakkery convenience: Geriefswinkel @@ -917,33 +1118,45 @@ af: doityourself: Doen-Dit-Self-winkel dry_cleaning: Droogskoonmaker electronics: Elektronikawinkel + erotic: Erotiese winkel estate_agent: Eiendomsagent + fabric: Lapwinkel farm: Plaaswinkel fashion: Modewinkel + fishing: Hengel gereedskap winkel florist: Bloemiste food: Koswinkel + frame: Raamwerk winkel funeral_directors: Begrafnisondernemer furniture: Meubels garden_centre: Kwekery/Tuinsentrum + gas: Gaswinkel general: Algemene handelaar gift: Geskenkewinkel greengrocer: Groentehandelaar grocery: Kruidenierswinkel hairdresser: Haarkapper hardware: Hardewarewinkel + health_food: Gesondheidswinkel + hearing_aids: Gehoortoestelle hifi: Hoëtrou houseware: Huisraadwinkel + ice_cream: Roomyswinkel interior_decoration: Binnenshuise versiering jewelry: Juwelierswinkel kiosk: Kiosk kitchen: Kombuiswinkel laundry: Wassery + locksmith: Slotmaker lottery: Lotery mall: Winkelsentrum massage: Masseer mobile_phone: Selfoonwinkel + money_lender: Geldlener motorcycle: Motorfietswinkel + motorcycle_repair: Motorfiets werkswinkel music: Musiekwinkel + musical_instrument: Musiekinstrumente newsagent: Nuusagent optician: Oogkundige organic: Organiesekoswinkel @@ -954,11 +1167,13 @@ af: photo: Fotowinkel seafood: Seekos second_hand: Tweedehandswinkel + sewing: Naaiwinkel shoes: Skoenwinkel sports: Sportwinkel stationery: Skryfbehoeftewinkel supermarket: Supermark tailor: Snyer + tattoo: Tatoeëerder ticket: Kaartjiewinkel tobacco: Tabakwinkel toys: Speelgoedwinkel @@ -967,6 +1182,7 @@ af: vacant: Vakante winkel variety_store: Verskeidenheidswinkel video: Videowinkel + wholesale: Groothandel wine: Wynwinkel "yes": Winkel tourism: @@ -989,6 +1205,7 @@ af: picnic_site: Piekniekplek theme_park: Pretpark viewpoint: Uitkykpunt + wilderness_hut: Wildernishut zoo: Dieretuin tunnel: building_passage: Geboudeurgang @@ -1015,12 +1232,15 @@ af: "yes": Waterweg admin_levels: level2: Landgrens + level3: Streeksgrens level4: Staatsgrens level5: Streekgrens level6: Countygrens + level7: Munisipale grens level8: Stadsgrens level9: Dorpsgrens level10: Voorstedelike grens + level11: Buurtgrens types: cities: Stede towns: Dorpe @@ -1059,6 +1279,10 @@ af: successful_update: U verslag is suksesvol opgedateer provide_details: Verskaf asseblief die vereiste besonderhede show: + title: '%{status} Probleem #%{issue_id}' + report_created_at: Eerste vermelding op %{datetime} + last_resolved_at: Laas geregmaak op %{datetime} + last_updated_at: Laaste bygewerk op %{datetime} deur %{displayname} resolve: Los op ignore: Ignoreer reopen: Heropen @@ -1107,6 +1331,22 @@ af: diary_comment: spam_label: Hierdie kommentaar op die dagboek is/bevat strooipos offensive_label: Hierdie kommentaar op die dagboek is obseen/afstootlik + threat_label: Hierdie dagboekinskrywing bevat 'n bedreiging + other_label: Ander + user: + spam_label: Dié gebruikersprofiel is / bevat spam + offensive_label: Dié gebruikersprofiel is onwelvoeglik / aanstootgewend + threat_label: Dié gebruikersprofiel bevat 'n bedreiging + vandal_label: Dié gebruiker is 'n vandaal + other_label: Ander + note: + spam_label: Dié opmerking is spam + personal_label: Dié opmerking bevat persoonlike gegewens + abusive_label: Dié opmerking is beledigend + other_label: Ander + create: + successful_report: U verslag is suksesvol geregistreer + provide_details: Verskaf asseblief die vereiste besonderhede layouts: logo: alt_text: OpenStreetMap-embleem @@ -1120,6 +1360,7 @@ af: edit: Redigeer history: Geskiedenis export: Voer uit + issues: Probleme data: Data export_data: Voer data uit gps_traces: GPS-spore @@ -1133,6 +1374,7 @@ af: daarvan is gratis en val onder 'n oop-lisensie. intro_2_create_account: Skep 'n gebruikerrekening partners_partners: vennote + tou: Gebruiksvoorwaardes osm_offline: Die OpenStreetMap-databasis is tans vanlyn terwyl noodsaaklike onderhoud gedoen word. osm_read_only: Die OpenStreetMap-databasis kan tans slegs gelees word terwyl noodsaaklike @@ -1299,9 +1541,6 @@ af: wikipedia: title: Meld aan met Wikipedia alt: Meld aan met ’n Wikipedia-rekening - yahoo: - title: Meld aan met Yahoo - alt: Meld aan met ’n Yahoo-OpenID wordpress: title: Meld aan met Wordpress alt: Meld aan met ’n Wordpress-OpenID @@ -1533,7 +1772,6 @@ af: public_traces_from: Openbare GPS-spore van %{user} tagged_with: gemerk met %{tags} upload_trace: Laai 'n GPS-spoor op - see_all_traces: Wys alle spore destroy: scheduled_for_deletion: Spoor is vir verwydering geoormerk make_public: diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 28cdf9eb0..11da44d97 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -1039,7 +1039,6 @@ aln: public_traces: Të dhanat publike të GPS-it public_traces_from: Të dhana publike të GPS-it pej %{user} tagged_with: ' e etikume me %{tags}' - see_all_traces: Kshyri kejt të dhanat destroy: scheduled_for_deletion: Gjurma u parapa për fshirje make_public: diff --git a/config/locales/ar.yml b/config/locales/ar.yml index e061a8fdc..4a1bfca1d 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1532,9 +1532,6 @@ ar: wikipedia: title: تسجيل الدخول عبر ويكيبيديا alt: سجل الدخول باستخدام حساب ويكيبيديا - yahoo: - title: تسجيل الدخول بياهو - alt: تسجيل الدخول بـYahoo OpenID wordpress: title: تسجيل الدخول بووردبريس alt: تسجيل الدخول بـWordpress OpenID @@ -2064,8 +2061,6 @@ ar: المزيد تتبع GPS على wiki page. upload_trace: حمل أثر - see_all_traces: شاهد كل الآثار - see_my_traces: شاهد كل آثاري destroy: scheduled_for_deletion: تم جدولة الأثر للحذف make_public: diff --git a/config/locales/arz.yml b/config/locales/arz.yml index b98a93917..1714fe787 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -860,7 +860,6 @@ arz: public_traces: آثار جى بى إس عمومية public_traces_from: آثار جى بى إس عموميه من %{user} tagged_with: ' موسوم مع %{tags}' - see_all_traces: شاهد كل الآثار destroy: scheduled_for_deletion: تم جدوله الأثر للحذف make_public: diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 30f084a7a..3afd57b0f 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1462,9 +1462,6 @@ ast: wikipedia: title: Aniciar sesión con Wikipedia alt: Aniciar sesión con una cuenta de Wikipedia - yahoo: - title: Aniciar sesión con Yahoo - alt: Aniciar sesión con una OpenID de Yahoo wordpress: title: Aniciar sesión con Wordpress alt: Aniciar sesión con una OpenID de Wordpress @@ -1988,8 +1985,6 @@ ast: traza o depriende más tocante a cómo trazar col GPS na páxina de la wiki. upload_trace: Xubir una traza - see_all_traces: Ver toles traces - see_my_traces: Ver les mios traces destroy: scheduled_for_deletion: Traza marcada pa desaniciar make_public: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 440f1f8f0..9072ae302 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -125,7 +125,9 @@ be-Tarask: report: category: Абярыце прычыну вашага паведамленьня user: + auth_uid: UID аўтэнтыфікацыі email: Электронная пошта + email_confirmation: Пацьверджаньне э-пошты new_email: Новы адрас электроннай пошты active: Актыўны display_name: Бачнае імя @@ -133,7 +135,9 @@ be-Tarask: home_lat: Шырата home_lon: Даўгата languages: Пажаданыя мовы + preferred_editor: Пажаданы рэдактар pass_crypt: Пароль + pass_crypt_confirmation: Пацьверджаньне паролю help: trace: tagstring: падзеленае коскамі @@ -146,6 +150,10 @@ be-Tarask: needs_view: Ці трэба ўдзельніку ўвайсьці ў сыстэму, перад тым як блякаваньне будзе зьнятае? user: + email_confirmation: Ваш адрас ня будзе паказвацца публічна, глядзіце нашыя + правілы + адносна прыватнасьці дзеля дадатковай інфармацыі new_email: (ніколі ня будзе паказаны публічна) datetime: distance_in_words_ago: @@ -229,6 +237,30 @@ be-Tarask: browse: created: Створана closed: Закрытае + created_html: Створана %{time} + closed_html: Закрыта %{time} + created_by_html: Створана %{time} удзельнікам %{user} + deleted_by_html: Выдалена %{time} удзельнікам %{user} + edited_by_html: Зьменена %{time} удзельнікам %{user} + closed_by_html: Закрыта %{time} by %{user} + version: Вэрсія + in_changeset: Набор зьменаў + anonymous: ананім + no_comment: (без камэнтароў) + part_of: Частка + part_of_relations: + one: 1 сувязь + few: '%{count} сувязі' + many: '%{count} сувязяў' + other: '%{count} сувязяў' + part_of_ways: + one: 1 лінія + few: '%{count} лініі' + many: '%{count} лініяў' + other: '%{count} лініяў' + download_xml: Спампаваць XML + view_history: Паглядзець гісторыю + view_details: Паглядзець зьвесткі location: 'Месцазнаходжаньне:' changeset: title: 'Набор зьменаў: %{id}' @@ -247,6 +279,13 @@ be-Tarask: title_comment: Набор зьменаў %{id} - %{comment} way: nodes: Вузлы + relation: + members: Удзельнікі + members_count: + one: 1 удзельнік + few: '%{count} удзельнікі' + many: '%{count} удзельнікаў' + other: '%{count} удзельнікаў' relation_member: entry_role_html: '%{type} %{name} як %{role}' type: @@ -257,6 +296,7 @@ be-Tarask: entry_html: Адносіны %{relation_name} entry_role_html: Адносіны %{relation_name} (як %{relation_role}) not_found: + title: Ня знойдзена sorry: Прабачце, %{type} № %{id} ня знойдзены. type: node: вузел @@ -1271,7 +1311,6 @@ be-Tarask: public_traces_from: Публічныя GPS-трэкі ўдзельніка %{user} tagged_with: ' пазначаныя %{tags}' upload_trace: Загрузіць трэк - see_all_traces: Паказаць усе трэкі destroy: scheduled_for_deletion: Трэк заплянаваны на выдаленьне make_public: @@ -1606,7 +1645,7 @@ be-Tarask: show: title: '%{block_on} заблякаваны %{block_by}' heading_html: '%{block_on} заблякаваны %{block_by}' - status: Статус + status: 'Статус:' show: Паказаць edit: Рэдагаваць revoke: Адклікаць! diff --git a/config/locales/be.yml b/config/locales/be.yml index 09eeeb142..4a9816cf1 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1488,9 +1488,6 @@ be: wikipedia: title: Увайсці праз Вікіпедыю alt: Уваход з выкарыстаннем рахунку ў Вікіпедыі - yahoo: - title: Уваход праз Yahoo - alt: Уваход праз Yahoo OpenID wordpress: title: Уваход праз Wordpress alt: Уваход праз Wordpress OpenID @@ -2019,8 +2016,6 @@ be: след або пачытайце пра GPS-сляды на вікі-старонцы. upload_trace: Адаслаць GPS-след - see_all_traces: Паглядзець усе сляды - see_my_traces: Паглядзець мае сляды destroy: scheduled_for_deletion: След запланаваны на выдаленне make_public: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index d89ad39bb..f0f874c22 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1374,9 +1374,6 @@ bg: wikipedia: title: Влизане с Уикипедия alt: Влизане със сметка от Уикипедия - yahoo: - title: Влизане с Yahoo - alt: Влизане с OpenID от Yahoo wordpress: title: Влизане с Wordpress alt: Влизане с OpenID от Wordpress @@ -1678,8 +1675,6 @@ bg: public_traces_from: Публични следи от GPS от потребител %{user} tagged_with: с етикет %{tags} upload_trace: Качване на следи от GPS - see_all_traces: Всички следи - see_my_traces: Мои следи georss: title: OpenStreetMap GPS трасета description: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 10eb09b39..b955387f0 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1245,8 +1245,6 @@ bn: wikipedia: title: উইকিপিডিয়া দিয়ে প্রবেশ alt: উইকিপিডিয়া অ্যাকাউন্ট দিয়ে প্রবেশ করুন - yahoo: - title: ইয়াহু দিয়ে প্রবেশ wordpress: title: ওয়ার্ডপ্রেস দিয়ে প্রবেশ destroy: @@ -1519,7 +1517,6 @@ bn: by: দ্বারা index: upload_trace: অনুসরণ আপলোড - see_all_traces: সব অনুসরণগুলো দেখুন offline_warning: message: জিপিএক্স ফাইল আপলোড বর্তমানে সম্ভব নয় offline: diff --git a/config/locales/br.yml b/config/locales/br.yml index 556d74063..d4016023e 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1519,9 +1519,6 @@ br: wikipedia: title: Kevreañ dre Wikipedia alt: Kevreañ gant ur gont Wikipedia - yahoo: - title: Kevreañ ouzh Yahoo - alt: Kevreañ ouzh Yahoo OpenID wordpress: title: Kevreañ ouzh Wordpress alt: Kevreañ ouzh OpenID Wordpress @@ -2024,8 +2021,6 @@ br: roudenn nevez evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh ar href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i. upload_trace: Kas ur roud - see_all_traces: Gwelet an holl roudoù - see_my_traces: Gwelet ma roudennoù destroy: scheduled_for_deletion: Roudenn da vezañ dilamet make_public: diff --git a/config/locales/bs.yml b/config/locales/bs.yml index a8fc2b880..2ccb9dc5e 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1033,9 +1033,6 @@ bs: auth failure: Žao mi je, ne možemo Vas prijaviti s ovim detaljima. openid_logo_alt: Prijavite se sa OtvorenimID auth_providers: - yahoo: - title: Prijavite se sa Yahoo nalogom - alt: Prijavite se sa Yahoo OpenID wordpress: title: Prijavite se sa Wordpress nalogom alt: Prijavite se sa Wordpress OpenID @@ -1360,7 +1357,6 @@ bs: novu trasu ili naučite više o GPS trasiranju na wiki stranici. upload_trace: Poslati GPS trasu - see_all_traces: Pogledati sve trase destroy: scheduled_for_deletion: Trasa raspoređena za brisanje make_public: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ca0271840..b5e1eaace 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -187,6 +187,10 @@ ca: que intenteu utilitzar termes comuns. needs_view: L'usuari necessita connectar-se abans que aquest blocatge es suprimeixi? user: + email_confirmation: La vostra adreça no es mostrarà públicament (vegeu la + nostra política de privadesa + per a més informació) new_email: (no es mostrarà mai públicament) datetime: distance_in_words_ago: @@ -531,6 +535,8 @@ ca: success: '%{name} és ara el vostre amic!' failed: Ho sentim, no afegir %{name} com un amic. already_a_friend: Que ja sou amics amb %{name}. + limit_exceeded: Us heu amistat amb molts usuaris recentment. Espereu una mica + abans de fer-ho amb algú més. remove_friend: heading: Voleu suprimir %{user} dels amics? button: Suprimeix dels amics @@ -965,6 +971,7 @@ ca: reservoir_covered: Dipòsit cobert silo: Sitja snow_cannon: Canó de neu + snow_fence: Barrera contra les allaus storage_tank: Tanc d'emmagatzematge surveillance: Vigilància telescope: Telescopi @@ -988,6 +995,7 @@ ca: mountain_pass: "yes": Coll - Port de muntanya natural: + atoll: Atol bare_rock: Roca pelada bay: Badia beach: Platja @@ -1746,9 +1754,6 @@ ca: wikipedia: title: Inicieu la sessió amb Viquipèdia alt: Inicieu la sessió amb un compte de Viquipèdia - yahoo: - title: Inicieu la sessió amb Yahoo - alt: Inicieu la sessió amb un compte OpenID de Yahoo wordpress: title: Inicieu la sessió amb Wordpress alt: Inicieu la sessió amb un compte OpenID de Wordpress @@ -2296,8 +2301,6 @@ ca: traça o apreneu més sobre les traces GPS a la pàgina wiki. upload_trace: Puja una traça - see_all_traces: Mostra totes les traces - see_my_traces: Mostra les meves traces destroy: scheduled_for_deletion: Traça programada per a ser suprimida make_public: diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 7fb7aaeb3..3c3106929 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -200,11 +200,11 @@ ce: title: 'Нисдарш: %{id}' belongs_to: Автор node: ТӀадамаш (%{count}) - node_paginated: ТӀадамаш (%{x}-%{y} чура %{count}) + node_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count}) way: Сиз (%{count}) - way_paginated: Сиз (%{x}-%{y} чура %{count}) + way_paginated: Сиз (%{x}-%{y} чуьра %{count}) relation: Хилар (%{count}) - relation_paginated: Хилар (%{x}-%{y} чура %{count}) + relation_paginated: Хилар (%{x}-%{y} чуьра %{count}) comment: Комменташ (%{count}) hidden_commented_by_html: Къайла комменташ %{user} %{when} хьалха @@ -249,7 +249,7 @@ ce: changeset: нисдарш note: билгалдаккхар timeout: - sorry: Бехк ба билла, цу %{type} хаамаш %{id} чура чубаха докха беха бу. + sorry: Бехк ба билла, цу %{type} хаамаш %{id} чуьра чубаха тӀех беха бу. type: node: тӀадамаш way: сиз @@ -331,7 +331,7 @@ ce: no_more: Кхи цхьа нисдарш цакарий. no_more_area: Кхузахь нисдарш дина дац. no_more_user: Кхузахь хӀокху декъашхочо нисдарш дина дац. - load_more: Чуяха кхин + load_more: Чуйаха кхин timeout: sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу. changeset_comments: @@ -402,7 +402,7 @@ ce: language: title: Дневникийн дӀайаздарш OpenStreetMap тӀе %{language_name} description: OpenStreetMap декъашхойн тӀехьарлера дневникийн дӀайаздарш %{language_name} - чура + чуьра all: title: Дневникан дӀайаздарш OpenStreetMap description: OpenStreetMap декъашхойн тӀаьххьарлера дӀайаздарш @@ -685,7 +685,7 @@ ce: shop: hifi: Аудио/видео аппаратурийн туька houseware: ПхьегӀийн туька - interior_decoration: Интерьер кечъяр + interior_decoration: Интерьер кечйар music: Музыкийн туька newsagent: Газетийн киоск optician: Оптика @@ -824,7 +824,7 @@ ce: register now: ДӀадазло destroy: title: Болх дӀаберзор - heading: OpenStreetMap чура болх дӀаберзор + heading: OpenStreetMap чуьра болх дӀаберзор logout_button: Болх дӀаберзор site: about: @@ -970,9 +970,9 @@ ce: title: Декъашхой heading: Декъашхой showing: - one: АгӀо %{page} (%{first_item} %{items}) чура - other: АгӀо %{page} (%{first_item}-%{last_item} %{items} чура) - summary_html: '%{name} кхоьллина %{date}, %{ip_address} адрес чура' + one: АгӀо %{page} (%{first_item} %{items}) чуьра + other: АгӀо %{page} (%{first_item}-%{last_item} %{items} чуьра) + summary_html: '%{name} кхоьллина %{date}, %{ip_address} адрес чуьра' summary_no_ip_html: '%{name} кхоьллина %{date}' suspended: webmaster: веб-говзанча diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 32acc885a..2b83cbd80 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -536,6 +536,7 @@ cs: description: Nedávné záznamy v denících uživatelů OpenStreetMap comments: has_commented_on: '%{display_name} okomentoval následující záznamy v deníku' + no_comments: Žádné komentáře k deníkům post: Záznam when: Kdy comment: Komentář @@ -548,6 +549,8 @@ cs: success: '%{name} je nyní váš přítel!' failed: Je mi líto, nepodařilo se přidat %{name} jako přítele. already_a_friend: Již jste přátelé s %{name}. + limit_exceeded: V poslední době jste přidali spoustu přátel. Před dalším přidáváním + přátel chvíli počkejte. remove_friend: heading: Odebrat uživatele %{user} z přátel? button: Odebrat z přátel @@ -1786,9 +1789,6 @@ cs: wikipedia: title: Přihlásit se účtem na Wikipedii alt: Přihlásit se účtem na Wikipedii - yahoo: - title: Přihlásit se prostřednictvím Yahoo - alt: Přihlášení pomocí Yahoo OpenID wordpress: title: Přihlásit se prostřednictvím Wordpress alt: Přihlášení pomocí Wordpress OpenID @@ -2317,8 +2317,6 @@ cs: empty_html: Nic tu ještě není. Nahrajte novou stopu nebo si něco o GPS stopách přečtěte na wiki. upload_trace: Nahrát stopu - see_all_traces: Zobrazit všechny stopy - see_my_traces: Zobrazit mé stopy destroy: scheduled_for_deletion: Stopa označena ke smazání make_public: @@ -2748,6 +2746,7 @@ cs: title: '%{block_on} zablokován uživatelem %{block_by}' heading_html: '%{block_on} zablokován uživatelem %{block_by}' created: 'Vytvořeno:' + duration: 'Doba trvání:' status: 'Stav:' show: Zobrazit edit: Upravit diff --git a/config/locales/da.yml b/config/locales/da.yml index 91367572a..c27abc7c4 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -151,6 +151,8 @@ da: category: Vælg årsagen til din rapportering details: Forklar venligst problemet i flere detaljer (påkrævet). user: + auth_provider: Autentificeringsleverandør + auth_uid: Autentificerings-UID email: E-mail email_confirmation: E-mail-bekræftelse new_email: Ny e-mailadresse @@ -507,6 +509,7 @@ da: description: Seneste blogindlæg fra brugere af OpenStreetMap comments: has_commented_on: '%{display_name} har kommenteret på følgende blogindlæg' + no_comments: Ingen blogkommentarer post: Indsend when: Hvornår comment: Kommentar @@ -519,6 +522,8 @@ da: success: '%{name} er nu din ven!' failed: Desværre, kunne ikke tilføje %{name} som din ven. already_a_friend: Du er allerede ven med %{name}. + limit_exceeded: Du er blevet venner med en del brugere for nylig. Vent venligst + lidt før du forsøger at blive ven med flere. remove_friend: heading: Fjern %{user} som ven? button: Fjern som ven @@ -1486,6 +1491,11 @@ da: see_their_profile_html: Du kan se deres profil på %{userurl}. befriend_them: Du kan også tilføje dem som ven på %{befriendurl}. befriend_them_html: Du kan også tilføje dem som ven på %{befriendurl}. + gpx_description: + description_with_tags_html: 'Det ser ud som om din GPX-fil %{trace_name} med + beskrivelsen %{trace_description} og de følgende tags: %{tags}' + description_with_no_tags_html: Det ser ud som om din GPX-fil %{trace_name} med + beskrivelsen %{trace_description} og uden tags gpx_failure: hi: Hej %{to_user}, failed_to_import: 'kunne ikke importeres. Her er fejlen:' @@ -1749,9 +1759,6 @@ da: wikipedia: title: Log ind med Wikipedia alt: Log ind med en Wikipedia-konto - yahoo: - title: Log på med Yahoo - alt: Log på med et Yahoo OpenID wordpress: title: Log på med Wordpress alt: Log på med et Wordpress OpenID @@ -2297,15 +2304,16 @@ da: in: i index: public_traces: Offentlige GPS-spor - my_traces: Mine GPS-spor + my_traces: Mine spor public_traces_from: Offentlige GPS-spor fra %{user} description: Gennemse de seneste overførsler af GPS-spor tagged_with: ' med egenskaberne %{tags}' empty_html: Der er ingenting her endnu. Overfør et nyt spor eller lær mere om optagelse af GPS-spor på wikisiden. upload_trace: Overfør et spor - see_all_traces: Vis alle spor - see_my_traces: Se mine spor + all_traces: Alle GPS-spor + traces_from: Offentlige GPS-spor fra %{user} + remove_tag_filter: Fjern tag-filter destroy: scheduled_for_deletion: Spor planlagt til at blive slettet make_public: @@ -2739,6 +2747,7 @@ da: title: '%{block_on} blokeret af %{block_by}' heading_html: '%{block_on} blokeret af %{block_by}' created: 'Oprettet:' + duration: 'Varighed:' status: 'Status:' show: Vis edit: Redigér @@ -2767,6 +2776,7 @@ da: title: Bemærkninger indsendt eller kommenteret af %{user} heading: '%{user}s bemærkninger' subheading_html: Bemærkninger indsendt eller kommenteret af %{user} + no_notes: Ingen bemærkninger id: Id creator: Oprettet af description: Beskrivelse diff --git a/config/locales/de.yml b/config/locales/de.yml index 85ab7994a..1aac99091 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1837,9 +1837,6 @@ de: wikipedia: title: Mit Wikipedia anmelden alt: Mit einem Wikipedia-Benutzerkonto anmelden - yahoo: - title: Mit Yahoo anmelden - alt: Mit einer Yahoo-OpenID anmelden wordpress: title: Mit Wordpress anmelden alt: Mit einer Wordpress-OpenID anmelden @@ -2397,7 +2394,7 @@ de: in: in index: public_traces: Öffentliche GPS-Tracks - my_traces: Meine GPS-Tracks + my_traces: Meine Tracks public_traces_from: Öffentliche GPS-Tracks von %{user} description: Letzte GPS-Track-Uploads durchsuchen tagged_with: ' gekennzeichnet mit %{tags}' @@ -2405,8 +2402,9 @@ de: neuen Track hoch oder informiere dich auf folgender Wikiseite über das Aufzeichnen von GPS-Tracks. upload_trace: Lade einen Track hoch - see_all_traces: Alle Tracks ansehen - see_my_traces: Meine Tracks ansehen + all_traces: Alle Tracks + traces_from: Öffentliche Tracks von %{user} + remove_tag_filter: Tag-Filter entfernen destroy: scheduled_for_deletion: Für die Löschung vorgesehener Track make_public: diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index bfe783717..bd276b9c6 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1518,7 +1518,6 @@ dsb: wukni wěcej wó GPS-slědowanju na wikijowem boku. upload_trace: Slěd nagraś - see_all_traces: Wšykne slědy pokazaś destroy: scheduled_for_deletion: Za wulašowanje pśedwiźona cera make_public: diff --git a/config/locales/el.yml b/config/locales/el.yml index 3bc750b7b..a529c925f 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1573,9 +1573,6 @@ el: wikipedia: title: Σύνδεση με Wikipedia alt: Συνδεθείτε με ένα Λογαριασμό Wikipedia - yahoo: - title: Σύνδεση με το Yahoo - alt: Σύνδεση με ένα Yahoo OpenID wordpress: title: Σύνδεση με το Wordpress alt: Σύνδεση με ένα Wordpress OpenID @@ -2108,8 +2105,6 @@ el: ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη σελίδα wiki. upload_trace: Αποστολή ίχνους - see_all_traces: Δείτε όλα τα ίχνη - see_my_traces: Δες τα ίχνη μου destroy: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή make_public: diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2e7da718e..730ab9b14 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1427,9 +1427,6 @@ en-GB: wikipedia: title: Login with Wikipedia alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID wordpress: title: Login with Wordpress alt: Login with a Wordpress OpenID @@ -1926,7 +1923,6 @@ en-GB: or learn more about GPS tracing on the wiki page. upload_trace: Upload a trace - see_all_traces: See all traces destroy: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -2324,8 +2320,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke! diff --git a/config/locales/en.yml b/config/locales/en.yml index b397c8586..6ebeb3746 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1551,7 +1551,6 @@ en: unknown token: "That confirmation code has expired or does not exist." reconfirm_html: "If you need us to resend the confirmation email, click here." confirm_resend: - success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

        If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests." failure: "User %{name} not found." confirm_email: heading: Confirm a change of email address @@ -1560,6 +1559,9 @@ en: success: "Confirmed your change of email address!" failure: "An email address has already been confirmed with this token." unknown_token: "That confirmation code has expired or does not exist." + resend_success_flash: + confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping. + whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests. messages: inbox: title: "Inbox" @@ -1682,9 +1684,6 @@ en: wikipedia: title: Login with Wikipedia alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID wordpress: title: Login with Wordpress alt: Login with a Wordpress OpenID @@ -2237,8 +2236,10 @@ en: tagged_with: " tagged with %{tags}" empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." upload_trace: "Upload a trace" - see_all_traces: "See all traces" - see_my_traces: "See my traces" + all_traces: "All Traces" + my_traces: "My Traces" + traces_from: "Public Traces from %{user}" + remove_tag_filter: "Remove Tag Filter" destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -2403,8 +2404,6 @@ en: auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" - terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." - terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Terms" heading: "Terms" @@ -2427,6 +2426,10 @@ en: france: "France" italy: "Italy" rest_of_world: "Rest of the world" + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. + terms_declined_link: this wiki page + terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: "No such user" heading: "The user %{user} does not exist" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index c60f1c211..f0a8f264b 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1573,7 +1573,7 @@ eo: details: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. details_html: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. unsubscribe: Por malaboni el ĝisdatigoj pri ĉi tiu ŝanĝaro, vizitu %{url} kaj - klaku "Malobservi". + alklaku "Malobservi". unsubscribe_html: Por malaboni la ĝisdatigojn de ĉi tiu ŝanĝaro, vizitu %{url}kaj alklaku "Malaboni". confirmations: @@ -1739,9 +1739,6 @@ eo: wikipedia: title: Ensaluti per Vikipedio alt: Ensaluti per Vikipedia konto - yahoo: - title: Ensaluti per Yahoo - alt: Ensaluti per Yahoo OpenID wordpress: title: Ensaluti per Wordpress alt: Ensaluti per Wordpress OpenID @@ -2057,7 +2054,7 @@ eo: desktop_html: La redaktilo Potlatch plue estos uzebla kiel labortabla aplikaĵo por Mac kaj Windows. id_html: Aliokaze, vi povas ŝanĝi vian implicitan redaktilon al iD, kiu laboras - ene via retfoliumilo (kiel Potlatch antaŭe). Klaku + ene via retfoliumilo (kiel Potlatch antaŭe). Alklaku tien ĉi por ŝanĝi agordojn. sidebar: search_results: Serĉrezultoj @@ -2268,15 +2265,16 @@ eo: in: en index: public_traces: Publikaj GPS-spuroj - my_traces: Miaj GPS-spuroj + my_traces: Miaj spuroj public_traces_from: Publikaj GPS-spuroj de %{user} description: Foliumi laste alŝutitajn GPS-spurojn tagged_with: etikedita kun %{tags} empty_html: Ankoraŭ nenio estas tie ĉi. Alŝutu novan spuron aŭ eksciu pli pri GPS-spurado ĉe la viki-paĝo. upload_trace: Alŝuti spuron - see_all_traces: Vidi ĉiujn spurojn - see_my_traces: Montri miajn spurojn + all_traces: Ĉiuj spuroj + traces_from: Publikaj spuroj de %{user} + remove_tag_filter: Forigi filtrilon de etikedoj destroy: scheduled_for_deletion: Spuro forviŝota make_public: @@ -2555,8 +2553,8 @@ eo: image size hint: (kvadrataj bildoj kun grando pli ol 100x100 taŭgas) home location: Hejma pozicio no home location: Vi ne enigis vian hejmlokon. - update home location on click: Ĉu freŝigi la hejmlokon kiam mi klakas sur la - mapo? + update home location on click: Ĉu freŝigi la hejmlokon kiam mi alklakas sur + la mapo? save changes button: Konservi ŝanĝojn make edits public button: Publikigu ĉiujn miajn redaktojn. return to profile: Reen al profilo diff --git a/config/locales/es.yml b/config/locales/es.yml index a03461c06..2b29107db 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: 2axterix2 # Author: Adjen +# Author: Agent # Author: Aguslr # Author: Alberto Chung # Author: Anarhistička Maca @@ -570,6 +571,8 @@ es: success: ¡%{name} ahora es su amigo! failed: Lo sentimos, no se ha podido añadir a %{name} como un amigo. already_a_friend: Ya eres amigo de %{name}. + limit_exceeded: Ha agregado a muchos amigos recientemente. Por favor espere + un poco antes de intentar agregar más amigos. remove_friend: heading: ¿Quitar a %{user} de los amigos? button: Quitar amistad @@ -1815,9 +1818,6 @@ es: wikipedia: title: Iniciar sesión con Wikipedia alt: Iniciar sesión con una cuenta de Wikipedia - yahoo: - title: Iniciar sesión con Yahoo - alt: Iniciar sesión con una OpenID de Yahoo wordpress: title: Iniciar sesión con Wordpress alt: Iniciar sesión con una OpenID de Wordpress @@ -2369,8 +2369,6 @@ es: traza o aprende más sobre trazas GPS en la página wiki. upload_trace: Subir una traza - see_all_traces: Ver todas las trazas - see_my_traces: Ver mis trazas destroy: scheduled_for_deletion: Traza programada para eliminación make_public: diff --git a/config/locales/et.yml b/config/locales/et.yml index 9d276abe9..9803ac7a3 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -24,6 +24,8 @@ et: create: Salvesta diary_entry: create: Avalda + issue_comment: + create: Lisa kommentaar message: create: Saada client_application: @@ -453,6 +455,7 @@ et: description: Hiljutised OpenStreetMapi kasutajate päevikusissekanded comments: has_commented_on: '%{display_name} on kommenteerinud järgnevaid päeviku sissekandeid' + no_comments: Päeviku kommentaarid puuduvad. post: Postitus when: Millal comment: Kommentaar @@ -526,9 +529,11 @@ et: hunting_stand: Jahikantsel ice_cream: Jäätis kindergarten: Lasteaed + language_school: Keeltekool library: Raamatukogu marketplace: Turg monastery: Klooster + music_school: Muusikakool nightclub: Ööklubi nursing_home: Hooldekodu parking: Parkimisplats @@ -569,13 +574,19 @@ et: dormitory: Ühiselamu farm: Talumaja garage: Garaaž + garages: Garaažid + greenhouse: Kasvuhoone + hangar: Angaar hospital: Haigla hoone hotel: Hotell house: Maja industrial: Tööstushoone office: Kontorihoone public: Avalik hoone + roof: Katus school: Koolihoone + service: Teenindushoone + stable: Tall train_station: Raudteejaam university: Ülikoolihoone "yes": Hoone @@ -593,11 +604,13 @@ et: emergency: ambulance_station: Kiirabijaam defibrillator: Defibrillaator + fire_xtinguisher: Tulekustuti phone: Hädaabi telefon highway: bridleway: Ratsatee bus_stop: Bussipeatus construction: Ehitusjärgus tee + corridor: Koridor cycleway: Jalgrattatee elevator: Elevaator emergency_access_point: Hädaabi punkt @@ -611,8 +624,10 @@ et: platform: Platvorm primary: Põhimaantee raceway: Võidusõidurada + residential: Kõrvaltee road: Tee secondary: Tugimaantee + service: Teenindustee speed_camera: Kiiruskaamera steps: Trepp street_lamp: Tänavavalgusti @@ -660,6 +675,7 @@ et: vineyard: Viinamarjaistandus "yes": Maakasutus leisure: + bandstand: Kõlakoda dog_park: Koerapark fishing: Kalapüügipiirkond garden: Aed @@ -668,6 +684,7 @@ et: miniature_golf: Minigolf nature_reserve: Looduskaitseala park: park + picnic_table: Piknikulaud pitch: Spordiväljak playground: Mänguväljak sauna: Saun @@ -678,8 +695,16 @@ et: track: Jooksurada water_park: Veepark man_made: + bridge: Sild + crane: Kraana + cross: Rist + flagpole: Lipumast lighthouse: Tuletorn + telescope: Teleskoop tower: Torn + watermill: Vesiveski + water_well: Kaev + windmill: Tuuleveski works: Vabrik military: airfield: Sõjaväe lennuväli @@ -688,6 +713,7 @@ et: mountain_pass: "yes": Mäekuru natural: + atoll: Atoll bay: Laht beach: Rand cape: Neem @@ -729,9 +755,11 @@ et: employment_agency: Tööbüroo insurance: Kindlustusbüroo lawyer: Jurist + notary: Notar travel_agent: Reisibüroo place: allotments: Suvilad + archipelago: Arhipelaag city: Linn country: Riik county: Maakond @@ -1224,9 +1252,6 @@ et: wikipedia: title: Logi sisse Vikipeedia kaudu alt: Logi sisse Vikipeedia kontoga - yahoo: - title: Logi sisse Yahoo kaudu - alt: Logi sisse Yahoo OpenID-ga wordpress: title: Logi sisse Wordpressi kaudu alt: Logi sisse Wordpressi OpenID-ga @@ -1751,8 +1776,6 @@ et: empty_html: Siin pole veel midagi. Laadi üles uus rada või uuri GPS-radade kohta vikileheküljelt. upload_trace: Lisa GPS-rada - see_all_traces: Vaata kõiki GPS-radasid - see_my_traces: Vaata minu radu destroy: scheduled_for_deletion: Raja kustutamine kantud tööplaani. offline_warning: @@ -2140,8 +2163,9 @@ et: show: title: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})' heading_html: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})' - created: Loodud - status: Olek + created: 'Loodud:' + duration: 'Kestus:' + status: 'Olek:' show: Näita edit: Redigeeri revoke: Tühista! @@ -2169,6 +2193,7 @@ et: title: Kasutaja %{user} loodud või kommenteeritud märkused heading: Kasutaja %{user} märkused subheading_html: Kasutaja %{user} loodud või kommenteeritud märkused + no_notes: Märkused puuduvad. id: ID creator: Looja description: Kirjeldus diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 368ca8393..e09470fb3 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -61,6 +61,7 @@ eu: diary_comment: Eguneroko iruzkina diary_entry: Eguneroko sarrera friend: Laguna + issue: Arazoa language: Hizkuntza message: Mezua node: Nodo @@ -90,8 +91,17 @@ eu: way_tag: Bidearen etiketa attributes: client_application: + name: Izena (beharrezkoa) + url: Aplikazio nagusiaren URL (beharrezkoa) callback_url: Berriz deitzeko URLa support_url: Laguntza URLa + allow_read_prefs: irakurri haien erabiltzaile hobespenak + allow_write_prefs: aldatu haien erabiltzaile hobespenak + allow_write_diary: sortu eguroko sarreak, iruzkinak eta lagunak egin + allow_write_api: mapa aldatu + allow_read_gpx: irakurri haien GPS aztarna pribatuak + allow_write_gpx: GPS aztarnak igo + allow_write_notes: oharrak aldatu diary_comment: body: Gorputza diary_entry: @@ -127,6 +137,7 @@ eu: category: 'Aukeratu arrazoi bat zure txostenerako:' details: Mesedez, eman arazoaren inguruko xehetasun gehiago (beharrezkoa). user: + auth_uid: Autentikazio UID email: Eposta email_confirmation: 'E-posta egiaztapena:' new_email: 'E-posta helbide berria:' @@ -154,6 +165,9 @@ eu: pribatutasun politika, helbide elektronikoei buruzko atala ere bai">pribatutasun politika) informazio gehiagorako. new_email: (inoiz ez da publikoki bistaratuko) + datetime: + distance_in_words_ago: + half_a_minute: duela minutu erdi editor: default: Lehenetsia (orain %{name}) id: @@ -161,7 +175,16 @@ eu: description: iD (nabigatzaile barneko editorea) remote: name: Urrutiko agintea - description: Urrutiko kontrola (JOSM edo Merkaartor) + description: Urrutiko agintea (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Ezer + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -253,6 +276,7 @@ eu: entry_html: '%{relation_name} erlazioa' entry_role_html: '%{relation_name} erlazioa (%{relation_role} rolean)' not_found: + title: Ez da aurkitu sorry: 'Barkatu, %{type} #%{id} ezin izan da aurkitu.' type: node: nodo @@ -290,6 +314,7 @@ eu: wikidata_link: '%{page} elementua Wikidatan' wikipedia_link: '%{page} artikulua Wikipedian' telephone_link: Deitu %{phone_number} zenbakira + colour_preview: '%{colour_value} kolore aurrikuspena' note: title: 'Oharra: %{id}' new_note: Ohar berria @@ -366,8 +391,8 @@ eu: new: title: Eguneroko Sarrera Berria form: - location: 'Kokapena:' - use_map_link: erabili mapa + location: Kokapena + use_map_link: Erabili mapa index: title: Erabiltzaileen egunerokoak title_friends: Lagunen egunerokoak @@ -376,6 +401,7 @@ eu: in_language_title: Eguneroko Sarrerak %{language} hizkuntzan new: Eguneroko sarrera berria new_title: Nire erabiltzaile egunerokoan sarrera berri bat sortu + my_diary: Nire egunerokoa no_entries: Eguneroko sarrerarik ez recent_entries: Azkenengoko eguneroko sarrerak older_entries: Sarrera zaharragoak @@ -397,7 +423,7 @@ eu: diary_entry: posted_by_html: '%{link_user}k %{created}n argitaratua %{language_link} hizkuntzan' comment_link: Sarrera honetan iruzkina utzi - reply_link: Sarrera honi erantzun + reply_link: Egileari mezua bidali comment_count: one: iruzkin %{count} zero: Iruzkinik ez @@ -467,6 +493,7 @@ eu: pylon: Goi-tentsioko dorrea station: Antena Estazioa t-bar: Teleskia + "yes": Aire-bidea aeroway: aerodrome: Aerodromoa airstrip: Lurreratze pista @@ -477,6 +504,7 @@ eu: holding_position: Pozisioari eusten parking_position: Aparkatze Posizioa runway: Lurreratze pista + taxilane: Taxi bidea taxiway: Taxi bidea terminal: Terminala amenity: @@ -489,7 +517,9 @@ eu: bench: Bankua bicycle_parking: Txirrinduentzako aparkalekua bicycle_rental: Txirrindu Alokairua + bicycle_repair_station: Bizikletak konpontzeko lekua biergarten: Terraza + blood_bank: Odol-bankua boat_rental: Txalupen alokairua brothel: Putetxea bureau_de_change: Diru-truke Bulegoa @@ -506,6 +536,7 @@ eu: clock: Erlojua college: Unibertsitatea community_centre: Komunitate Zentroa + conference_centre: Hitzaldi zentroa courthouse: Epaitegia crematorium: Erraustegia dentist: Dentista @@ -525,16 +556,21 @@ eu: hospital: Ospitalea hunting_stand: Ehiza postua ice_cream: Izozkiak + internet_cafe: Ziberkafea kindergarten: Haurtzaindegia + language_school: Hizkuntza eskola library: Liburutegia + love_hotel: Bikoteentzako hotela marketplace: Merkatua monastery: Monastegia motorcycle_parking: Motorrentzako aparkalekua + music_school: Musika eskola nightclub: Gau-kluba nursing_home: Zaharren egoitza parking: Aparkalekua parking_entrance: Aparkalekuko sarrera parking_space: Aparkalekua + payment_terminal: Ordainketa lekua pharmacy: Farmazia place_of_worship: Otoitzerako Lekua police: Polizia @@ -542,7 +578,9 @@ eu: post_office: Postetxea prison: Espetxea pub: Pub-a + public_bath: Komun publiko public_building: Eraikin publiko + ranger_station: Basozain estazioa recycling: Birziklatze gune restaurant: Jatetxea school: Eskola @@ -557,18 +595,23 @@ eu: theatre: Antzokia toilets: Komunak townhall: Udaletxea + training: Formakuntza zentroa university: Unibertsitatea + vehicle_inspection: Ibilgailu azterketa vending_machine: Salmenta automatikodun makina veterinary: Albaitaritza klinika village_hall: Herriko aretoa waste_basket: Hondakin Saskia waste_disposal: Hondakin Ezabatze Puntua + waste_dump_site: Zabortegia + watering_place: Aska water_point: Ur-puntua boundary: administrative: Muga Administratiboa census: Erroldaren muga national_park: Parke Nazionala protected_area: Babestutako Eremua + "yes": Muga bridge: aqueduct: Akueduktua boardwalk: Pasalekua @@ -577,35 +620,70 @@ eu: viaduct: Bidezubia "yes": Zubia building: + apartment: Apartamentu + apartments: Apartamentuak + barn: Aletegi + bungalow: Bungalow + cabin: Kabina chapel: Kapera - church: Eliza + church: Elizako eraikina + commercial: Merkataritza eraikin + construction: Eraikitze-lanetan dagoen eraikin + dormitory: Ikasleen egoitza + farm: Basetxe garage: Garajea + greenhouse: Negutegi + hangar: Hangar hospital: Ospitale erakina hotel: Hotela house: Etxe + hut: Txabola industrial: Eraikin industriala + kindergarten: Haurtzaindegia public: Eraikin publiko + roof: Teilatu school: Eskola eraikina + shed: Estalgune + stable: Ukuilu + static_caravan: Karabana train_station: Tren Geltokia university: Unibertsitate eraikina + warehouse: Biltegia "yes": Eraikina + club: + sport: Kirol kluba + "yes": Kluba craft: + beekeper: Erlezain + blacksmith: Errementaria brewery: Garagardotegia carpenter: Zurgina + caterer: Katering + confectionery: Gozogintza + dressmaker: Jostuna electrician: Argiketaria gardener: Lorezaina + glaziery: Beirategi + handicraft: Artisautza painter: Margolaria photographer: Argazkilaria plumber: Iturgina + roofer: Teilatugile + sawmill: Zerrategia shoemaker: Zapatagina + stonemason: Igeltseroa tailor: Jostuna + winery: Ardotegi "yes": Artisau denda emergency: ambulance_station: Anbulantzia geralekua assembly_point: Bilera Puntua defibrillator: Desfibriladorea + fire_xtinguisher: Su itzailgailu landing_site: Larrialdi lurreratze-gunea + life_ring: Salbamendu-jaka phone: Larrialdi telefonoa + siren: Larrialdietako sirena water_tank: Larrialdietako ur tanga "yes": Larrialdia highway: @@ -672,6 +750,7 @@ eu: mine: Meategia mine_shaft: Meatze putzua monument: Monumentua + railway: Burdinbide historiko roman_road: Erromatar Bidea ruins: Hondakinak stone: Harria @@ -685,6 +764,7 @@ eu: "yes": Bide-gurutzea landuse: allotments: Alokatutako baratzeak + aquaculture: Akuikultura basin: Arroa brownfield: Antzinako industria eremua cemetery: Hilerria @@ -715,8 +795,10 @@ eu: vineyard: Mahastia "yes": Lur-erabilera leisure: + bandstand: Musika kiosko beach_resort: Hondartza Konplexua bird_hide: Hegazti Aterpea + bleachers: Harmailak common: Lur Komunak dog_park: Txakurrentzako Parkea firepit: Su Putzua @@ -731,6 +813,7 @@ eu: miniature_golf: Minigolfa nature_reserve: Natura-erreserba park: Parkea + picnic_table: Piknik mahaia pitch: Kirolgunea playground: Jolastokia recreation_ground: Aisialdi-gunea @@ -745,13 +828,16 @@ eu: "yes": Aisialdia man_made: adit: Galeriara sarrera + antenna: Antena beacon: Itsas argia + beam: Barra beehive: Erlauntza breakwater: Dikea bridge: Zubia bunker_silo: Bunkerra chimney: Tximinia crane: Garabia + cross: Gurutze dolphin: Mutiloia dyke: Dikea embankment: Lubeta @@ -770,9 +856,11 @@ eu: silo: Siloa storage_tank: Biltegiratze tanga surveillance: Zaintza + telescope: Teleskopioa tower: Dorrea wastewater_plant: Ur araztegia watermill: Errota hidraulikoa + water_tap: Ur-giltza water_tower: Ur dorrea water_well: Putzua water_works: Ur Lanak @@ -783,10 +871,13 @@ eu: airfield: Aireportu militarra barracks: Kuartelak bunker: Bunkerra + checkpoint: Kontrol-puntu + trench: Lubaki "yes": Armada mountain_pass: "yes": Mendatea natural: + atoll: Atoloi bay: Badia beach: Hondartza cape: Lurmuturra @@ -803,12 +894,14 @@ eu: grassland: Belardia heath: Mortua hill: Muinoa + hot_spring: Iturri termal island: Irla land: Lurra marsh: Zingira moor: Mortua mud: Lohia peak: Gailurra + peninsula: Peninsula point: Puntua reef: Arrezifea ridge: Gailurra @@ -832,6 +925,7 @@ eu: architect: Arkitektoa association: Elkartea company: Enpresa + diplomatic: Bulego diplomatiko educational_institution: Hezkuntza erakundea employment_agency: Enplegu Agentzia estate_agent: Higiezinen Agentea @@ -840,11 +934,14 @@ eu: it: IT Bulegoa lawyer: Abokatua ngo: GKE bulegoa + notary: Notario + tax_advisor: Zerga-aholkulari telecommunication: Telekomunikazio bulegoa travel_agent: Bidaia-agentzia "yes": Bulegoa place: allotments: Alokatutako baratzeak + archipelago: Artxipelagoa city: Hiria city_block: Hiri Blokea country: Herrialdea @@ -859,6 +956,7 @@ eu: locality: Lokalitatea municipality: Udalerria neighbourhood: Auzoa + plot: Lursail postcode: Posta-kodea quarter: Auzoa region: Eskualdea @@ -910,20 +1008,26 @@ eu: car_repair: Autoen Konponketa carpet: Alfonbra-denda charity: Karitate-denda + cheese: Gazta-denda chemist: Farmazia + chocolate: Txokolategi clothes: Jantzi-denda + coffee: Kafe-denda computer: Ordenagailu-denda confectionery: Gozotegia convenience: Erosotasun-denda copyshop: Kopia-denda cosmetics: Kosmetika-denda + curtain: Gortina-denda deli: Urdaitegia department_store: Departamendu-denda discount: Deskontudun Item-denda doityourself: Zuk-Zeuk-Egin dry_cleaning: Lehorreko Garbiketa electronics: Elektronika-denda + erotic: Denda erotiko estate_agent: Higiezinen agentea + fabric: Tela-denda farm: Baserri-denda fashion: Moda-denda florist: Lore-saltzailea @@ -937,25 +1041,32 @@ eu: grocery: Janari-denda hairdresser: Ileapaindegia hardware: Hardware-denda + hearing_aids: Audifono-denda + herbalist: Belardenda hifi: Hi-Fi houseware: Etxeko artikuluetako Denda + ice_cream: Izozki denda interior_decoration: Barne-dekorazioa jewelry: Bitxi-denda kiosk: Kioskoa kitchen: Sukaldaritza denda laundry: Garbitegia + locksmith: Sarrailagile lottery: Loteria mall: Merkataritza-gunea massage: Masajea mobile_phone: Sakelakoen denda motorcycle: Motozikleta-denda music: Musika-denda + musical_instrument: Musika-instrumentuak newsagent: Kiosko-saltzailea optician: Optikaria organic: Janari organikoko denda outdoor: Kanpoko denda paint: Margo denda + pastry: Gozotegi pawnbroker: Mailegu-emailea + perfumery: Lurrindegi pet: Animalia-denda photo: Argazki-denda seafood: Itsaskiak @@ -965,6 +1076,8 @@ eu: stationery: Paper-denda supermarket: Supermerkatua tailor: Jostuna + tattoo: Tatuaje-denda + tea: Te denda ticket: Tiket denda tobacco: Tabako Denda toys: Jostailu denda @@ -973,6 +1086,7 @@ eu: vacant: Denda Librea variety_store: Askotariko denda video: Bideo-denda + video_games: Bideojoko denda wine: Ardodenda "yes": Denda tourism: @@ -982,6 +1096,7 @@ eu: attraction: Atrakzioa bed_and_breakfast: Ohe eta gosari (B&B) cabin: Kabina + camp_pitch: Kanpaleku camp_site: Kanpin caravan_site: Karabana gunea chalet: Txaleta @@ -1021,12 +1136,15 @@ eu: "yes": Urbidea admin_levels: level2: Herrialdeko muga + level3: Eskualdeko muga level4: Estatuko muga level5: Eskualdeko muga level6: Konderriko muga + level7: Udal muga level8: Udal muga level9: Herriko muga level10: Auzoko muga + level11: Auzo muga types: cities: Hiriak towns: Herriak @@ -1166,6 +1284,7 @@ eu: partners_ucl: UCLa partners_bytemark: Bytemark Ostatua partners_partners: bazkideak + tou: Erabilera-baldintzak osm_offline: OpenStreetMap datu-basea orain konexiorik gabe dago funtsezko datu-basearen mantentze lanak burutzen diren bitartean. osm_read_only: OpenStreetMap datu-basea irakurtzeko soilik moduan dago, oinarrizko @@ -1206,9 +1325,11 @@ eu: befriend_them: Hura adiskidetzat gehitzeko aukera ere baduzu, %{befriendurl} orrian. gpx_failure: + hi: Kaixo %{to_user}, failed_to_import: 'inportzean kale egin du. Hemen dago akatsa:' subject: '[OpenStreetMap] GPX Inportazioan porrota' gpx_success: + hi: Kaixo %{to_user}, loaded_successfully: '%{trace_points} puntuekin %{possible_points} puntuetatik arrakastaz kargatu da.' subject: '[OpenStreetMap] GPX Inportazioan arrakasta' @@ -1344,6 +1465,7 @@ eu: body: Barkatu baina id horrekin ez dago mezurik. outbox: title: Irteerako ontzia + my_inbox: Nire sarrera-ontzia messages: one: '%{count} Mezua bidali duzu' other: ' %{count} Mezuak bidali dituzu' @@ -1441,9 +1563,6 @@ eu: wikipedia: title: Saioa hasi Wikipediarekin alt: Wikipedia kontuarekin saioa hasi - yahoo: - title: Saioa hasi Yahoorekin - alt: Yahoo Open IDarekin saioa hasi wordpress: title: Wordpress bidez saioa hasi alt: Wordpress ID irekiarekin saioa hasi @@ -1454,6 +1573,19 @@ eu: title: Saio-itxiera heading: OpenStreetMap-etik saioa itxi logout_button: Saioa itxi + shared: + markdown_help: + heading: Goiburua + subheading: Azpi-goiburua + unordered: Ordenik gabeko zerrenda + ordered: Ordenatutako zerrenda + link: Esteka + text: Testua + image: Irudia + url: URL + richtext_field: + edit: Aldatu + preview: Aurreikuspena site: about: next: Hurrengoa @@ -1711,7 +1843,7 @@ eu: description: Hasiberrientzako mantentze-gida komunitarioa. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org + title: Laguntza foroa description: Egin galdera bat edo begiratu OSMn galdera-eta-erantzun gunean. mailing_lists: title: Posta Bidaltze Zerrendak @@ -1735,7 +1867,7 @@ eu: Aurkitu jakin beharrekoa Ongietorri Lanpasean. wiki: url: http://wiki.openstreetmap.org/wiki/Eu:Main_Page - title: wiki.openstreetmap.org + title: OpenStreetMap Wiki description: Arakatu wikia informazio zehatzeko OSM dokumentaziorako. sidebar: search_results: Bilaketaren emaitzak @@ -1908,6 +2040,7 @@ eu: uploaded: 'Noiz igota:' points: 'Puntuak:' start_coordinates: 'Koordenatuak hasi:' + coordinates_html: '%{latitude}; %{longitude}' map: mapa edit: aldatu owner: 'Jabea:' @@ -1925,7 +2058,9 @@ eu: newer: Aztarna berriagoak trace: pending: PRIBATUA - count_points: '%{count} puntu' + count_points: + one: puntu 1 + other: '%{count} puntu' more: gehiago trace_details: Ikusi Aztarna Xehetasunak view_map: Mapa ikusi @@ -1938,7 +2073,7 @@ eu: in: barruan index: public_traces: GPS aztarna publikoak - my_traces: Nire GPS aztarnak + my_traces: Nire aztarnak public_traces_from: '%{user} erabiltzailearen GPS aztarna publikoak' description: Arakatu azkenaldian egin dire GPS ibilbide igoerak tagged_with: '%{tags}(r)ekin etiketatua' @@ -1946,8 +2081,7 @@ eu: berria edo GPS birziklatzeari buruz gehiago jakin nahi baduzu wiki orrira jo . upload_trace: Aztarna bat igo - see_all_traces: Aztarna guztiak ikusi - see_my_traces: Nire aztarnak ikusi + all_traces: Aztarna guztiak destroy: scheduled_for_deletion: Ezabatzear dauden aztarnak make_public: @@ -2034,6 +2168,7 @@ eu: no_apps_html: Gurekin erabiltzeko erregistratu nahi duzun aplikazio bat duzu %{oauth} estandarraren bidez? Zure web aplikazioa erregistratu behar duzu OAuth zerbitzurako eskaera egin aurretik. + oauth: OAuth registered_apps: 'Ondorengo bezero aplikazio erregistratuak dituzu:' register_new: Zure aplikazio erregistratu form: @@ -2077,13 +2212,15 @@ eu: terms: title: Baldintzak heading: Baldintzak - consider_pd: Goiko hitzarmenaz gain, nire ekarpenak Domeinu Publikoan egon behar - direla uste dut + heading_ct: Kolaboratzaile terminoak + consider_pd: Goikoaz gain, nire ekarpenak Domeinu Publikoan egon behar direla + uste dut consider_pd_why: zer da hau? consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Termino hauek ulertzeko informazioa: giza laburpen irakurgarria eta batzuk itzulpen informalak ' + continue: Jarraitu declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Ez onartu you need to accept or decline: Irakurri eta gero, onartu edo ezetsi Kolaboratzaileen @@ -2171,13 +2308,13 @@ eu: account: title: Kontua aldatu my settings: Nire aukerak - current email address: 'Egungo eposta helbidea:' - external auth: 'Kanpoko Autentifikazioa:' + current email address: Egungo posta helbidea + external auth: Kanpoko Autentifikazioa openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: zer da hau? public editing: - heading: 'Aldaketa publikoak:' + heading: Aldaketa publikoak enabled: Gaituta. Ez da anonimoa eta datuak editatu ditzake. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: zer da hau? @@ -2195,7 +2332,7 @@ eu: publikoa bihurtzearekin.

      • Ekintza hau ezin da alderantzikatu eta erabiltzaile berri guztiek lehenespenez publikoak direlako.
      contributor terms: - heading: 'Kolaboratzaile Terminoak:' + heading: Kolaboratzaile Terminoak agreed: Kolaboratzaile-termino berriak onartu dituzu. not yet agreed: Oraindik ez duzu Laguntzaileen Baldintza berririk onartu. review link text: Mesedez, jarraitu esteka hau zure Kolaboratzaile Terminoaen @@ -2203,10 +2340,11 @@ eu: agreed_with_pd: Zure aldaketak domeinu publikoan egongo direla adierazi duzu. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: zer da hau? - image: 'Irudia:' + image: Irudia gravatar: gravatar: Gravatar erabili link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Zer da Gravatar? disabled: Gravatar desgaitu da. enabled: Zure Gravatar bistaratzea gaitu da. new image: Irudi bat gehitu @@ -2214,7 +2352,7 @@ eu: delete image: Oraingo irudia kendu replace image: Oraingo irudia ordezkatu image size hint: (gutxienez 100x100ko irudi koadroak hobeto funtzionatzen dute) - home location: 'Etxeko Kokalekua:' + home location: Etxeko Kokalekua no home location: Zure etxe-helbidea ez duzu txertatu. update home location on click: Eguneratu etxeko kokalekua mapan klik egiten dudanean? @@ -2355,8 +2493,9 @@ eu: show: title: '%{block_on} %{block_by}k blokeatu du' heading_html: '%{block_on} %{block_by}k blokeatu du' - created: Sortua - status: Egoera + created: 'Sortua:' + duration: 'Iraupena:' + status: 'Egoera:' show: Erakutsi edit: Aldatu revoke: Ezeztatu! @@ -2384,6 +2523,7 @@ eu: title: '%{user}k igotako edo iruzkinak utzitako oharrak' heading: '%{user} erabiltzailearen oharrak' subheading_html: '%{user}k igotako edo iruzkinak utzitako oharrak' + no_notes: Oharrik ez id: Id-a creator: Sortzailea description: Deskribapena @@ -2424,9 +2564,11 @@ eu: title: Erakutsi nire kokapena base: standard: Arrunta + cyclosm: CyclOSM cycle_map: Bizikletentzako mapa transport_map: Garraioen mapa hot: Humanitarioa + opnvkarte: ÖPNVKarte layers: header: Maparen geruzak notes: Maparen oharrak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index fd796b7f2..816f2f66a 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1726,9 +1726,6 @@ fa: wikipedia: title: ورود با ویکی‌پدیا alt: ورود با حساب ویکی‌پدیا - yahoo: - title: ورود با یاهو - alt: ورود با حساب OpenID یاهو wordpress: title: ورود با وردپرس alt: ورود با OpenID وردپرس @@ -2268,8 +2265,6 @@ fa: کنید یا در صفحهٔ ویکی دربارهٔ ضبط ردهای GPS بیشتر بخوانید. upload_trace: بارگذاری یک رد - see_all_traces: دیدن همهٔ ردها - see_my_traces: ردهای من destroy: scheduled_for_deletion: این رد در زمان‌بندی حذف قرار گرفت make_public: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7c5a0f410..e5ec1efee 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -518,6 +518,7 @@ fi: description: Tuoreimmat OpenStreetMapin käyttäjien päiväkirjamerkinnät comments: has_commented_on: '%{display_name} on kommentoinut seuraavia päiväkirjamerkintöjä' + no_comments: Ei päiväkirjamerkintöjä post: Kommentti when: Päiväys comment: Kommentti @@ -794,11 +795,13 @@ fi: unclassified: Luokittelematon tie "yes": Tie historic: + aircraft: Historiallinen lentokone archaeological_site: Arkeologinen kohde battlefield: Taistelukenttä boundary_stone: Rajakivi building: Historiallinen rakennus bunker: Bunkkeri + cannon: Historiallinen tykki castle: Linna church: Kirkko city_gate: Kaupungin portti @@ -988,6 +991,7 @@ fi: architect: Arkkitehti association: Yhdistys company: Yritys + diplomatic: Diplomaattinen edustusto educational_institution: Oppilaitos employment_agency: Työnvälitystoimisto estate_agent: Kiinteistönvälittäjä @@ -1194,6 +1198,7 @@ fi: "yes": Vesistö admin_levels: level2: Valtion raja + level3: Alueraja level4: Osavaltion raja level5: Alueen raja level6: Maakunnan raja @@ -1201,6 +1206,7 @@ fi: level8: Kunnan raja level9: Kylän raja level10: Asuinalueen raja + level11: Naapuruston raja types: cities: Kaupungit towns: Kylät @@ -1364,6 +1370,8 @@ fi: hi: Hei %{to_user}! header: '%{from_user} kommentoi kirjoittamaasi päiväkirjamerkintää OpenStreetMapissa otsikolla %{subject}:' + header_html: '%{from_user} on kommentoinut OpenStreetMap-päiväkirjamerkintää + otsikolla %{subject}:' footer: Lue kommentti sivulla %{readurl}. Jatkokommentin voi lähettää sivulla %{commenturl} tai lähettää viestin tekijälle sivulla %{replyurl}. message_notification: @@ -1371,6 +1379,8 @@ fi: hi: Hei %{to_user}! header: '%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:' + header_html: '%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikolla + %{subject}:' footer_html: Lue viesti osoitteessa %{readurl} ja lähetä viesti tekijälle osoitteessa %{replyurl}. friendship_notification: @@ -1635,9 +1645,6 @@ fi: wikipedia: title: Kirjaudu sisään Wikipedialla alt: Kirjaudu sisään Wikipedia-tunnuksella - yahoo: - title: Kirjaudu Yahoon avulla - alt: Kirjaudu käyttämällä Yahoo OpenID -tunnustasi wordpress: title: Kirjaudu WordPressin avulla alt: Kirjaudu käyttämällä Wordpress OpenID -tunnustasi @@ -2176,8 +2183,6 @@ fi: empty_html: Sivu on tyhjä. Lähetä uusi GPS-jälki tai lue lisätietoja GPS-jälkien keräämisestä wikisivulta. upload_trace: Lisää GPS-jälki - see_all_traces: Näytä kaikki jäljet - see_my_traces: Katsele jälkiäni destroy: scheduled_for_deletion: Jälki on poistojonossa. make_public: @@ -2602,6 +2607,7 @@ fi: title: '%{block_on} estetty käyttäjän %{block_by} toimesta' heading_html: '%{block_on} estetty käyttäjän %{block_by} toimesta' created: Luotu + duration: 'Kesto:' status: Tila show: Näytä edit: Muokkaa diff --git a/config/locales/fit.yml b/config/locales/fit.yml index c85e9e660..02ec98a26 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -116,8 +116,8 @@ fit: datetime: distance_in_words_ago: about_x_hours: - one: noin 1 tiima sitten - other: noin %{count} tiimaa sitten + one: nuin 1 tiima sitten + other: nuin %{count} tiimaa sitten about_x_months: one: noin 1 kuukausi sitten other: noin %{count} kuukautta sitten diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 19b4f926c..696f25378 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1840,9 +1840,6 @@ fr: wikipedia: title: Connexion avec Wikipédia alt: Se connecter avec un compte de Wikipédia - yahoo: - title: Connexion avec Yahoo - alt: Se connecter avec un OpenID de Yahoo wordpress: title: Connexion avec Wordpress alt: Se connecter avec un OpenID de Wordpress @@ -2398,7 +2395,7 @@ fr: in: dans index: public_traces: Traces GPS publiques - my_traces: Mes traces GPS + my_traces: Mes traces public_traces_from: Traces GPS publiques de %{user} description: Parcourir les traces GPS récemment téléversées tagged_with: balisée avec %{tags} @@ -2407,8 +2404,9 @@ fr: page wiki. upload_trace: Envoyer une trace - see_all_traces: Voir toutes les traces - see_my_traces: Voir mes traces + all_traces: Toutes les traces + traces_from: Traces publiques de %{user} + remove_tag_filter: Supprimer le filtre de balise destroy: scheduled_for_deletion: Trace prévue pour la suppression make_public: diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 49122f239..5806b9f8b 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -982,9 +982,6 @@ fur: wikipedia: title: Jentre cun Vichipedie alt: Jentre cuntun cont de Vichipedie - yahoo: - title: Jentre cun Yahoo - alt: Jentre cuntun OpenID Yahoo wordpress: title: Jentre cun Wordpress alt: Jentre cuntun OpenID Wordpress @@ -1214,8 +1211,6 @@ fur: description: Viôt i percors GPS cjamâts sù tai ultins timps tagged_with: ' etichetât cun %{tags}' upload_trace: Cjame un percors - see_all_traces: Cjale ducj i percors - see_my_traces: Cjale i miei percors georss: title: Percors GPS di OpenStreetMap description: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 4e99d2b08..ffecff38e 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -9,22 +9,33 @@ ga: formats: friendly: '%e %B %Y ag %H:%M' helpers: + file: + prompt: Roghnaigh comhad submit: diary_comment: create: Sábháil diary_entry: create: Foilsigh + issue_comment: + create: Cuir nóta tráchta leis message: create: Seol client_application: create: Cláraigh - update: Cuir in eagar + update: Nuashonraigh + redaction: + create: Cruthaigh ceilt + update: Sábháilt ceilt trace: create: Uaslódáil update: Sábháil na hAthruithe user_block: create: Cruthaigh bac + update: Cruthaigh bac activerecord: + errors: + messages: + invalid_email_address: ', is cosúil nach seoladh ríomhphost bailí é' models: changeset: Tacar athruithe changeset_tag: Clib do Thacar athruithe @@ -32,10 +43,12 @@ ga: diary_comment: Nóta Tráchta Dialainne diary_entry: Iontráil Dialainne friend: Cara + issue: Fadhb language: Teanga message: Teachtaireacht node: Nód node_tag: Clib do Nód + notifier: An té a thug fógra old_node: Sean-nód old_node_tag: Sean-Chlib Nóid old_relation: Sean-Ghaol @@ -47,6 +60,7 @@ ga: relation: Gaol relation_member: Ball de Ghaol relation_tag: Clib Gaoil + report: Tuairiscigh session: Seisiún trace: Lorg tracepoint: Pointe Loirg @@ -59,8 +73,18 @@ ga: way_tag: Clib Bhealaigh attributes: client_application: + name: Ainm (riachtanach) + url: URL an phríomhfheidhmchláir (riachtanach) callback_url: URL Aisghlaoigh support_url: URL Tacaíochta + allow_read_prefs: a s(h)ainroghanna úsáideora a léamh + allow_write_prefs: a s(h)ainroghanna úsáideora a athrú + allow_write_diary: iontrálacha dialainne agus nótaí tráchta a chruthú agus + cairde a dhéanamh + allow_write_api: an léarscáil a athrú + allow_read_gpx: a loirg phríobháideacha GPS a léamh + allow_write_gpx: loirg GPS a uaslódáil + allow_write_notes: nótaí a athrú diary_comment: body: Corp diary_entry: @@ -75,39 +99,64 @@ ga: trace: user: Úsáideoir visible: Infheicthe - name: Ainm + name: Ainm an chomhaid size: Méid latitude: domhanleithead longitude: Domhanfhad public: Poiblí description: Cur síos - gpx_file: 'Comhad GPX a Uaslódáil:' - visibility: 'Infheictheacht:' - tagstring: 'Clibeanna:' + gpx_file: Comhad GPX a Uaslódáil + visibility: Infheictheacht + tagstring: Clibeanna message: sender: Seoltóir title: Ábhar body: Corp recipient: Faighteoir redaction: + title: Teideal description: Cur síos + report: + category: Roghnaigh cúis don tuairisc uait + details: Tabhair roinnt sonraí breise faoin bhfadhb (riachtanach) user: + auth_provider: Soláthraí Fíordheimhniúcháin + auth_uid: UID Fíordheimhnithe email: Ríomhphost - new_email: 'An seoladh ríomhphoist nua:' + email_confirmation: Deimhniú ar an seoladh ríomhphost + new_email: An seoladh ríomhphoist nua active: Gníomhach display_name: Ainm Taispeána - description: Cur síos - home_lat: 'Domhanleithead:' - home_lon: 'Domhanfhad:' - languages: Teangacha + description: Cur síos ar an bpróifíl + home_lat: Domhanleithead + home_lon: Domhanfhad + languages: Rogha Teangacha + preferred_editor: Rogha Eagarthóra pass_crypt: Focal Faire + pass_crypt_confirmation: Deimhnigh an Focal Faire help: trace: tagstring: teormharcáilte le camóga user_block: + reason: An chúis go bhfuil bac á chur ar an úsáideoir. Déan iarracht a bheith + chomh stuama agus réasúnta agus is féidir agus an oiread sonraí is féidir + a thabhairt faoi gcás, agus coinnigh i gcuimhne go mbeidh an teachtaireacht + le feiceáil go poiblí. Ná dearmad nach mbeidh béarlagar an chomhphobail + ar eolas ag gach úsáideoir, mar sin déan iarracht téarmaí simplí a úsáid. needs_view: An gá don úsáideoir logáil isteach sula mbainfear an bac seo? user: + email_confirmation: Ní thaispeáintear do sheoladh go poiblí, féach an polasaí + príobháideachta atá againn chun tuilleadh eolais a fháil. new_email: (nach dtaispeántar go poiblí riamh) + datetime: + distance_in_words_ago: + about_x_hours: + one: aon uair an chloig ó shin + two: dhá uair an chloig ó sin + few: '%{count} uair an chloig ó shin' + many: '%{count} n-uair an chloig ó shin' + other: uair an chloig ó sin editor: default: Réamhshocraithe (%{name} faoi láthair) id: @@ -115,7 +164,16 @@ ga: description: iD (eagathóir sa bhrabhsálaí) remote: name: Cianrialú - description: Cianrialú (JOSM nó Merkaartor) + description: Cianrialú (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Ceann ar bith + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Vicipéid api: notes: rss: @@ -260,7 +318,7 @@ ga: changeset_paging_nav: showing_page: Leathanach %{page} next: Ar aghaidh » - previous: « Roimhe + previous: « Siar changeset: anonymous: Gan Ainm no_edits: (níl aon athrú ann) @@ -290,15 +348,20 @@ ga: comment: comment: Nóta tráchta nua ar thacar athruithe %{changeset_id} ó %{author} commented_at_by_html: Nuashonraithe %{when} ó shin ag %{user} + comments: + comment: Nóta tráchta nua ar thacar athruithe %{changeset_id} ó %{author} index: title_all: Plé ar thacair athruithe OpenStreetMap title_particular: Plé ar thacar athruithe %{changeset_id} de chuid OpenStreetMap + timeout: + sorry: Ár leithscéil, thóg sé rófhada an liosta de na tacair athruithe a d'iarr + tú a aisghabháil. diary_entries: new: title: Iontráil Nua Dialainne form: - location: 'Suíomh:' - use_map_link: an léarscáil a úsáid + location: Suíomh + use_map_link: An Léarscáil a Úsáid index: title: Dialanna úsáideoirí title_friends: Dialanna cairde @@ -306,13 +369,14 @@ ga: user_title: Dialann %{user} in_language_title: 'Iontrálacha Dialainne i: %{language}' new: Iontráil Nua Dialainne - new_title: Scríobh iontráil nua i mo dhialann úsáideora + new_title: Iontráil nua a scríobh i mo dhialann úsáideora + my_diary: Mo Dhialann no_entries: Níl aon iontráil dialainne ann recent_entries: Iontrálacha dialainne le déanaí older_entries: Iontrálacha Níos Sine newer_entries: Iontrálacha Níos Nuaí edit: - title: Cuir iontráil dialainne in eagar + title: Iontráil dialainne a chur in eagar marker_text: Suíomh na hiontrála dialainne show: title: Dialann %{user} | %{title} @@ -328,19 +392,26 @@ ga: tú mícheart. diary_entry: posted_by_html: 'Postáilte ag %{link_user} ar an %{created} sa teanga seo: %{language_link}' + updated_at_html: Nuashonrú deireanach an %{updated} comment_link: Déan trácht ar an iontráil seo reply_link: Tabhair freagra ar an iontráil seo comment_count: - zero: Níl aon nóta tráchta ann one: Aon nóta tráchta amháin + two: Dhá nóta tráchta + few: '%{count} nóta tráchta' + many: '%{count} nóta tráchta' other: '%{count} nóta tráchta' edit_link: Cuir an iontráil seo in eagar hide_link: Folaigh an iontráil seo + unhide_link: Taispeáin an iontráil seo confirm: Deimhnigh + report: Déan an iontráil seo a thuairisciú diary_comment: comment_from_html: Nóta tráchta ó %{link_user} ag %{comment_created_at} hide_link: Folaigh an nóta tráchta seo + unhide_link: Taispeáin an nóta tráchta seo confirm: Deimhnigh + report: Déan an nóta tráchta seo a thuairisciú location: location: 'Suíomh:' view: Amharc @@ -359,6 +430,7 @@ ga: comments: has_commented_on: Rinne %{display_name} nótaí tráchta ar na hiontrálacha dialainne seo a leanas + no_comments: Níl aon nóta tráchta dialainne ann post: Postáil when: Cá huair comment: Nóta tráchta @@ -370,6 +442,7 @@ ga: button: Cuir leis mar chara success: Is cara leat %{name} anois! failed: Ár leithscéal, níorbh fhéidir %{name} a chur leis mar chara. + already_a_friend: Is cairde tú féin agus %{name} cheana féin geocoder: search: title: @@ -880,7 +953,7 @@ ga: "yes": Siopa tourism: alpine_hut: Bothán Alpach - apartment: Árasán + apartment: Árasán saoire artwork: Saothar ealaíne attraction: Ní is díol spéise bed_and_breakfast: Lóistín (B&B) @@ -1305,9 +1378,6 @@ ga: wikipedia: title: Logáil isteach le Vicipéid alt: Logáil isteach le Cuntas Vicipéid - yahoo: - title: Logáil isteach le Yahoo - alt: Logáil isteach le OpenID Yahoo wordpress: title: Logáil isteach le Wordpress alt: Logáil isteach le OpenID Wordpress @@ -1322,8 +1392,8 @@ ga: about: next: Ar aghaidh copyright_html: ©Rannchuiditheoirí
      OpenStreetMap - used_by_html: Cuireann %{name} sonraí léarscáile ar fáil do na mílte suíomh - gréasáin, feidhmchlár móibíleach agus gléas crua-earraí + used_by_html: Cumhachtaíonn %{name} sonraí léarscáile ar na mílte suíomh gréasáin, + feidhmchlár móibíleach agus gléas crua-earraí local_knowledge_title: Eolas Áitiúil community_driven_title: Faoi Smacht an Phobail open_data_title: Sonraí Oscailte @@ -1360,9 +1430,8 @@ ga: tú orthu, ní fhéadfaidh tú an toradh sin a dháileadh ach faoin gceadúnas céanna. Tá míniú ar do chearta agus ar do fhreagrachtaí sa chód dlíthiúil iomlán. - intro_3_1_html: Tá an chartagrafaíocht sna tíleanna léarscáile atá againn, - agus an doiciméadú, ceadúnaithe faoin gceadúnas Sannta-Comhroinnte - Comhionann 2.0 de chuid Creative Commons (CC BY-SA). + intro_3_1_html: Tá ár ndoiciméadú ceadúnaithe faoin gceadúnas Sannta-Comhroinnte + Comhionann 2.0 de chuid Creative Commons (CC BY-SA 2.0). credit_title_html: Conas OpenStreetMap a lua credit_1_html: Ceanglaímid ort an lua “©Rannchuiditheoirí OpenStreetMap” a úsáid. @@ -1502,7 +1571,7 @@ ga: title: Cabhair a Fháil welcome: url: /welcome - title: Fáilte go OSM + title: Fáilte go OpenStreetMap description: Tosaigh leis an treoir thapa seo a chlúdaíonn gnéithe bunúsacha OpenStreetMap. beginners_guide: @@ -1511,9 +1580,9 @@ ga: description: Treoir do thosaitheoirí atá faoi stiúir an phobail. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org + title: Fóram Cabhrach description: Is féidir ceist a chur nó freagraí a chuardach ar shuíomh ceisteanna - agus freagraí OSM. + agus freagraí OpenStreetMap. mailing_lists: title: Liosta Seachadta description: Is féidir ceist a chur nó ábhair shuimiúla a phlé ar raon leathan @@ -1532,8 +1601,8 @@ ga: léarscáileanna agus seirbhísí eile atá bunaithe ar OpenStreetMap. wiki: url: https://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Brabhsáil an vicí le haghaidh doiciméadú mionsonraithe OSM. + title: Vicí OpenStreetMap + description: Brabhsáil an vicí le haghaidh doiciméadú mionsonraithe OpenStreetMap. sidebar: search_results: Torthaí an chuardaigh close: Dún @@ -1703,7 +1772,12 @@ ga: newer: Loirg Níos Úire trace: pending: AR FEITHEAMH - count_points: '%{count} pointe' + count_points: + one: Pointe amháin + two: Dhá phointe + few: '%{count} phointe' + many: '%{count}… bpointe' + other: '%{count} point' more: tuilleadh trace_details: Amharc ar Shonraí an Loirg view_map: Amharc ar an Léarscáil @@ -1724,7 +1798,6 @@ ga: nó is féidir tuilleadh a fhoghlaim faoi rianú GPS ar an leathanach vicí. upload_trace: Lorg a uaslódáil - see_all_traces: Féach gach lorg destroy: scheduled_for_deletion: Lorg sceidealta le scriosadh make_public: @@ -1844,8 +1917,8 @@ ga: continue: Cláraigh terms accepted: Go raibh maith agat as glacadh leis na téarmaí nua do rannchuiditheoirí. terms: - title: Téarmaí do rannchuiditheoirí - heading: Téarmaí do rannchuiditheoirí + title: Téarmaí + heading: Téarmaí consider_pd_why: céard é seo? decline: Diúltaigh legale_select: 'Tír chónaithe:' @@ -1879,7 +1952,7 @@ ga: mapper since: 'Ag léarscáiliú ó:' ct status: 'Téarmaí do rannchuiditheoirí:' ct declined: Diúltaithe - latest edit: 'Athrú is déanaí %{ago}:' + latest edit: 'An t-athrú is déanaí (%{ago}):' email address: 'Seoladh ríomhphoist:' created from: 'Cruthaithe ó:' status: 'Stádas:' @@ -1908,21 +1981,21 @@ ga: account: title: Cuir an cuntas in eagar my settings: Mo chuid socruithe - current email address: 'An seoladh ríomhphoist reatha:' - external auth: 'Fíordheimhniú Seachtrach:' + current email address: An seoladh ríomhphoist reatha + external auth: Fíordheimhniú Seachtrach openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: céard é seo? public editing: - heading: 'Eagarthóireacht phoiblí:' + heading: Eagarthóireacht phoiblí enabled link text: céard é seo? contributor terms: - heading: 'Téarmaí do Rannchuiditheoirí:' + heading: Téarmaí do Rannchuiditheoirí agreed: D'aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí. not yet agreed: Níor aontaigh tú leis na Téarmaí nua do Rannchuiditheoirí fós. link text: céard é seo? - image: 'Íomhá:' + image: Íomhá gravatar: gravatar: Úsáid Gravatar disabled: Díchumasaíodh Gravatar. @@ -1931,7 +2004,7 @@ ga: delete image: Bain an íomhá reatha replace image: Ionadaigh an íomhá reatha image size hint: (íomhá chearnógach atá 100x100 ar a laghad is fearr) - home location: 'Suíomh Baile:' + home location: Suíomh Baile save changes button: Sábháil na hAthruithe index: title: Úsáideoirí diff --git a/config/locales/gd.yml b/config/locales/gd.yml index bb91ca880..b8e278ded 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1225,9 +1225,6 @@ gd: wikipedia: title: Clàraich a-steach leis an Uicipeid alt: Clàraich a-steach le cunntas na h-Uicipeid - yahoo: - title: Clàraich a-steach le Yahoo - alt: Clàraich a-steach le OpenID Yahoo wordpress: title: Clàraich a-steach le Wordpress alt: Clàraich a-steach le OpenID Wordpress @@ -1711,7 +1708,6 @@ gd: suas lorgadh ùr no faigh barrachd fiosrachaidh mu lorgadh GPS air an uicidh. upload_trace: Luchdaich suas lorgadh - see_all_traces: Seall a h-uile lorgadh destroy: scheduled_for_deletion: Chaidh an lorgadh seo a chur air an sgeideil gus a sguabadh às diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 3478fbdc8..e56a7c2bd 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1754,9 +1754,6 @@ gl: wikipedia: title: Iniciar a sesión ca Wikipedia alt: Iniciar a sesión cunha conta da Wikipedia - yahoo: - title: Iniciar a sesión co Yahoo - alt: Acceder ó sistema cun OpenID do Yahoo wordpress: title: Iniciar a sesión co Wordpress alt: Acceder ó sistema cun OpenID do Wordpress @@ -2326,8 +2323,6 @@ gl: nova pista ou obteña máis información sobre as pistas GPS na páxina da wiki. upload_trace: Subir unha pista - see_all_traces: Ollar tódalas pistas - see_my_traces: Ollar as miñas pistas destroy: scheduled_for_deletion: Pista agardando a súa eliminación make_public: diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index 823700190..7535996d4 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -257,7 +257,6 @@ gsw: public_traces: Effetligi GPS-Track public_traces_from: Effetligi GPS-Track vu %{user} tagged_with: Gchännzeichnet mit %{tags} - see_all_traces: Alli Tracks aaluege destroy: scheduled_for_deletion: Track, wu zum Lesche vorgsäh isch make_public: diff --git a/config/locales/he.yml b/config/locales/he.yml index 8e4dcc1b4..d0719a19a 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -18,6 +18,7 @@ # Author: LaG roiL # Author: Metraduk # Author: Nemo bis +# Author: Nimrod Rak # Author: Orsa # Author: Ruila # Author: Steeve815 @@ -539,6 +540,7 @@ he: description: רשומות יומן אחרונות ממשתמשי OpenStreetMap comments: has_commented_on: נוספה הערה מאת %{display_name} על רשומות היומן הבאות + no_comments: אין הערות יומן post: רשומה when: מתי comment: הערה @@ -551,6 +553,8 @@ he: success: '%{name} חבר שלך עכשיו!' failed: מצטערים, הוספת %{name} כחבר נכשלה. already_a_friend: '%{name} כבר חבר שלך.' + limit_exceeded: שלחת בקשות חברות רבות לאחרונה. נא להמתין לפני שליחת בקשות חברות + נוספות remove_friend: heading: להסיר את %{user} מרשימת החברים? button: להסיר מרשימת החברים @@ -683,7 +687,7 @@ he: shower: מקלחת social_centre: מרכז חברתי social_facility: שירותים חברתיים - studio: סטודיו + studio: דירת סטודיו swimming_pool: ברֵכת שחייה taxi: מונית telephone: טלפון ציבורי @@ -1764,9 +1768,6 @@ he: wikipedia: title: כניסה עם ויקיפדיה alt: כניסה עם חשבון ויקיפדיה - yahoo: - title: כניסה עם יאהו - alt: כניסה עם OpenID של יאהו wordpress: title: כניסה עם וורדפרס alt: כניסה עם OpenID של וורדפרס @@ -2295,7 +2296,7 @@ he: in: ב index: public_traces: מסלולי GPS ציבוריים - my_traces: הקלטות ה־GPS שלי + my_traces: המסלולים שלי public_traces_from: מסלולי GPS ציבוריים מאת %{user} description: עיון בהעלאות אחרונות של הקלטות GPS tagged_with: ' מתויג עם %{tags}' @@ -2303,8 +2304,9 @@ he: חדש או ללמוד עוד על מעקב מסלולים ב־GPS בדף הוויקי. upload_trace: העלאת מסלול - see_all_traces: הצגת כל המסלולים - see_my_traces: הצגת הנתיבים שלי + all_traces: כל המסלולים + traces_from: מסלולים ציבוריים מ-%{user} + remove_tag_filter: הסרת סינון לפי תג destroy: scheduled_for_deletion: מסלול מיועד למחיקה make_public: @@ -2723,8 +2725,9 @@ he: show: title: החשבון של %{block_on} נחסם על־ידי %{block_by} heading_html: החשבון של %{block_on} נחסם על־ידי %{block_by} - created: נוצר - status: סטטוס + created: :תאריך היצירה + duration: :משך זמן + status: 'מצב:' show: הצגה edit: עריכה revoke: ביטול! @@ -2752,6 +2755,7 @@ he: title: הערות ותגובות של %{user} heading: הערות של %{user} subheading_html: הערות ותגובות של %{user} + no_notes: אין הערות id: מזהה creator: יוצר description: תיאור diff --git a/config/locales/hr.yml b/config/locales/hr.yml index cc3be967e..43359959b 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1264,9 +1264,6 @@ hr: wikipedia: title: Prijavi se preko Wikipedije alt: Prijavi se s Wikipedijinim računom - yahoo: - title: Prijavi se sa Yahoo-om - alt: Prijavi se sa Yahoo-ovim OpenID-om wordpress: title: Prijavi se sa Wordpressom alt: Prijavi se sa Wordpressovim OpenID-om @@ -1614,7 +1611,6 @@ hr: ili nauči viÅ¡e o GNSS tragovima na wiki stranici. upload_trace: Postavi GNSS trag - see_all_traces: Prikaži sve trase destroy: scheduled_for_deletion: Trase raspoređene za brisanje make_public: diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index a224cf732..de97aa7d5 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1525,9 +1525,6 @@ hsb: github: title: Z GitHub přizjewić alt: Z kontom GitHub přizjewić - yahoo: - title: Přizjewjenje z Yahoo - alt: Přizjewjenje z Yahoo OpenID wordpress: title: Přizjewjenje z Wordpress alt: Přizjewjenje z Wordpress OpenID @@ -1991,7 +1988,6 @@ hsb: wukń wjace wo GPS-slědowanju na wikijowej stronje. upload_trace: Ćěr nahrać - see_all_traces: Wšě ćěrje pokazać destroy: scheduled_for_deletion: Čara předwidźana za zničenje make_public: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 47059c1fa..f95dee8cf 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -511,6 +511,7 @@ hu: description: Legutóbbi naplóbejegyzések az OpenStreetMap felhasználóitól comments: has_commented_on: '%{display_name} hozzászólt az alábbi naplóbejegyzésekhez' + no_comments: Nincs naplóhozzászólás post: Bejegyzés when: Mikor comment: Hozzászólás @@ -523,6 +524,8 @@ hu: success: '%{name} mostantól az ismerősöd.' failed: Sajnáljuk, sikertelen volt %{name} felvétele ismerősnek. already_a_friend: '%{name} már az ismerősöd.' + limit_exceeded: Sok felhasználóval barátkoztál az utóbbi időben. Kérjük, várj + egy kicsit, mielőtt további ismerősöket próbálnál találni. remove_friend: heading: '%{user} eltávolítása az ismerőseid közül?' button: Ismerős eltávolítása @@ -1755,9 +1758,6 @@ hu: wikipedia: title: Bejelentkezés Wikipédiával alt: Wikipédia fiókkal való bejelentkezés - yahoo: - title: Bejelentkezés Yahoo-val - alt: Bejelentkezés Yahoo OpenID-vel wordpress: title: Bejelentkezés Wordpress-szel alt: Bejelentkezés Wordpress OpenID-vel @@ -2301,8 +2301,6 @@ hu: új nyomvonalat, vagy olvass bővebben a GPS nyomvonalrögzítésről a wiki lapon. upload_trace: Nyomvonal feltöltése - see_all_traces: Összes nyomvonal megtekintése - see_my_traces: Saját nyomvonalak megtekintése destroy: scheduled_for_deletion: A nyomvonal törlésre kijelölve make_public: @@ -2736,8 +2734,9 @@ hu: show: title: '%{block_on} blokkolva %{block_by} által' heading_html: '%{block_by} blokkolta %{block_on} felhasználót' - created: Létrehozva - status: Állapot + created: 'Létrehozva:' + duration: 'Időtartam:' + status: 'Állapot:' show: Megjelenítés edit: Szerkesztés revoke: Visszavonás! @@ -2765,6 +2764,7 @@ hu: title: '%{user} által beküldött vagy kommentált jegyzetek' heading: '%{user} jegyzetei' subheading_html: '%{user} által beküldött vagy kommentált jegyzetek' + no_notes: Nincs jegyzet id: ID creator: Létrehozta description: Leírás diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 3c7a9ff18..521911037 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1505,7 +1505,7 @@ ia: greeting: Salute, hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail in %{server_url} a %{new_address}. - click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro + click_the_link: Si isto es tu, per favor clicca sur le ligamine sequente pro confirmar le alteration. lost_password: subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno' @@ -1746,9 +1746,6 @@ ia: wikipedia: title: Aperir session con Wikipedia alt: Aperir session con un conto de Wikipedia - yahoo: - title: Aperir session con Yahoo - alt: Aperir session con un OpenID de Yahoo wordpress: title: Aperir session con WordPress alt: Aperir session con un OpenID de WordPress @@ -1824,9 +1821,9 @@ ia: english_link: le original in anglese native: title: A proposito de iste pagina - html: Tu vide nunc le version in anglese del pagina de copyright. Tu pote - retornar al %{native_link} de iste pagina o tu pote cessar de leger super - copyright e %{mapping_link}. + html: Tu vide ora le version in anglese del pagina de derecto de autor. Tu + pote retornar al %{native_link} de iste pagina o tu pote cessar de leger + sur copyright e %{mapping_link}. native_link: version in interlingua mapping_link: comenciar le cartographia legal_babble: @@ -2286,7 +2283,7 @@ ia: in: in index: public_traces: Tracias GPS public - my_traces: Mi tracias GPS + my_traces: Mi tracias public_traces_from: Tracias GPS public de %{user} description: Percurrer le tracias GPS incargate recentemente tagged_with: ' etiquettate con %{tags}' @@ -2294,8 +2291,9 @@ ia: tracia o lege plus sur le traciamento GPS in le pagina wiki. upload_trace: Incargar un tracia - see_all_traces: Vider tote le tracias - see_my_traces: Vider mi tracias + all_traces: Tote le tracias + traces_from: Tracias public de %{user} + remove_tag_filter: Remover filtro de etiquettas destroy: scheduled_for_deletion: Tracia programmate pro deletion make_public: diff --git a/config/locales/id.yml b/config/locales/id.yml index c8904d3ee..73e1f9d4a 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1651,9 +1651,6 @@ id: wikipedia: title: Masuk log dengan Wikipedia alt: Masuk log dengan akun Wikipedia - yahoo: - title: Masuk log dengan Yahoo - alt: Masuk log dengan Yahoo OpenID wordpress: title: Masuk log dengan Wordpress alt: Masuk log dengan Wordpress OpenID @@ -2185,8 +2182,6 @@ id: GPS baru atau belajar lebih banyak tentang pencatatan jejak GPS pada halaman wiki. upload_trace: Unggah jejak GPS - see_all_traces: Lihat semua jejak - see_my_traces: Lihat semua jejak saya destroy: scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus make_public: diff --git a/config/locales/is.yml b/config/locales/is.yml index 96bc150b6..b6d97d46b 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1703,9 +1703,6 @@ is: wikipedia: title: Skrá inn með Wikipedia alt: Skrá inn með Wikipedia-aðgangi - yahoo: - title: Skrá inn með Yahoo - alt: Skrá inn með Yahoo OpenID-aðgangi wordpress: title: Skrá inn með Wordpress alt: Skrá inn með Wordpress OpenID-aðgangi @@ -2271,8 +2268,6 @@ is: empty_html: Ekkert hér ennþá. Sendu inn nýjan feril eða lærðu meira um GPS-ferlun á wiki-síðunni. upload_trace: Senda inn feril - see_all_traces: Sjá alla ferla - see_my_traces: Skoða ferlana mína destroy: scheduled_for_deletion: Þessum feril verður eitt make_public: diff --git a/config/locales/it.yml b/config/locales/it.yml index 7aac4856a..a1eeb914f 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1789,9 +1789,6 @@ it: wikipedia: title: Accedi con Wikipedia alt: Accedi con un'utenza Wikipedia - yahoo: - title: Accedi con Yahoo - alt: Accedi con un OpenID di Yahoo wordpress: title: Accedi con Wordpress alt: Accedi con un OpenID di Wordpress @@ -1890,7 +1887,7 @@ it: \nCommons Attribuzione - Condividi allo stesso modo 2.0 (CC BY-SA 2.0)." credit_title_html: Come si attribuisce a OpenStreetMap credit_1_html: Si richiede che l'attribuzione sia “© OpenStreetMap - contributors ”. + contributors”. 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. @@ -2343,7 +2340,7 @@ it: in: in index: public_traces: Tracciati GPS pubblici - my_traces: I miei tracciati GPS + my_traces: Miei tracciati public_traces_from: Tracciati GPS pubblici di %{user} description: Naviga fra i tracciati GPS caricati recentemente tagged_with: ' etichettati con %{tags}' @@ -2351,8 +2348,7 @@ it: o leggi ulteriori informazioni sul tracciamento GPS nella pagina wiki. upload_trace: Carica un tracciato - see_all_traces: Vedi tutti i tracciati - see_my_traces: Vedi i miei tracciati + all_traces: Tutti i tracciati destroy: scheduled_for_deletion: Tracciato in attesa di essere eliminato make_public: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 61dc4d957..5309a28ac 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1700,9 +1700,6 @@ ja: wikipedia: title: ウィキペディアでログイン alt: ウィキペディアのアカウントでログイン - yahoo: - title: Yahoo を使用してログイン - alt: Yahoo OpenID を使用してログイン wordpress: title: Wordpress を使用してログイン alt: Wordpress OpenID を使用してログイン @@ -2151,8 +2148,6 @@ ja: empty_html: ここにはまだ何もありません。新しくトレースをアップロードするか、ウィキページでGPSトレースの詳細情報をお読みください。 upload_trace: トレースをアップロード - see_all_traces: すべてのトレースを見る - see_my_traces: 位置情報を見る destroy: scheduled_for_deletion: トレースの削除準備を行いました make_public: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 32dcaa392..2de2c6748 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -971,9 +971,6 @@ kab: wikipedia: title: Qqen s Wikipedia alt: qqes s umiḍan Wikipedia - yahoo: - title: Qqen s Yahoo - alt: Qqen s Yahoo OpenID wordpress: title: Qqen s Wordpress alt: Qqen s OpenID @@ -1184,7 +1181,6 @@ kab: neÉ£ issin ugar É£ef lǧerra GPR, Wali asebter awiki. upload_trace: Azen lǧerra - see_all_traces: Wali akk lǧerrat destroy: scheduled_for_deletion: TafuÉ£alt yettwaheggan i tukksa make_public: diff --git a/config/locales/km.yml b/config/locales/km.yml index 0b8124252..5cd23b1d6 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -679,8 +679,6 @@ km: title: កត់ឈ្មោះចូលដោយប្រើ GitHub wikipedia: title: កត់ឈ្មោះចូលដោយប្រើវិគីភីឌា - yahoo: - title: កត់ឈ្មោះចូលដោយប្រើ Yahoo wordpress: title: កត់ឈ្មោះចូលដោយប្រើ Wordpress aol: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index cc8cfc477..7b6adb97f 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1590,9 +1590,6 @@ ko: wikipedia: title: 위키백과로 로그인하기 alt: 위키백과 계정으로 로그인 - yahoo: - title: 야후로 로그인 - alt: Yahoo OpenID로 로그인하기 wordpress: title: 워드프레스로 로그인하기 alt: Wordpress OpenID로 로그인하기 @@ -2099,8 +2096,6 @@ ko: 위키 문서에서 GPS 궤적에 대해 더 알아보세요. upload_trace: 궤적 올리기 - see_all_traces: 모든 궤적 보기 - see_my_traces: 내 궤적 보기 destroy: scheduled_for_deletion: 삭제 계획중인 궤적 make_public: diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 87e735def..b999fcf79 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -45,7 +45,7 @@ ku-Latn: activerecord: errors: messages: - invalid_email_address: wekî navnîşaneke e-peyamê ya derbasdar nayê xuyan + invalid_email_address: ne weke navnîşaneke e-peyamê ya derbasdar e email_address_not_routable: nikare were alîkirin models: acl: Lîsteya kontrola têketinan @@ -55,7 +55,7 @@ ku-Latn: diary_comment: Şîroveya rojane diary_entry: Nivîsa Rojane friend: Heval - issue: Pirsgirêk + issue: Problem language: Ziman message: Peyam node: Nuqte @@ -87,8 +87,8 @@ ku-Latn: client_application: name: Nav (Hewce ye) url: URLya Sepana Sereke (Hewce ye) - callback_url: URLya paşve lêgerînê - support_url: URLya piştgirîkirinê + callback_url: Lînka paşve lêgerînê + support_url: Lînka piştgirîkirinê allow_read_prefs: tercîhên wan ên bikarhêneriyê bixwîne allow_write_prefs: tercîhên wan ên bikarhêneriyê biguherîne allow_write_diary: rojnivîsk, şîroveyan çêke û ji xwe re hevalan hevalan çêke @@ -1773,9 +1773,6 @@ ku-Latn: wikipedia: title: Bi Wîkîpediyayê têkeve alt: Bi hesabekî Wîkîpediyayê têkeve - yahoo: - title: Bi Yahooyê têkeve - alt: Bi OpenID ya Yahooyê têbikeve wordpress: title: Bi Wordpressê têkeve alt: Bi OpenID ya Wordpressê têbikeve @@ -2337,8 +2334,6 @@ ku-Latn: an jî ji ser rûpela wîkiyê derbarê şopên GPSê de zêdetir tiştan hîn bibe. upload_trace: Şopek GPSê bar bike - see_all_traces: Hemû şopan bibîne - see_my_traces: Şopên min bibîne destroy: scheduled_for_deletion: Şop ji bo jêbirinê hate plankirin make_public: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 8abbd98b0..65ba49e6f 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -954,9 +954,6 @@ lb: wikipedia: title: Mat Wikipedia aloggen alt: Mat engem Wikipedia-Benotzerkont aloggen - yahoo: - title: Alogge mat Yahoo - alt: Alogge mat enger Yahoo OpenID wordpress: title: Alogge mat Wordpress alt: Alogge mat enger Wordpress OpenID @@ -1160,7 +1157,10 @@ lb: by: vum in: an index: - my_traces: Meng GPS Spueren + my_traces: Meng Spueren + all_traces: All Spuren + traces_from: Ëffentlech Spuere vum %{user} + remove_tag_filter: Tag-Filter ewechhuelen description: description_without_count: GPX-Fichier vum %{user} oauth: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index b5e58dadd..0b7093765 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1464,9 +1464,6 @@ lt: wikipedia: title: Prisijungti su Vikipedija alt: Prisijungti su Vikipedija Paskyra - yahoo: - title: Prisijunkite su Yahoo - alt: Prisijunkite su Yahoo OpenID wordpress: title: Prisijunkite su Wordpress alt: Prisijunkite su Wordpress OpenID @@ -1981,8 +1978,6 @@ lt: arba sužinokite daugiau apie GPS pėdsakų žymėjimą Å¡iame Dokumentacijos puslapyje. upload_trace: Ä®kelti pėdsaką - see_all_traces: Rodyti visus pėdsakus - see_my_traces: ŽiÅ«rėti mano pėdsakus destroy: scheduled_for_deletion: Trasa, numatyta iÅ¡trinimui make_public: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5755ac858..1a5951e7b 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1296,9 +1296,6 @@ lv: wikipedia: title: Ieiet ar Vikipēdiju alt: Ieiet ar Vikipēdijas kontu - yahoo: - title: Pieslēgties ar Yahoo - alt: Pieslēgties ar Yahoo OpenID wordpress: title: Pieslēgties ar WordPress alt: Pieslēgties ar WordPress OpenID @@ -1788,7 +1785,6 @@ lv: trasi vai uzzini vairāk par GPS trasēm iekÅ¡ wiki lapas. upload_trace: AugÅ¡upielādēt trasi - see_all_traces: SkatÄ«t visas trases destroy: scheduled_for_deletion: Trase atzÄ«mēta dzēšanai make_public: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index a7697ca10..8127eb8a1 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1741,9 +1741,6 @@ mk: wikipedia: title: Најава со Википедија alt: Најава со сметка на Википедија - yahoo: - title: Најава со Yahoo - alt: Најава со OpenID од Yahoo wordpress: title: Најава со Wordpress alt: Најава со OpenID од Wordpress @@ -2296,7 +2293,7 @@ mk: in: во index: public_traces: Јавни ГПС-траги - my_traces: Мои ГПС-траги + my_traces: Мои траги public_traces_from: Јавни ГПС-траги од %{user} description: Прелистување на скороподигнати ГПС-траги tagged_with: ' означено со %{tags}' @@ -2304,8 +2301,9 @@ mk: трага или дознајте повеќе за ГПС-трагите на нивната викстраница. upload_trace: Подигни трага - see_all_traces: Погледајте ги сите траги - see_my_traces: Мои траги + all_traces: Сите траги + traces_from: Јавни траги од %{user} + remove_tag_filter: Отстрани филтер за ознаки destroy: scheduled_for_deletion: Трагата е закажана за бришење make_public: diff --git a/config/locales/mo.yml b/config/locales/mo.yml index e23a5c90b..6b392e7dd 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -608,9 +608,6 @@ mo: wikipedia: title: Ынтраря ку ажуторул Википедией alt: Ынтраря ку ажуторул контулуй де Википедия - yahoo: - title: Ынтраря ку ажуторул Yahoo - alt: Ынтраря ку ажуторул Yahoo OpenID wordpress: title: Ынтраря ку ажуторул Wordpress alt: Ынтраря ку ажуторул Wordpress OpenID diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 6318a9036..3347221f6 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1183,7 +1183,6 @@ mr: in: आत index: upload_trace: अनुरेख चढवा - see_all_traces: सर्व अनुरेख पहा oauth_clients: new: title: नवीन अनुप्रयोगाची नोंदणी करा diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 4a20a2b04..9b44a0357 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1342,9 +1342,6 @@ ms: wikipedia: title: Log masuk dengan Wikipedia alt: Log masuk dengan akaun Wikipedia - yahoo: - title: Log masuk dengan Yahoo - alt: Log masuk dengan OpenID Yahoo wordpress: title: Log masuk dengan Wordpress alt: Log masuk dengan OpenID Wordpress @@ -1809,7 +1806,6 @@ ms: jejak baru atau ketahui lebih lanjut tentang penjejakan GPS di halaman wiki ini. upload_trace: Muat naik jejak - see_all_traces: Lihat semua jejak destroy: scheduled_for_deletion: Jejak dijadualkan untuk penghapusan make_public: diff --git a/config/locales/my.yml b/config/locales/my.yml index 4549a0824..05044ea93 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -619,8 +619,6 @@ my: wikipedia: title: ဝီကီပီးဒီးယားဖြင့် အကောင့်ထဲဝင်ရန် alt: ဝီကီပီးဒီးယားအကောင့်ဖြင့် အကောင့်ထဲဝင်ရန် - yahoo: - title: ယာဟူးဖြင့် အကောင့်ထဲဝင်ရန် destroy: title: အကောင့်မှပြန်ထွက် logout_button: အကောင့်မှပြန်ထွက် diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 322c47f68..6d540551e 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1568,9 +1568,6 @@ nb: wikipedia: title: Logg inn med Wikipedia alt: Logg inn med en Wikipedia-konto - yahoo: - title: Logg inn med Yahoo - alt: Logg inn med en Yahoo OpenID wordpress: title: Logg inn med Wordpress alt: Logg inn med en Wordpress OpenID @@ -2088,8 +2085,6 @@ nb: empty_html: Ingenting her ennÃ¥. Last opp et nytt spor eller lær Ã¥ lage GPS-spor pÃ¥ wiki-siden. upload_trace: Last opp et GPS-spor - see_all_traces: Se alle spor - see_my_traces: Se alle mine spor destroy: scheduled_for_deletion: Spor planlagt slettet make_public: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 86c80d2b6..c6d449842 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1100,7 +1100,6 @@ ne: public_traces: सारवजनिक GPS ट्रेसहरु public_traces_from: '%{user}बाट सार्वकनिक GPS ट्रेसहरु' tagged_with: ' %{tags}हरूद्वारा ट्याग गरिएको' - see_all_traces: सबै ट्रेसहरु हेर्ने destroy: scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस make_public: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7f58ac27a..47767144a 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1799,9 +1799,6 @@ nl: wikipedia: title: Aanmelden met Wikipedia alt: Aanmelden met een Wikipedia account - yahoo: - title: Aanmelden met Yahoo - alt: Aanmelden met een Yahoo OpenID wordpress: title: Aanmelden met Wordpress alt: Aanmelden met een Wordpress OpenID @@ -2364,8 +2361,6 @@ nl: empty_html: Hier is nog niets te zien. Upload een nieuw traject of kom meer te weten over gps-tracing op de wikipagina. upload_trace: Traject uploaden - see_all_traces: Alle trajecten bekijken - see_my_traces: Mijn trajecten bekijken destroy: scheduled_for_deletion: Traject staat op de lijst voor verwijdering make_public: diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 370c2d47c..9f34f39cd 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1224,9 +1224,6 @@ nn: wikipedia: title: Logg inn med Wikipedia alt: Logg inn med ein Wikipedia-konto - yahoo: - title: Logg inn med Yahoo - alt: Logg inn med ein Yahoo OpenID wordpress: title: Logg inn med Wordpress alt: Logg inn med ein Wordpress OpenID @@ -1603,7 +1600,6 @@ nn: eller lær Ã¥ lage GPS spor pÃ¥ wiki sida. upload_trace: Last opp eit GPS-spor - see_all_traces: SjÃ¥ alle spor destroy: scheduled_for_deletion: Spor planlagt sletta make_public: diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index dd6eeae29..4edadf16d 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -558,6 +558,7 @@ nqo: nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲ park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲ + stadium: ߞߊߡߊ߲ swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ man_made: bridge: ߛߍ߲ @@ -1045,9 +1046,6 @@ nqo: wikipedia: title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫ alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫ - yahoo: - title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߦߊ߬ߤߎ ߟߊ߫ - alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߦߊ߬ߤߎ ߏߔߌ߲ ID ߟߊ߫ wordpress: title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫ alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫ @@ -1253,4 +1251,16 @@ nqo: showing_page: ߞߐߜߍ %{page} older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬ newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬ + oauth_clients: + show: + edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫ + delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫ + confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟ + users: + new: + email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:' + confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:' + display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:' + display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬ + ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬. ... diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 6706089ec..379561ee5 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -1433,9 +1433,6 @@ oc: wikipedia: title: Se connectar amb Wikipèdia alt: Se connectar amb un compte de Wikipèdia - yahoo: - title: Se connectar amb Yahoo - alt: Se connectar amb l'OpenID de Yahoo wordpress: title: Se connectar amb Wordpress alt: Se connectar amb l'OpenID de Wordpress @@ -1880,8 +1877,6 @@ oc: traça novèla o per ne saber mai sul traçatge GPS, consultatz la pagina wiki. upload_trace: Mandar una traça - see_all_traces: Veire totas las traças - see_my_traces: véder las mias traças destroy: scheduled_for_deletion: Pista prevista per la supression make_public: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 67a123141..0187ebc3b 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -1010,7 +1010,6 @@ pa: index: tagged_with: '%{tags} ਨਾਲ਼ ਨਿਸ਼ਾਨਦੇਹ' upload_trace: ਕੋਈ ਖੁਰਾ-ਖੋਜ ਚੜ੍ਹਾਉ - see_all_traces: ਸਾਰੇ ਖੁਰਾ-ਖੋਜ ਵੇਖੋ oauth: authorize: allow_write_notes: ਟਿੱਪਣੀਆੰ ਸੋਧੋ। diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 25e19b09d..22eaba205 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1124,7 +1124,7 @@ pl: company: Biuro firmy diplomatic: Placówka dyplomatyczna educational_institution: Instytucja edukacyjna - employment_agency: Urząd pracy + employment_agency: Agencja zatrudnienia energy_supplier: Biuro dostawcy energii estate_agent: Biuro nieruchomości financial: Biuro finansowe @@ -1139,7 +1139,7 @@ pl: religion: Biuro organizacji religijnej research: Biuro badawcze tax_advisor: Doradca podatkowy - telecommunication: Urząd telekomunikacji + telecommunication: Firma telekomunikacyjna travel_agent: Biuro podróży "yes": Biuro place: @@ -1839,9 +1839,6 @@ pl: wikipedia: title: Zaloguj się przez Wikipedię alt: Zaloguj się przez konto Wikipedii - yahoo: - title: Zaloguj się przez Yahoo - alt: Zaloguj się przez Yahoo OpenID wordpress: title: Zaloguj się przez Wordpress alt: Zaloguj się przez OpenID Wordpress @@ -2386,8 +2383,9 @@ pl: lub dowiedz się więcej o śledzeniu GPS na stronie wiki. upload_trace: Wyślij ślad - see_all_traces: Wyświetl wszystkie ślady - see_my_traces: Zobacz moje ślady + all_traces: Wszystkie ślady + traces_from: Publiczne ślady GPS użytkownika %{user} + remove_tag_filter: Usuń filtr tagów destroy: scheduled_for_deletion: Ślad oczekuje na usunięcie make_public: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 8e9ba3a71..297c60be8 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1796,9 +1796,6 @@ pt-BR: wikipedia: title: Entrar com Wikipédia alt: Entrar com uma conta da Wikipédia - yahoo: - title: Entrar com o Yahoo - alt: Entrar com um OpenID da Yahoo wordpress: title: Entrar com o Wordpress alt: Entrar com um OpenID da Wordpress @@ -2350,7 +2347,7 @@ pt-BR: in: em index: public_traces: Trilhas públicas de GPS - my_traces: Minhas trilhas GPS + my_traces: Minhas trilhas public_traces_from: Trilhas de GPS públicas de %{user} description: Procurar trilhas de GPS enviadas recentemente tagged_with: ' etiquetadas com %{tags}' @@ -2358,8 +2355,9 @@ pt-BR: um novo trilho GPS ou saiba mais sobre trilhos GPS na página wiki. upload_trace: Enviar uma trilha - see_all_traces: Ver todas as trilhas - see_my_traces: Ver minhas trilhas + all_traces: Todos os traços + traces_from: Traços públicos de %{user} + remove_tag_filter: Remova o filtro de marcações destroy: scheduled_for_deletion: Trilha marcada para ser apagada make_public: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index f5cba73a7..0d7db73a4 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -50,7 +50,7 @@ pt-PT: prompt: Escolher ficheiro submit: diary_comment: - create: Gravar + create: Comentar diary_entry: create: Publicar update: Atualizar @@ -543,6 +543,8 @@ pt-PT: success: '%{name} entrou para a tua lista de amigos!' failed: Lamentamos, não foi possível adicionar %{name} à tua lista de amigos. already_a_friend: Já és amigo de %{name}. + limit_exceeded: Recentemente, adicionaste muitos utilizadores à tua lista de + amigos. Por favor, aguarda um pouco até poderes voltar a fazê-lo. remove_friend: heading: Remover %{user}da lista de amigos? button: Remover amigo @@ -1095,7 +1097,7 @@ pt-PT: place: allotments: Hortas urbanas archipelago: Arquipélago - city: Capital de distrito + city: Cidade city_block: Quarteirão country: País county: Concelho @@ -1118,7 +1120,7 @@ pt-PT: state: Estado subdivision: Subdivisão suburb: Subúrbio - town: Cidade / Vila + town: Vila village: Sede de freguesia "yes": Localidade railway: @@ -1311,16 +1313,16 @@ pt-PT: weir: Represa "yes": Curso de água admin_levels: - level2: Fronteira nacional - level3: Fronteira de região - level4: Fronteira estadual - level5: Fronteira distrital - level6: Fronteira municipal - level7: Limite de município - level8: Limite de freguesia - level9: Limite de localidade - level10: Limite de subúrbio - level11: Limite de bairro + level2: Fronteira de país + level3: Fronteira + level4: Fronteira de região autónoma + level5: Fronteira + level6: Fronteira de distrito + level7: Fronteira de município + level8: Fronteira urbana + level9: Fronteira de freguesia + level10: Fronteira de subúrbio + level11: Fronteira de bairro types: cities: Cidades towns: Vilas @@ -1783,9 +1785,6 @@ pt-PT: wikipedia: title: Iniciar sessão através da Wikipédia alt: Iniciar a sessão com uma conta da Wikipédia - yahoo: - title: Iniciar sessão com Yahoo - alt: Iniciar sessão com um OpenID do Yahoo wordpress: title: Iniciar sessão com Wordpress alt: Iniciar sessão com um OpenID do Wordpress @@ -2339,8 +2338,6 @@ pt-PT: nova rota GPS ou consulta informação sobre rotas GPS na página wiki. upload_trace: Enviar rota GPS - see_all_traces: Ver todos as rotas - see_my_traces: Ver as minhas rotas destroy: scheduled_for_deletion: Rota programada para eliminação make_public: @@ -2914,8 +2911,8 @@ pt-PT: hide: Esconder resolve: Marcar como resolvido reactivate: Reabrir - comment_and_resolve: Gravar como resolvido - comment: Gravar + comment_and_resolve: Comentar e resolver + comment: Comentar edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui. directions: ascend: Ascenção diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 2432cb239..73c0cc3c5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1710,9 +1710,6 @@ ro: wikipedia: title: Autentificare la Wikipedia alt: Conectați-vă cu un cont Wikipedia - yahoo: - title: Autentificare cu Yahoo - alt: Autentificați-vă cu un Yahoo OpenID wordpress: title: Conectați-vă cu Wordpress alt: Conectați-vă cu un cont Wordpress OpenID @@ -2263,8 +2260,6 @@ ro: nouă sau aflați mai multe despre urmărirea GPS pe wiki page. upload_trace: Încărcați urma - see_all_traces: Vedeți toate urmele - see_my_traces: Vezi urmele mele destroy: scheduled_for_deletion: Traseul este programat pentru ștergere make_public: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index be5be1786..6fac951b8 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1770,9 +1770,6 @@ ru: wikipedia: title: Войти с помощью Википедии alt: Вход с использованием учётной записи в Википедии - yahoo: - title: Войти с помощью Yahoo - alt: Войти с помощью Yahoo OpenID wordpress: title: Войти с помощью Wordpress alt: Войти с помощью Wordpress OpenID @@ -2308,8 +2305,6 @@ ru: empty_html: Пока здесь ничего нет. Загрузите новый трек или почитайте про GPS-треки на вики-странице. upload_trace: Загрузить треки - see_all_traces: Показать все треки - see_my_traces: Показать мои треки destroy: scheduled_for_deletion: Запланировано к удалению make_public: diff --git a/config/locales/sat.yml b/config/locales/sat.yml index 758a6b38f..476164612 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -531,8 +531,6 @@ sat: title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ wikipedia: title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ - yahoo: - title: ᱭᱟᱦᱚ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ destroy: title: ᱩᱰᱩᱜᱚᱜᱢᱮ logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ diff --git a/config/locales/scn.yml b/config/locales/scn.yml index b9e4eefe7..4dfaac501 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -1,6 +1,7 @@ # Messages for Sicilian (sicilianu) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Ajeje Brazorf # Author: Gmelfi # Author: Macofe # Author: Pippinu @@ -21,7 +22,7 @@ scn: create: Manna client_application: create: Riggistra - update: Cancia + update: Agghiorna redaction: create: Crea l'occultamentu update: Sarva occultamentu @@ -92,22 +93,23 @@ scn: description: Discrizzioni gpx_file: 'Carricari lu file GPX:' visibility: 'Visibbilità:' - tagstring: 'Etichetti:' + tagstring: Etichetti message: sender: Mittenti title: Oggettu body: Corpu recipient: Distinatariu redaction: + title: Tìtulu description: Discrizzioni user: email: Posta elittrònica - new_email: 'Nnirizzu di posta elittrònica novu:' + new_email: Nnirizzu di posta elittrònica novu active: Attivu display_name: Nomu ammustratu description: Discrizzioni - home_lat: 'Latitùdini:' - home_lon: 'Luncitùdini:' + home_lat: Latitùdini + home_lon: Luncitùdini languages: Lingui pass_crypt: Palora d'òrdini help: @@ -125,17 +127,25 @@ scn: remote: name: Telecumannu description: Telecumannu (JOSM o Merkaartor) + auth: + providers: + none: Nuddu + openid: OpenID + google: Google + facebook: Facebook + github: GitHub + wikipedia: Wikipedia api: notes: comment: - opened_at_html: Criatu %{when} fa - opened_at_by_html: Criatu %{when} fa di %{user} - commented_at_html: Aggiurnatu %{when} fa - commented_at_by_html: Aggiurnatu %{when} fa di %{user} - closed_at_html: Arrisurvuta %{when} fa - closed_at_by_html: Arrisurvuta %{when} fa di %{user} - reopened_at_html: Rigraputa %{when} fa - reopened_at_by_html: Rigraputa %{when} fa di %{user} + opened_at_html: Criatu %{when} + opened_at_by_html: Criatu %{when} di %{user} + commented_at_html: Aggiurnatu %{when} + commented_at_by_html: Aggiurnatu %{when} di %{user} + closed_at_html: Arrisurvuta %{when} + closed_at_by_html: Arrisurvuta %{when} di %{user} + reopened_at_html: Rigraputa %{when} + reopened_at_by_html: Rigraputa %{when} di %{user} rss: title: Noti d'OpenStreetMap description_area: N’elencu dî noti signalati, cummintati o arrisurvuti ntâ @@ -151,12 +161,12 @@ scn: browse: created: Criatu closed: Chiudutu - created_html: Criatu %{time} fa - closed_html: Chiudutu %{time} fa - created_by_html: Criatu %{time} fa di %{user} - deleted_by_html: Cancillatu %{time} fa di %{user} - edited_by_html: Canciatu %{time} fa di %{user} - closed_by_html: Chiudutu %{time} fa di %{user} + created_html: Criatu %{time} + closed_html: Chiudutu %{time} + created_by_html: Criatu %{time} di %{user} + deleted_by_html: Cancillatu %{time} di %{user} + edited_by_html: Canciatu %{time} di %{user} + closed_by_html: Chiudutu %{time} di %{user} version: Virsioni in_changeset: Gruppu di canciamenti anonymous: anònimu @@ -513,6 +523,7 @@ scn: viaduct: Viaduttu "yes": Ponti building: + house: Casa "yes": Edificiu craft: brewery: Birrificiu @@ -659,6 +670,7 @@ scn: "yes": Ricrìu man_made: lighthouse: Faru + pier: Molu pipeline: Cunnuttu tower: Turri works: Fàbbrica @@ -1190,9 +1202,6 @@ scn: windowslive: title: Trasi cu Windows Live alt: Trasi cûn cuntu di Windows Live - yahoo: - title: Trasi cu Yahoo - alt: Trasi cu n'OpenID di Yahoo wordpress: title: Trasi cu Wordpress alt: Trasi cu n'OpenID di Wordpress @@ -1679,7 +1688,6 @@ scn: novu, o puru nfòrmati cchiossai a prupòsitu dî tracciati GPS nta sta pàggina dâ wiki. upload_trace: Càrrica nu tracciatu - see_all_traces: Talìa tutti li tracciati destroy: scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni make_public: @@ -2062,8 +2070,8 @@ scn: show: title: '%{block_on} bluccatu di %{block_by}' heading_html: '%{block_on} bluccatu di %{block_by}' - created: Criatu - status: Statu + created: 'Criatu:' + status: 'Statu:' show: Ammustra edit: Cancia revoke: Rèvuca! @@ -2153,7 +2161,7 @@ scn: comment: Cummenta subscribe: Abbònati unsubscribe: Annulla l’abbunamentu - hide_comment: Ammuccia + hide_comment: ammuccia unhide_comment: Ammustra notes: new: diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 8fa46657d..b4bf9f1ca 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -852,9 +852,6 @@ sco: wikipedia: title: Login wi Wikipedia alt: Login wi a Wikipedia Accoont - yahoo: - title: Login wi Yahoo - alt: Login wi a Yahoo OpenID wordpress: title: Login wi Wordpress alt: Login wi a Wordpress OpenID diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 440389f87..190835eba 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -21,6 +21,7 @@ # Author: Teslaton # Author: TomášPolonec # Author: Vladolc +# Author: Wizzard --- sk: time: @@ -125,6 +126,7 @@ sk: body: Text recipient: Príjemca redaction: + title: Názov description: Popis report: details: Prosím uveďte bližšie informácie o probléme (potrebné). @@ -159,6 +161,7 @@ sk: description: Diaľkové ovládanie (JOSM alebo Merkaartor) auth: providers: + none: Žiadne openid: OpenID google: Google facebook: Facebook @@ -1289,9 +1292,6 @@ sk: windowslive: title: Prihlásenie sa pomocou Windows Live alt: Prihlásenie sa pomocou účtu Windows Live - yahoo: - title: Prihlásenie sa pomocou Yahoo - alt: Prihlásenie sa pomocou Yahoo OpenID wordpress: title: Prihlásenie sa pomocou Wordpress alt: Prihlásenie sa pomocou Wordpress OpenID @@ -1683,7 +1683,6 @@ sk: empty_html: Nič tu zatiaľ nie je. Nahrajte novú stopu, alebo si niečo o GPS stopách prečítajte na wiki. upload_trace: NahraÅ¥ stopu - see_all_traces: ZobraziÅ¥ vÅ¡etky stopy destroy: scheduled_for_deletion: Stopa plánovaná na vymazanie make_public: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index c82a4f5ab..a57636fe2 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1407,9 +1407,6 @@ sl: wikipedia: title: Prijavi se z Wikipedio alt: Prijavi se z računom Wikipedia - yahoo: - title: Prijava z Yahoo - alt: Prijava z Yahoo OpenID wordpress: title: Prijava z Wordpressom alt: Prijava z Wordpress OpenID-jem @@ -1777,8 +1774,6 @@ sl: izvedete več o GPS sledeh na wiki strani. upload_trace: Naloži sled GPS - see_all_traces: Pokaži vse sledi - see_my_traces: Pokaži moje sledi destroy: scheduled_for_deletion: Sled bo izbrisana make_public: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 0426ba5b5..a8f0b0d1f 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1362,7 +1362,6 @@ sq: description: Shfletoni ngarkimet e fundit gjurmëve të GPS tagged_with: etiketuar me %{tags} upload_trace: Ngarko një gjurmë - see_all_traces: Shih të gjitha gjurmët destroy: scheduled_for_deletion: Gjurmë e planifikuar për fshirje make_public: diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 64344f72c..547f35c22 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1200,7 +1200,6 @@ sr-Latn: ili saznajte viÅ¡e o GPS traganju na viki stranici. upload_trace: Otpremi trag - see_all_traces: Pogledaj sve tragove destroy: scheduled_for_deletion: Trag postavljen za brisanje make_public: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c707a251b..f0e7f4954 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1465,9 +1465,6 @@ sr: wikipedia: title: Пријава преко Википедије alt: Пријава коришћењем Википедија налога - yahoo: - title: Пријава преко Јахуа - alt: Пријава преко Yahoo OpenID-а wordpress: title: Пријава коришћењем Wordpress-а alt: Пријава преко Wordpress OpenID-а @@ -1977,8 +1974,6 @@ sr: траг или сазнајте више о GPS траговима на вики страници. upload_trace: Отпреми траг - see_all_traces: Погледај све трагове - see_my_traces: Прикажи моје трагове destroy: scheduled_for_deletion: Траг постављен за брисање make_public: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 13faaf2ac..c583cbca9 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -123,12 +123,12 @@ sv: attributes: client_application: name: Namn (krävs) - url: Huvudapplikations-URL (obligatorisk) + url: Huvudapplikationsadress (obligatorisk) callback_url: Återkopplingsadress - support_url: Support-adress + support_url: Supportadress allow_read_prefs: läs deras användarinställningar allow_write_prefs: ändra deras användarinställningar - allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner + allow_write_diary: skapa dagboksinlägg, kommentera och hitta vänner allow_write_api: ändra kartan allow_read_gpx: läs deras privata GPS-spÃ¥r allow_write_gpx: ladda upp GPS-spÃ¥r @@ -282,11 +282,11 @@ sv: created: Skapad closed: Stängd created_html: Skapades för %{time} - closed_html: Stängdes för %{time} - created_by_html: Skapades för%{time} av %{user} + closed_html: Stängdes för %{time} + created_by_html: Skapades för %{time} av %{user} deleted_by_html: Raderades för %{time} av %{user} - edited_by_html: Redigerades för %{time} av %{user} - closed_by_html: Stängdes för %{time} av %{user} + edited_by_html: Redigerades för %{time} av %{user} + closed_by_html: Stängdes för %{time} av %{user} version: Version in_changeset: Ändringsset anonymous: anonym @@ -343,7 +343,7 @@ sv: history_title_html: 'Förbindelsehistorik: %{name}' members: Medlemmar members_count: - one: 1 medlemmar + one: 1 medlem other: '%{count} medlemmar' relation_member: entry_html: '%{type} %{name}' @@ -388,7 +388,7 @@ sv: load_data: Ladda data loading: Läser in … tag_details: - tags: Etiketter + tags: Taggar wiki_link: key: Wiki-beskrivningssidan för %{key}-taggen tag: Wiki-beskrivningssidan för %{key}=%{value}-taggen @@ -405,7 +405,7 @@ sv: closed_title: 'Avklarad anteckning #%{note_name}' hidden_title: 'Dold anteckning #%{note_name}' opened_by_html: Skapad av %{user} %{when} - opened_by_anonymous_html: Skapad av anonym %{when} + opened_by_anonymous_html: Skapad av anonym användare %{when} commented_by_html: Kommentar frÃ¥n %{user} %{when} commented_by_anonymous_html: Kommentar frÃ¥n en anonym användare för %{when} @@ -454,7 +454,7 @@ sv: lÃ¥ng tid att hämta. changeset_comments: comment: - comment: Ny kommentar pÃ¥ ändringsset nummer %{changeset_id} av %{author} + comment: Ny kommentar pÃ¥ ändringsuppsättning nummer %{changeset_id} av %{author} commented_at_by_html: Uppdaterades för %{when} av %{user} comments: comment: 'Ny kommentar pÃ¥ ändringssätt #%{changeset_id} av %{author}' @@ -516,7 +516,7 @@ sv: hide_link: Dölj denna kommentar unhide_link: Dölj inte denna kommentar confirm: Bekräfta - report: Rapportera denna kommentar + report: Rapportera den här kommentaren location: location: 'Plats:' view: Visa @@ -760,7 +760,7 @@ sv: dressmaker: Sömmerska electrician: Elektriker gardener: TrädgÃ¥rdsmästare - glaziery: GlasblÃ¥seri + glaziery: Glasmästeri handicraft: Konsthantverk painter: MÃ¥lare photographer: Fotograf @@ -963,7 +963,7 @@ sv: water_works: Vattenreningsverk windmill: Väderkvarn works: Fabrik - "yes": Handgjord + "yes": Konstgjord military: airfield: Militärt flygfält barracks: Kaserner @@ -1281,7 +1281,7 @@ sv: states: ignored: Ignorerad open: Öppen - resolved: Lösta + resolved: Löst update: new_report: Din rapport har registrerats successful_update: Din rapport har uppdaterats @@ -1294,7 +1294,7 @@ sv: other: '%{count} rapporter' report_created_at: Rapporterades först %{datetime} last_resolved_at: Löstes senast %{datetime} - last_updated_at: Uppdaterades senast den %{datetime} av %{displayname} + last_updated_at: Uppdaterades senast %{datetime} av %{displayname} resolve: Lös ignore: Ignorera reopen: Öppna igen @@ -1525,31 +1525,31 @@ sv: pÃ¥. Noteringen är nära %{place}.' commented_note_html: '%{commenter} har Ã¥teraktiverat en kartnotering du har kommenterat pÃ¥. Noteringen är nära %{place}.' - details: Mer detaljer om anteckningen finns pÃ¥ %{url}. + details: Fler detaljer om anteckningen finns pÃ¥ %{url}. details_html: Fler detaljer om anteckningen finns pÃ¥ %{url}. changeset_comment_notification: hi: Hej %{to_user}, greeting: Hej, commented: - subject_own: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ en av dina ändringsset' - subject_other: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ ett ändringsset + subject_own: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ en av dina ändringsuppsättningar' + subject_other: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ ett ändringsuppsättning du är intresserad av' - your_changeset: '%{commenter} har lämnat en kommentar pÃ¥ ett av dina ändringsmängder + your_changeset: '%{commenter} har lämnat en kommentar pÃ¥ en av dina ändringsuppsättningar skapt den %{time}' your_changeset_html: '%{commenter} lämnade en kommentar kl. %{time} pÃ¥ en av dina ändringsuppsättningar' - commented_changeset: '%{commenter} har lämnat en kommentar pÃ¥ ändringarna + commented_changeset: '%{commenter} har lämnat en kommentar pÃ¥ en ändringsuppsättning pÃ¥ en karta du bevakar, skapad av %{changeset_author} %{time}' - commented_changeset_html: '%{commenter} har lämnat en kommentar pÃ¥ ändringarna + commented_changeset_html: '%{commenter} har lämnat en kommentar pÃ¥ en ändringsuppsättning pÃ¥ en karta du bevakar, skapad av %{changeset_author} %{time}' partial_changeset_with_comment: med kommentar '%{changeset_comment}' partial_changeset_with_comment_html: med kommentar '%{changeset_comment}' partial_changeset_without_comment: utan kommentar - details: Mer detaljer om ändringssetet finns pÃ¥ %{url}. - details_html: Mer detaljer om ändringssetet finns pÃ¥ %{url}. - unsubscribe: För att avsluta prenumerationen av uppdateringar i denna ändringsgrupp, + details: Mer detaljer om ändringsuppsättningen finns pÃ¥ %{url}. + details_html: Mer detaljer om ändringsuppsättningen finns pÃ¥ %{url}. + unsubscribe: För att avsluta prenumerationen av uppdateringar i denna ändringsuppsättning, besök %{url} och klicka pÃ¥ "Avprenumerera". - unsubscribe_html: För att avsluta prenumerationen av uppdateringar i denna ändringsgrupp, + unsubscribe_html: För att avsluta prenumerationen av uppdateringar i denna ändringsuppsättning, besök %{url} och klicka pÃ¥ "Avprenumerera". confirmations: confirm: @@ -1600,7 +1600,7 @@ sv: message_summary: unread_button: Markera som oläst read_button: Markera som läst - reply_button: Svar + reply_button: Svara destroy_button: Radera new: title: Skicka meddelande @@ -1715,9 +1715,6 @@ sv: wikipedia: title: Logga in med Wikipedia alt: Logga in med ett Wikipedia-konto - yahoo: - title: Logga in med Yahoo - alt: Logga in med ett Yahoo OpenID wordpress: title: Logga in med Wordpress alt: Logga in med ett Wordpress OpenID @@ -2216,12 +2213,12 @@ sv: kön för andra användare. edit: cancel: Avbryt - title: Redigerar spÃ¥r %{name} - heading: Redigerar spÃ¥r %{name} + title: Redigerar GPS-spÃ¥r %{name} + heading: Redigerar GPS-spÃ¥r %{name} visibility_help: vad betyder detta? visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces update: - updated: SpÃ¥r uppdaterades + updated: GPS-spÃ¥r uppdaterades trace_optionals: tags: Taggar show: @@ -2273,8 +2270,6 @@ sv: empty_html: Ingenting här ännu. Ladda upp ett nytt GPS-spÃ¥r eller lär dig om GPS-spÃ¥r pÃ¥ wikin. upload_trace: Ladda upp GPS-spÃ¥r - see_all_traces: Se alla GPS-spÃ¥r - see_my_traces: Se mina GPS-spÃ¥r destroy: scheduled_for_deletion: GPS-spÃ¥r schemalagt för radering make_public: @@ -2428,9 +2423,9 @@ sv: Fortsätt declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: AvslÃ¥ - you need to accept or decline: Läs igenom och Godkänn eller Avböj de nya bidragsvillkoren + you need to accept or decline: Läs igenom och godkänn eller avböj de nya bidragsvillkoren för att fortsätta. - legale_select: 'Välj det land du bor i:' + legale_select: 'Hemland:' legale_names: france: Frankrike italy: Italien @@ -2457,7 +2452,7 @@ sv: send message: Skicka meddelande diary: Dagbok edits: Redigeringar - traces: SpÃ¥r + traces: GPS-spÃ¥r notes: Kartanteckningar remove as friend: Ta bort vän add as friend: Lägg till vän @@ -2561,7 +2556,7 @@ sv: image size hint: (kvadratiska bilder pÃ¥ minst 100x100 fungerar bäst) home location: Hemposition no home location: Du har inte angivit nÃ¥gon hemposition. - update home location on click: Uppdatera hemplatsen när jag klickar pÃ¥ kartan? + update home location on click: Uppdatera hemposition när jag klickar pÃ¥ kartan? save changes button: Spara ändringar make edits public button: Gör alla mina redigeringar publika return to profile: Återvänd till profil @@ -2579,14 +2574,14 @@ sv: one: Sida %{page} (%{first_item} av %{items}) other: Sida %{page} (%{first_item}-%{last_item} av %{items}) summary_html: '%{name} skapades frÃ¥n %{ip_address} den %{date}' - summary_no_ip_html: '%{name} skapad %{date}' + summary_no_ip_html: '%{name} skapad den %{date}' confirm: Bekräfta valda användare hide: Dölj valda användare empty: Inga användare hittades suspended: title: Kontot avstängt heading: Kontot avstängt - webmaster: Webbmaster + webmaster: webbmaster body_html: |-

      Ditt konto har tyvärr stängts av pÃ¥ grund av diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 4b29d4402..7d5586d76 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -685,7 +685,6 @@ ta: in: உள் index: upload_trace: சுவடை பதிவேற்றவும் - see_all_traces: அனைத்து சுவடுகளையும் காண் oauth_clients: show: edit: தொகுப்பு விவரங்கள் diff --git a/config/locales/th.yml b/config/locales/th.yml index 60e2795f4..290c10550 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1458,9 +1458,6 @@ th: wikipedia: title: เข้าใช้งานด้วยวิกิพีเดีย alt: เข้าสู่ระบบด้วยบัญชีวิกิพีเดีย - yahoo: - title: เข้าใช้งานด้วย Yahoo - alt: เข้าใช้งานด้วย Yahoo OpenID wordpress: title: เข้าใช้งานด้วย Wordpress alt: เข้าสู่ระบบด้วย Wordpress OpenID @@ -1914,7 +1911,6 @@ th: description: ค้นหาการอัปโหลดรอยทางจีพีเอสล่าสุด tagged_with: ระบุด้วยป้าย %{tags} upload_trace: อัปโหลดรอยทาง - see_all_traces: แสดงรอยทางทั้งหมด offline_warning: message: ระบบอัปโหลดแฟ้มข้อมูล GPX ไม่พร้อมใช้งานในขณะนี้ offline: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 6ddfe758e..dd848ec8e 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -21,6 +21,8 @@ tl: formats: friendly: '%e %B %Y sa ganap na %H:%M' helpers: + file: + prompt: Pumili ng talaksan submit: diary_comment: create: Sagipin @@ -77,8 +79,13 @@ tl: way_tag: Tatak ng Daan attributes: client_application: + name: Pangalan (Kailangan) + url: URL ng Pangunahing Aplikasyon (Kailangan) callback_url: URL ng Pagtawag-Pabalik support_url: URL ng Pagtangkilik + allow_write_api: baguhin ang mapa + allow_read_gpx: basahin ang kanilang pribadong mga bakas ng GPS + allow_write_notes: baguhin ang mga tala diary_comment: body: Katawan diary_entry: @@ -93,15 +100,15 @@ tl: trace: user: Tagagamit visible: Nakikita - name: Pangalan + name: Pangalan ng talaksan size: Sukat latitude: Latitud longitude: Longhitud public: Pangmadla description: Paglalarawan - gpx_file: 'Ikargang paitaas ang Talaksang GPX:' - visibility: 'Pagkanatatanaw:' - tagstring: 'Mga tatak:' + gpx_file: Ikargang paitaas ang Talaksang GPX + visibility: Pagkanatatanaw + tagstring: Mga tatak message: sender: Nagpadala title: Paksa @@ -111,13 +118,13 @@ tl: description: Paglalarawan user: email: Sulatroniko - new_email: 'Bagong Tirahan ng E-liham:' + new_email: Bagong Tirahan ng E-liham active: Masigla display_name: Ipakita ang Pangalan - description: Paglalarawan - home_lat: 'Latitud:' - home_lon: 'Longhitud:' - languages: Mga wika + description: Paglalarawan ng Balangkas + home_lat: Latitud + home_lon: Longhitud + languages: Nais na mga Wika pass_crypt: Password help: trace: @@ -127,6 +134,9 @@ tl: na ito? user: new_email: (hindi kailanman ipinapakita sa madla) + datetime: + distance_in_words_ago: + half_a_minute: kalahating minuto ang nakalipas printable_name: with_version: '%{id}, v%{version}' editor: @@ -136,28 +146,34 @@ tl: description: iD (patnugot na nasa loob ng pantingin-tingin) remote: name: Pangmalayong Pantaban - description: Pangmalayong Pantaban (JOSM o Merkaartor) + description: Pangmalayong Pantaban (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Wala + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: - opened_at_html: Nilikha %{when} ang nakaraan - opened_at_by_html: Nilikha %{when} ang nakaraan ni %{user} - closed_at_html: Nalutas %{when} ang nakaraan - closed_at_by_html: Nalutas %{when} ang nakaraan ni %{user} + opened_at_html: Nilikha %{when} + opened_at_by_html: Nilikha %{when} ni %{user} + closed_at_html: Nalutas %{when} + closed_at_by_html: Nalutas %{when} ni %{user} rss: commented: bagong puna (malapit sa %{place}) browse: created: Nilikha closed: Isinara - created_html: Nilikha %{time} ang nakaraan - closed_html: Isinara %{time} ang nakaraan - created_by_html: Nilikha %{time} ang nakaraan ni - %{user} - deleted_by_html: Binura %{time} ang nakaraan ni - %{user} - edited_by_html: Binago %{time} ang nakaraan ni %{user} - closed_by_html: Isinara %{time} ang nakaraan ni - %{user} + created_html: Nilikha %{time} + closed_html: Isinara %{time} + created_by_html: Nilikha %{time} ni %{user} + deleted_by_html: Binura %{time} ni %{user} + edited_by_html: Binago %{time} ni %{user} + closed_by_html: Isinara %{time} ni %{user} version: Bersyon in_changeset: Pangkat ng pagbabago anonymous: Hindi nagpapakilala (anonimo) @@ -278,7 +294,7 @@ tl: title: Bagong Pagpapasok sa Talaarawan form: location: 'Pook (lokasyon):' - use_map_link: gamitin ang mapa + use_map_link: Gamitin ang Mapa index: title: Mga talaarawan ng mga tagagamit title_friends: Mga talaarawan ng mga kaibigan @@ -287,6 +303,7 @@ tl: in_language_title: Mga Pagpapasok sa Talaarawan na nasa %{language} new: Bagong Pagpapasok sa Talaarawan new_title: Bumuo ng isang bagong pagpapasok sa loob ng talaarawan mo ng tagagamit + my_diary: Aking Talaarawan no_entries: Walang mga pagpapasok sa talaarawan recent_entries: Kamakailang mga pagpapasok sa talaarawan older_entries: Mas lumang mga Pagpapasok @@ -485,6 +502,8 @@ tl: public: Pangmadlang Gusali residential: Gusaling Tirahan retail: Gusaling Tingian + roof: Bubong + ruins: Nawasak na Gusali school: Gusali ng Paaralan terrace: Balkonahe train_station: Himpilan ng Tren @@ -493,6 +512,7 @@ tl: craft: brewery: Serbeserya carpenter: Anluwage + dressmaker: Modista gardener: Hardinero painter: Pintor photographer: Litratista @@ -618,6 +638,7 @@ tl: water_park: Liwasang Tubigan "yes": Pampalipas oras man_made: + chimney: Pausukan lighthouse: Parola pipeline: Linya ng tubo tower: Tore @@ -676,6 +697,7 @@ tl: government: Tanggapang Pampamahalaan insurance: Tanggapan ng Seguro lawyer: Manananggol + newspaper: Tanggapan ng Pahayagan ngo: Tanggapan ng NGO telecommunication: Tanggapang Pangtelekomunikasyon travel_agent: Ahensiya ng Paglalakbay @@ -753,6 +775,7 @@ tl: dry_cleaning: Paglilinis na Tuyo electronics: Tindahan ng Elektroniks estate_agent: Ahente ng Lupain + fabric: Tindahan ng Tela farm: Tindahang Pambukid fashion: Tindahan ng Moda florist: Nagtitinda ng Bulaklak @@ -778,6 +801,7 @@ tl: optician: Optiko organic: Tindahan ng Pagkaing Organiko outdoor: Tindahang Panlabas + pawnbroker: Sanglaan pet: Tindahan ng Alagang Hayop photo: Tindahan ng Litrato shoes: Tindahan ng Sapatos @@ -785,10 +809,11 @@ tl: stationery: Tindahan ng Papel supermarket: Malaking Pamilihan tailor: Mananahi + tobacco: Tindahan ng Tabako toys: Tindahan ng Laruan travel_agency: Ahensiya ng Paglalakbay video: Tindahan ng Bidyo - wine: Wala sa Lisensiya + wine: Tindahan ng Bino "yes": Tindahan tourism: alpine_hut: Kubong Pambundok @@ -838,6 +863,31 @@ tl: results: no_results: Walang natagpuang mga kinalabasan more_results: Marami pang mga kinalabasan + issues: + index: + search: Maghanap + search_guidance: 'Maghanap ng mga Isyu:' + last_updated: Huling binago + last_updated_time_html: %{time} + last_updated_time_user_html: %{time} ni %{user} + link_to_reports: Tingnan ang mga Ulat + reports_count: + one: 1 Ulat + other: '%{count} mga Ulat' + show: + resolve: Lutasin + ignore: Huwag pansinin + reports: + new: + categories: + diary_entry: + other_label: Iba pa + diary_comment: + other_label: Iba pa + user: + other_label: Iba pa + note: + other_label: Iba pa layouts: project_name: title: OpenStreetMap @@ -854,6 +904,8 @@ tl: edit: Baguhin history: Kasaysayan export: Iluwas + issues: Mga isyu + data: Datos export_data: Iluwas ang Datos gps_traces: Mga Bakas ng GPS gps_traces_tooltip: Pamahalaan ang mga Bakas ng GPS @@ -865,9 +917,12 @@ tl: intro_text: Ang OpenStreetMap ay isang mapa ng mundo na nilikha ng mga taong katulad mo at malayang gamitin sa ilalim ng isang bukas na lisensya. intro_2_create_account: Lumikha ng isang akawnt ng tagagamit + hosting_partners_html: Ang pagpapasinaya ay sinusuportahan ng %{ucl}, %{bytemark}, + at iba pang %{partners}. partners_ucl: UCL - partners_bytemark: Pagpapasinaya ng Bytemark + partners_bytemark: Bytemark Hosting partners_partners: mga kawaksi + tou: Pagtatakda sa Paggamit osm_offline: Ang kalipunan ng dato ng OpenStreetMap ay pangkasalukuyang nakapatay habang isinasagawa ang mahalagang gawain ng pagpapanatili ng kalipunan ng dato. osm_read_only: Ang kalipunan ng dato ng OpenStreetMap ay pangkasalukuyang nasa @@ -897,9 +952,12 @@ tl: footer: Mababasa mo rin ang puna roon sa %{readurl} at maaari kang pumuna roon sa %{commenturl} o tumugon doon sa %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Kumusta %{to_user}, - header: 'Nagpadala sa iyo si %{from_user} ng isang mensahe sa pamamagitan ng - OpenStreetMap na may paksang %{subject}:' + header: 'Si %{from_user} ay nagpadala sa iyo ng isang mensahe sa pamamagitan + ng OpenStreetMap na may paksang %{subject}:' + header_html: 'Si %{from_user} ay nagpadala sa iyo ng isang mensahe sa pamamagitan + ng OpenStreetMap na may paksang %{subject}:' friendship_notification: hi: Kumusta %{to_user}, subject: Idinagdag ka ni %{user} ng [OpenStreetMap] bilang isang kaibigan @@ -908,10 +966,12 @@ tl: befriend_them: Maaari mong rin silang idagdag bilang isang kaibigan doon sa %{befriendurl}. gpx_failure: + hi: Kumusta %{to_user}, failed_to_import: 'nabigo sa pag-angkat. Narito ang kamalian:' import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: Nabigo ang Pag-angkat ng GPX ng [OpenStreetMap] gpx_success: + hi: Kumusta %{to_user}, loaded_successfully: matagumpay na naikarga na may %{trace_points} mula sa isang maaaring %{possible_points} mga tuldok. subject: Tagumpay ng Pag-angkat ng GPX ng [OpenStreetMap] @@ -943,6 +1003,8 @@ tl: commented: subject_own: '[OpenStreetMap] Pinuna ni %{commenter} ang isa sa iyong mga pangkat ng pagbabago' + subject_other: '[OpenStreetMap] Pinuna ni %{commenter} ang isa sa iyong mga + pangkat ng pagbabago' partial_changeset_with_comment: na may puna na '%{changeset_comment}' partial_changeset_without_comment: walang puna details: Higit pang mga detalye tungkol sa pangkat ng pagbabago ay matatagpuan @@ -1087,16 +1149,27 @@ tl: kung nais mong talakayin ito. auth failure: Paumanhin, hindi makalagda sa pamamagitan ng mga detalyeng iyan. openid_logo_alt: Lumagda sa pamamagitan ng isang OpenID + auth_providers: + openid: + title: Lumagda sa pamamagitan ng OpenID + google: + title: Lumagda sa pamamagitan ng Google + alt: Lumagda sa pamamagitan ng isang Google OpenID + facebook: + title: Lumagda sa pamamagitan ng Facebook destroy: title: Umalis sa pagkakalagda heading: Umalis sa pagkakalagda mula sa OpenStreetMap logout_button: Umalis sa pagkakalagda + shared: + markdown_help: + image: Larawan site: about: next: Kasunod copyright_html: ©Mga tagapag-ambag
      ng OpenStreetMap - used_by_html: Ang %{name} ay nagpapatakbo ng dato ng mapa sa libu-libong mga - website, mga mobile na app, at aparatong hardware + used_by_html: Ang %{name} ay nagbibigay ng dato ng mapa para sa libu-libong + mga website, mga mobile na app, at aparatong hardware lede_text: Ang OpenStreetMap ay nilikha ng isang komunidad ng mga nagmamapa na nag-aambag at nagpapanatili ng dato tungkol sa mga kalsada, mga daanan, mga kapihan, mga istasyon ng tren, at iba pa, sa buong mundo. @@ -1142,9 +1215,9 @@ tl: lisensiya. Ipinapaliwanag \nng buong kodigong pambatas \nang mga karapatan at mga pananagutan mo." intro_3_1_html: |- - Ang kartograpya sa aming mga tile na mapa at ang aming dokumentasyon ay lisensyado sa ilalim ng lisensiyang Creative - Commons Attribution-ShareAlike 2.0 (CC BY-SA). + Ang aming dokumentasyon ay lisensyado sa ilalim ng lisensiyang Creative + Commons Attribution-ShareAlike 2.0 (CC BY-SA 2.0). credit_title_html: Paano babanggitin ang OpenStreetMap credit_1_html: "Kinakailangan namin na gamitin ang kredito na “© mga tagapag-ambag ng \nOpenStreetMap”." @@ -1282,6 +1355,8 @@ tl: title: Mag-ulat ng problema/ Ayusin ang mapa how_to_help: title: Papaano tumulong + other_concerns: + title: Iba pang mga alalahanin help: welcome: url: /welcome @@ -1292,17 +1367,23 @@ tl: title: IRC switch2osm: title: switch2osm + wiki: + url: https://wiki.openstreetmap.org/ + title: OpenStreetMap Wiki sidebar: search_results: Mga Resulta ng Paghahanap close: Isara search: search: Maghanap + get_directions: Kunin ang mga direksyon + get_directions_title: Kumuha ng direksyon sa pagitan ng dalawang lugar from: Mula sa to: Papunta sa where_am_i: Nasaan ba ito? where_am_i_title: Ilarawan ang pangkasalukuyang kinalalagyan na ginagamit ang makinang panghanap submit_text: Gawin + reverse_directions_text: Baliktarin ang mga Direksyon key: table: entry: @@ -1314,7 +1395,10 @@ tl: unclassified: Kalsadang walang kaurian track: Bakas bridleway: Daanan ng Kabayo - cycleway: Daanan ng motorsiklo o bisikleta + cycleway: Daanan ng bisikleta + cycleway_national: Pambansang daanan ng bisikleta + cycleway_regional: Panrehiyong daanan ng bisikleta + cycleway_local: Pampook na daanan ng bisikleta footway: Lakaran ng tao rail: Daambakal subway: Daanang pang-ilalim @@ -1429,13 +1513,16 @@ tl: delete_trace: Burahin ang bakas na ito trace_not_found: Hindi natagpuan ang bakas! visibility: 'Pagkanakikita:' + confirm_delete: Burahin ang bakas na ito? trace_paging_nav: showing_page: Ika-%{page} na pahina older: Mas Lumang mga Bakas newer: Mas Bagong mga Bakas trace: pending: NAGHIHINTAY - count_points: '%{count} mga puntos' + count_points: + one: 1 punto + other: '%{count} mga puntos' more: marami pa trace_details: Tingnan ang mga Detalye ng Bakas view_map: Tingnan ang Mapa @@ -1455,7 +1542,6 @@ tl: GPS doon sa pahina ng wiki. upload_trace: Magkargang paitaas ng isang bakas - see_all_traces: Tingnan ang lahat ng mga pagbabakas destroy: scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal make_public: @@ -1557,8 +1643,9 @@ tl: ang pahinang ito ng wiki. terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: 'Mga tuntunin sa tagapag-ambag:' + title: 'Mga tuntunin:' heading: Tuntunin sa taga-ambag + heading_ct: Mga tuntunin sa taga-ambag consider_pd: Bilang karagdagan sa kasunduang nasa itaas, itinuturing ko ang mga ambag ko bilang nasa Nasasaklawan ng Madla. consider_pd_why: ano ba ito? @@ -1601,7 +1688,7 @@ tl: ct status: 'Mga tuntunin sa taga-ambag:' ct undecided: Walang kapasyahan ct declined: Tumanggi - latest edit: 'Pinakahuling pagbabago %{ago}:' + latest edit: 'Pinakahuling pagbabago (%{ago}):' email address: 'Tirahan ng e-liham:' created from: 'Nilikha magmula sa:' status: 'Katayuan:' @@ -1611,6 +1698,7 @@ tl: if_set_location_html: Itakda ang iyong lokasyon ng bahay sa pahinang %{settings_link} upang makita ang mga kalapit na tagagamit. settings_link_text: mga pagtatakda + 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' @@ -1653,7 +1741,7 @@ tl: link: http://wiki.openstreetmap.org/wiki/OpenID link text: ano ba ito? public editing: - heading: 'Pangmadlang pamamatnugot:' + heading: Pangmadlang pamamatnugot enabled: Pinagana. Nagpakilala at maaaring magbago ng dato. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: ano ba ito? @@ -1667,12 +1755,12 @@ tl: Upang maipakita kung ano ang binago mo at mapahintulutan ang mga tao na makipag-ugnayan sa iyo sa pamamagitan ng websayt, pindutin ang pindutang nasa ibaba. Magmula noong pagpapalit ng 0.6 API, tanging pangmadlang - mga tagagamit lamang ang makakapamatnugot sa dato ng mapa. (alamin + mga tagagamit lamang ang makakapamatnugot sa dato ng mapa. (alamin kung bakit).

      • Ang galaw na ito ay hindi maipanunumbalik papunta sa dati at lahat ng bagong mga tagagamit ay pangmadla na ngayon ayon sa likas na katakdaan.
      contributor terms: - heading: 'Mga Tuntunin sa Tagapag-ambag:' + heading: Mga Tuntunin sa Tagapag-ambag agreed: Sumang-ayon ka sa bagong mga Tuntunin na Pangtagapag-ambag. not yet agreed: Hindi ka sumang-ayon sa bagong mga Tuntunin na Pangtagapag-ambag. review link text: Mangyaring sundan ang kawing na ito ayon sa kaluwagan ng @@ -1682,9 +1770,11 @@ tl: bilang nasa loob ng Nasasakupan ng Madla. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: ano ba ito? - image: 'Larawan:' + image: Larawan gravatar: gravatar: Gamitin ang Gravatar + link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Ano ang Gravatar? disabled: Hindi na pinagana ang Gravatar. enabled: Pinagana ang pagpapakita ng iyong Gravatar. new image: Magdagdag ng isang larawan @@ -1693,7 +1783,7 @@ tl: replace image: Palitan ang pangkasalukuyang larawan image size hint: (pinakamahusay ang parisukat na mga larawan na hindi bababa sa 100x100) - home location: 'Kinalalagyan ng Tahanan:' + home location: Kinalalagyan ng Tahanan no home location: Hindi mo naipasok ang kinalalagyan ng tahanan mo. update home location on click: Isapanahon ang kinalalagyan ng tahanan kapag pinindot ko ang ibabaw ng mapa? @@ -1800,19 +1890,32 @@ tl: title: Binabawi ang paghadlang sa %{block_on} heading_html: Binabawi ang paghadlang sa %{block_on} ni %{block_by} time_future: Ang hadlang na ito ay magwawakas sa ganap na %{time}. - past: Ang hadlang na ito ay nagwakas noong %{time} na ang nakalilipas at hindi - na ngayon mababawi. + past: Ang hadlang na ito ay nagwakas noong %{time} at hindi na ngayon mababawi. confirm: Nakatitiyak ka bang nais mong bawiin ang hadlang na ito? revoke: Bawiin! flash: Nabawi na ang hadlang na ito. helper: time_future_html: Magwawakas sa %{time}. until_login: Masigla hanggang sa paglagda ng tagagamit. + time_future_and_until_login_html: Magwawakas sa %{time} at hanggang sa paglagda + ng tagagamit. time_past_html: Nagwakas na noong %{time} na ang nakalilipas. block_duration: hours: one: 1 oras other: '%{count} mga oras' + days: + one: 1 araw + other: '%{count} mga araw' + weeks: + one: 1 linggo + other: '%{count} mga linggo' + months: + one: 1 buwan + other: '%{count} mga buwan' + years: + one: 1 taon + other: '%{count} mga taon' blocks_on: title: Mga paghadlang sa %{name} heading_html: Tala ng mga paghadlang sa %{name} @@ -1824,8 +1927,9 @@ tl: show: title: '%{block_on} hinadlangan ni %{block_by}' heading_html: '%{block_on} hinadlangan ni %{block_by}' - created: Nilikha - status: Kalagayan + created: 'Nilikha:' + duration: 'Tagal ng panahon:' + status: 'Kalagayan:' show: Ipakita edit: Baguhin revoke: Bawiin! @@ -1852,7 +1956,9 @@ tl: notes: index: heading: mga tala ni %{user} + no_notes: Walang mga tala id: Id + creator: Tagapaglikha description: Paglalarawan created_at: Nilikha Noong last_changed: Huling binago @@ -1861,6 +1967,7 @@ tl: share: title: Ibahagi cancel: Huwag ituloy + image: Larawan short_url: Maiksing URL paste_html: Idikit ang HTML na ibabaon sa websayt map: @@ -1875,6 +1982,8 @@ tl: layers: data: Dato ng Mapa copyright: © Mga tagapag-ambag ng OpenStreetMap + donate_link_text: + terms: Mga tuntunin sa website at API site: edit_tooltip: Baguhin ang mapa edit_disabled_tooltip: Lumapit upang baguhin ang mapa @@ -1897,6 +2006,7 @@ tl: fossgis_osrm_car: Kotse (OSRM) graphhopper_bicycle: Bisikleta (GraphHopper) graphhopper_car: Kotse (GraphHopper) + descend: Pagbaba directions: Mga Direksyon distance: Layo instructions: @@ -1915,7 +2025,7 @@ tl: offramp_left_with_exit_name_directions: Kunin ang nakasaad na EXIT %{exit} sa kaliwang bahagi papuntang %{name}, biyaheng %{directions} follow_without_exit: Sundan %{name} - start_without_exit: Magsimula sa dulo ng %{name} + start_without_exit: Magsimula sa %{name} destination_without_exit: Abutin ang patutunguhan roundabout_with_exit_ordinal: Sa Rotondang daan gamitin ang %{exit} exit patungong %{name} @@ -1923,9 +2033,12 @@ tl: exit_counts: second: Ika-2 third: Ika-3 + fourth: Ika-4 fifth: Ika-5 + sixth: Ika-6 seventh: Ika-7 eighth: Ika-8 + ninth: Ika-9 tenth: Ika-10 time: Oras query: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index a6210a484..2b9575904 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -187,16 +187,16 @@ tr: pass_crypt_confirmation: Parolayı Onayla help: trace: - tagstring: virgül (,) ile ayır + tagstring: virgülle ayrılmış user_block: - reason: Kullanıcı neden engellendi. Lütfen mümkün olduğunca sakin ve makul - olun, durum hakkında verebildiğiniz kadar detay verin, ve unutmayın ki mesaj - herkese açık olacaktır. Her kullanıcının topluluk jargonuna sahip olmadığını - dikkate alın, basit terimler kullanın. + reason: Kullanıcının engellenme nedeni. Lütfen mümkün olduğunca sakin ve makul + olun, durum hakkında olabildiğince fazla ayrıntı verin, mesajın herkese + açık olacağını unutmayın. Tüm kullanıcıların topluluk jargonunu anlamadığını + unutmayın, bu nedenle lütfen sıradan terimleri kullanmayı deneyin. needs_view: Engel kaldırılmadan önce kullanıcının giriş yapması gerekiyor mu? user: - email_confirmation: Adresiniz herkese açık olarak gösterilmiyor, daha fazla + email_confirmation: Adresiniz herkese açık olarak gösterilmez, daha fazla bilgi için gizlilik politikamıza bakınız. @@ -241,7 +241,7 @@ tr: one: 1 yıl önce other: '%{count} yıl önce' editor: - default: Varsayılan (kullanılan %{name}) + default: Varsayılan (şu anda %{name}) id: name: iD description: iD (tarayıcı düzenleyici) @@ -293,7 +293,7 @@ tr: in_changeset: Değişiklik Kaydı anonymous: anonim no_comment: (yorum yok) - part_of: Ortak parça + part_of: 'Parçası:' part_of_relations: one: 1 ilişki other: '%{count} ilişki' @@ -559,6 +559,8 @@ tr: success: '%{name} arkadaş listesine eklendi!' failed: Üzgünüz, %{name} arkadaş olarak eklenemedi. already_a_friend: '%{name} ile zaten arkadaşsın.' + limit_exceeded: Son zamanlarda çok sayıda kullanıcıyla arkadaş oldunuz. Lütfen + daha fazla arkadaş olmaya çalışmadan önce bir süre bekleyin. remove_friend: heading: '%{user}, arkadaşlıktan çıkarılsın mı?' button: Arkadaşlıktan çıkar @@ -1803,9 +1805,6 @@ tr: wikipedia: title: Vikipedi ile giriş alt: Vikipedi Hesabı ile giriş - yahoo: - title: Yahoo ile oturum aç - alt: Yahoo OpenID ile giriş wordpress: title: Wordpress ile oturum aç alt: Wordpress OpenID ile giriş @@ -1819,14 +1818,14 @@ tr: shared: markdown_help: title_html: kramdown - ile ayrştırıldı + ile ayrıştırıldı headings: Başlıklar heading: Başlık subheading: Alt başlık unordered: Sırasız liste ordered: Sıralı liste - first: İlk öğe - second: İkinci öğe + first: İlk öge + second: İkinci öge link: Bağlantı text: Metin image: Resim @@ -2044,11 +2043,11 @@ tr: export_details_html: OpenStreetMap verileri, Open Data Commons Open Database License (ODbL) altında lisanslanmıştır. too_large: - advice: 'Yukarıdaki dışa aktarım başarısız olursa, lütfen aşağıdaki kaynaklardan - birini kullanmayı düşünün:' - body: Bu alan OpenStreetMap XML verisi olarak verilmesine kadar büyüktür. - Lütfen yakınlaştır veya daha küçük bir alan seç ya da aşağıdaki verilen - diğer kaynakları kullan. + advice: 'Yukarıdaki dışa aktarma işlemi başarısız olursa lütfen aşağıda listelenen + kaynaklardan birini kullanmayı düşünün:' + body: Bu alan, OpenStreetMap XML verisi olarak dışa aktarılamayacak kadar + büyük. Lütfen alanı yakınlaştırın veya daha küçük bir alan seçin ya da toplu + veri indirmeleri için aşağıda listelenen kaynaklardan birini kullanın. planet: title: OSM Gezegeni description: Tam OpenStreetMap veritabanının düzenli güncellenen kopyası @@ -2363,7 +2362,7 @@ tr: in: 'etiketler:' index: public_traces: Herkese açık GPS izleri - my_traces: GPS izlerim + my_traces: GPS İzlerim public_traces_from: '%{user} tarafından gelen herkese açık GPS izleri' description: Son GPS izi güncellemelerine göz at tagged_with: ' %{tags} ile etiketlendi' @@ -2371,8 +2370,9 @@ tr: sayfasında yeni bir iz yükle veya GPS iz hakkında daha fazla bilgi edinin upload_trace: GPS izi gönder - see_all_traces: Tüm izleri görüntüle - see_my_traces: İzlerimi görüntüle + all_traces: Tüm İzler + traces_from: '%{user} kullanıcısına ait herkese açık izler' + remove_tag_filter: Etiket Filtresini Kaldır destroy: scheduled_for_deletion: İz, silme işlemi için ayarlandı make_public: @@ -2486,8 +2486,8 @@ tr: email address: 'E-posta Adresi:' confirm email address: E-posta Adresini Onayla display name: 'Görünen Ad:' - display name description: Herkes tarafından görünen ad. Bu adı istediği zaman - 'tercihlerim' bölümünde değiştirebilirsin. + display name description: Herkes tarafından görünecek bir kullanıcı adı. Bu + adı istediğin zaman 'tercihlerim' bölümünde değiştirebilirsin. external auth: 'Üçüncü Taraf Kimlik Doğrulaması:' use external auth: 'Alternatif olarak, bir üçüncü parti uygulaması kullanarak oturum açın:' @@ -2541,7 +2541,7 @@ tr: my edits: Katkılarım my traces: GPS İzlerim my notes: Notlarım - my messages: İletilerim + my messages: Mesajlarım my profile: Profilim my settings: Tercihlerim my comments: Yorumlarım diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 451e21dcd..0e8f3bee2 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1796,9 +1796,6 @@ uk: wikipedia: title: Увійти через Вікіпедію alt: Вхід через обліковий запис у Вікіпедії - yahoo: - title: Увійти з облікового запису Yahoo - alt: Увійти з Yahoo OpenID wordpress: title: Увійти через Wordpress alt: Увійти через Wordpress OpenID @@ -2342,8 +2339,6 @@ uk: або дізнайтесь більше про створення GPS-треків на сторінці вікі. upload_trace: Надіслати GPS-трек на сервер - see_all_traces: Показати всі треки - see_my_traces: Показати мої треки destroy: scheduled_for_deletion: Заплановано для вилучення make_public: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index bc616657b..08ae18b4a 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1646,9 +1646,6 @@ vi: wikipedia: title: Đăng nhập qua Wikipedia alt: Đăng nhập qua Tài khoản Wikipedia - yahoo: - title: Đăng nhập qua Yahoo! - alt: Đăng nhập dùng OpenID của Yahoo! wordpress: title: Đăng nhập qua WordPress alt: Đăng nhập dùng OpenID của WordPress @@ -2186,8 +2183,6 @@ vi: hoặc tìm hiểu thêm về tuyến đường GPS tại trang wiki. upload_trace: Tải lên tuyến đường - see_all_traces: Xem tất cả các tuyến đường - see_my_traces: Xem các tuyến đường của tôi destroy: scheduled_for_deletion: Tuyến đường chờ được xóa make_public: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 155ffc9dc..a45a98ab1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -18,6 +18,7 @@ # Author: Fanjiayi # Author: Gerongfenh # Author: Grace03 +# Author: GuoPC # Author: Hmgrmb # Author: Hudafu # Author: Hydra @@ -61,6 +62,7 @@ # Author: 水獭很懒 # Author: 沈澄心 # Author: 神樂坂秀吉 +# Author: 羊羊32521 # Author: 铁桶 # Author: 阿pp # Author: 아라 @@ -1321,11 +1323,11 @@ zh-CN: level2: 国界 level3: 大区界 level4: 州界(省界) - level5: 地区界(地级市界) + level5: 地区界(地级行政区界) level6: 县界 - level8: 市界(乡/镇/街道界) + level8: 市界(乡级行政区界) level9: 村界 - level10: 郊区界(社区/行政村界) + level10: 郊区界(村级行政区界) level11: 邻里(小区)边界 types: cities: 城市 @@ -1717,9 +1719,6 @@ zh-CN: wikipedia: title: 使用维基百科登录 alt: 使用维基百科账户登录 - yahoo: - title: 使用Yahoo登录 - alt: 使用Yahoo OpenID登录 wordpress: title: 使用Wordpress登录 alt: 使用 Wordpress OpenID 登录 @@ -2147,15 +2146,16 @@ zh-CN: in: 使用 index: public_traces: 公开GPS轨迹 - my_traces: 我的GPS轨迹 + my_traces: 我的轨迹 public_traces_from: 来自 %{user} 的公开 GPS 轨迹 description: 浏览最近的GPS轨迹上传 tagged_with: ' 标签为%{tags}' empty_html: 尚无轨迹。上传新轨迹或在wiki页面上了解 GPS 轨迹。 upload_trace: 上传轨迹 - see_all_traces: 查看所有轨迹 - see_my_traces: 查看我的轨迹 + all_traces: 所有轨迹 + traces_from: 来自%{user}的公开轨迹 + remove_tag_filter: 移除标签过滤器 destroy: scheduled_for_deletion: 计划删除的轨迹 make_public: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index ac58c9e12..69ee308d2 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1707,9 +1707,6 @@ zh-TW: wikipedia: title: 以維基百科登入 alt: 以維基百科帳號登入 - yahoo: - title: 使用 Yahoo 登入 - alt: 使用 Yahoo OpenID 登入 wordpress: title: 使用 Wordpress 登入 alt: 使用 Wordpress OpenID 登入 @@ -2176,8 +2173,6 @@ zh-TW: empty_html: 還沒有軌跡。上傳新的軌跡或在 wiki 頁面上瞭解更多有關 GPS 軌跡的資訊。 upload_trace: 上傳軌跡 - see_all_traces: 查看所有的軌跡 - see_my_traces: 查看我的軌跡 destroy: scheduled_for_deletion: 軌跡已被排程刪除 make_public: diff --git a/lib/id.rb b/lib/id.rb index 4e6cf3b7c..87c4a194e 100644 --- a/lib/id.rb +++ b/lib/id.rb @@ -1,3 +1,3 @@ module ID - LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }.compact) + LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.filter_map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }) end diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake deleted file mode 100644 index 720530256..000000000 --- a/lib/tasks/testing.rake +++ /dev/null @@ -1,10 +0,0 @@ -task :test => :environment do - Rails::TestUnit::Runner.rake_run(["test/system"]) unless ENV.key?("TEST") -end - -namespace :test do - task "lib" => "test:prepare" do - $LOAD_PATH << "test" - Rails::TestUnit::Runner.rake_run(["test/lib"]) - end -end diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index bae0158cd..f583e5e39 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -211,7 +211,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to login_path - assert_match(/sent a new confirmation/, flash[:notice]) + assert_equal("confirmations/resend_success_flash", flash[:notice][:partial]) + assert_equal({ :email => user.email, :sender => Settings.email_from }, flash[:notice][:locals]) email = ActionMailer::Base.deliveries.last diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 90fbaebc2..43e27c529 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -3,14 +3,6 @@ require "test_helper" class ApplicationHelperTest < ActionView::TestCase attr_accessor :current_user - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end - def test_linkify %w[http://example.com/test ftp://example.com/test https://example.com/test].each do |link| text = "Test #{link} is made into a link" @@ -54,13 +46,13 @@ class ApplicationHelperTest < ActionView::TestCase assert_equal "rtl", dir params.delete(:dir) - I18n.locale = "he" + I18n.with_locale "he" do + assert_equal "rtl", dir - assert_equal "rtl", dir - - params[:dir] = "ltr" - assert_equal "ltr", dir - params.delete(:dir) + params[:dir] = "ltr" + assert_equal "ltr", dir + params.delete(:dir) + end end def test_friendly_date diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index 076975b09..a20e1703d 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -4,14 +4,6 @@ class BrowseHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end - def test_printable_name node = create(:node, :with_history, :version => 2) node_v1 = node.old_nodes.find_by(:version => 1) @@ -35,35 +27,35 @@ class BrowseHelperTest < ActionView::TestCase assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) - I18n.locale = "pt" - - assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) - assert_dom_equal "Nó teste (#{node.id})", printable_name(node) - assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2) - assert_dom_equal node.id.to_s, printable_name(node_v1) - assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true) - assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) - assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) - - I18n.locale = "pt-BR" - - assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) - assert_dom_equal "Nó teste (#{node.id})", printable_name(node) - assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2) - assert_dom_equal node.id.to_s, printable_name(node_v1) - assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true) - assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) - assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) + I18n.with_locale "pt" do + assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2) + assert_dom_equal node.id.to_s, printable_name(node_v1) + assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true) + assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) + end - I18n.locale = "de" + I18n.with_locale "pt-BR" do + assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) + assert_dom_equal "Nó teste (#{node.id})", printable_name(node) + assert_dom_equal "Nó teste (#{node.id})", printable_name(node_v2) + assert_dom_equal node.id.to_s, printable_name(node_v1) + assert_dom_equal "Nó teste (#{node.id}, v2)", printable_name(node_v2, :version => true) + assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) + end - assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) - assert_dom_equal "Test Node (#{node.id})", printable_name(node) - assert_dom_equal "Test Node (#{node.id})", printable_name(node_v2) - assert_dom_equal node.id.to_s, printable_name(node_v1) - assert_dom_equal "Test Node (#{node.id}, v2)", printable_name(node_v2, :version => true) - assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) - assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) + I18n.with_locale "de" do + assert_dom_equal deleted_node.id.to_s, printable_name(deleted_node) + assert_dom_equal "Test Node (#{node.id})", printable_name(node) + assert_dom_equal "Test Node (#{node.id})", printable_name(node_v2) + assert_dom_equal node.id.to_s, printable_name(node_v1) + assert_dom_equal "Test Node (#{node.id}, v2)", printable_name(node_v2, :version => true) + assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true) + assert_dom_equal "3.1415926 (#{node_with_ref_without_name.id})", printable_name(node_with_ref_without_name) + end end def test_link_class diff --git a/test/helpers/browse_tags_helper_test.rb b/test/helpers/browse_tags_helper_test.rb index 5574513c2..3aa851ef9 100644 --- a/test/helpers/browse_tags_helper_test.rb +++ b/test/helpers/browse_tags_helper_test.rb @@ -4,14 +4,6 @@ class BrowseTagsHelperTest < ActionView::TestCase include ERB::Util include ApplicationHelper - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end - def test_format_key html = format_key("highway") assert_dom_equal "highway", html @@ -63,21 +55,21 @@ class BrowseTagsHelperTest < ActionView::TestCase link = wiki_link("tag", "highway=primary") assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link - I18n.locale = "de" + I18n.with_locale "de" do + link = wiki_link("key", "highway") + assert_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link - link = wiki_link("key", "highway") - assert_equal "https://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link - - link = wiki_link("tag", "highway=primary") - assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link + link = wiki_link("tag", "highway=primary") + assert_equal "https://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link + end - I18n.locale = "tr" + I18n.with_locale "tr" do + link = wiki_link("key", "highway") + assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link - link = wiki_link("key", "highway") - assert_equal "https://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link - - link = wiki_link("tag", "highway=primary") - assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link + link = wiki_link("tag", "highway=primary") + assert_equal "https://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link + end end def test_wikidata_links @@ -110,12 +102,12 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_equal "Q42", links[0][:title] # the language of the wikidata-page should match the current locale - I18n.locale = "zh-CN" - links = wikidata_links("wikidata", "Q1234") - assert_equal 1, links.length - assert_equal "//www.wikidata.org/entity/Q1234?uselang=zh-CN", links[0][:url] - assert_equal "Q1234", links[0][:title] - I18n.locale = "en" + I18n.with_locale "zh-CN" do + links = wikidata_links("wikidata", "Q1234") + assert_equal 1, links.length + assert_equal "//www.wikidata.org/entity/Q1234?uselang=zh-CN", links[0][:url] + assert_equal "Q1234", links[0][:title] + end ### Prefixed wikidata-tags @@ -129,16 +121,16 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_equal "Q24", links[0][:title] # Another allowed key, this time with multiple values and I18n - I18n.locale = "dsb" - links = wikidata_links("brand:wikidata", "Q936;Q2013;Q1568346") - assert_equal 3, links.length - assert_equal "//www.wikidata.org/entity/Q936?uselang=dsb", links[0][:url] - assert_equal "Q936", links[0][:title] - assert_equal "//www.wikidata.org/entity/Q2013?uselang=dsb", links[1][:url] - assert_equal "Q2013", links[1][:title] - assert_equal "//www.wikidata.org/entity/Q1568346?uselang=dsb", links[2][:url] - assert_equal "Q1568346", links[2][:title] - I18n.locale = "en" + I18n.with_locale "dsb" do + links = wikidata_links("brand:wikidata", "Q936;Q2013;Q1568346") + assert_equal 3, links.length + assert_equal "//www.wikidata.org/entity/Q936?uselang=dsb", links[0][:url] + assert_equal "Q936", links[0][:title] + assert_equal "//www.wikidata.org/entity/Q2013?uselang=dsb", links[1][:url] + assert_equal "Q2013", links[1][:title] + assert_equal "//www.wikidata.org/entity/Q1568346?uselang=dsb", links[2][:url] + assert_equal "Q1568346", links[2][:title] + end # and now with whitespaces... links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006") @@ -184,11 +176,11 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url] assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title] - I18n.locale = "pt-BR" - - link = wikipedia_link("wikipedia", "zh-classical:Test#Section") - assert_equal "https://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url] - assert_equal "zh-classical:Test#Section", link[:title] + I18n.with_locale "pt-BR" do + link = wikipedia_link("wikipedia", "zh-classical:Test#Section") + assert_equal "https://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url] + assert_equal "zh-classical:Test#Section", link[:title] + end link = wikipedia_link("foo", "Test") assert_nil link @@ -212,11 +204,11 @@ class BrowseTagsHelperTest < ActionView::TestCase assert_equal "//commons.wikimedia.org/wiki/Category:Test_Category?uselang=en", link[:url] assert_equal "Category:Test_Category", link[:title] - I18n.locale = "pt-BR" - - link = wikimedia_commons_link("wikimedia_commons", "File:Test.jpg") - assert_equal "//commons.wikimedia.org/wiki/File:Test.jpg?uselang=pt-BR", link[:url] - assert_equal "File:Test.jpg", link[:title] + I18n.with_locale "pt-BR" do + link = wikimedia_commons_link("wikimedia_commons", "File:Test.jpg") + assert_equal "//commons.wikimedia.org/wiki/File:Test.jpg?uselang=pt-BR", link[:url] + assert_equal "File:Test.jpg", link[:title] + end link = wikimedia_commons_link("foo", "Test") assert_nil link diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb index 16f83ec89..c4afa6c83 100644 --- a/test/helpers/user_blocks_helper_test.rb +++ b/test/helpers/user_blocks_helper_test.rb @@ -13,4 +13,24 @@ class UserBlocksHelperTest < ActionView::TestCase block = create(:user_block, :ends_at => Time.now.getutc + 1.hour) assert_match %r{^Ends in about 1 hour\.$}, block_status(block) end + + def test_block_duration_in_words + words = block_duration_in_words(364.days) + assert_equal "11 months", words + + words = block_duration_in_words(24.hours) + assert_equal "1 day", words + + # Ensure that nil hours is not passed to i18n.t + words = block_duration_in_words(10.minutes) + assert_equal "0 hours", words + + words = block_duration_in_words(0) + assert_equal "0 hours", words + + # Ensure that (slightly) negative durations don't mess everything up + # This can happen on zero hour blocks when ends_at is a millisecond before created_at + words = block_duration_in_words(-0.001) + assert_equal "0 hours", words + end end diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index a378ad5b0..758baa1cb 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -75,8 +75,8 @@ class UserHelperTest < ActionView::TestCase button = auth_button("google", "google") assert_equal("\"Login", button) - button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal("\"Login", button) + button = auth_button("wordpress", "openid", :openid_url => "wordpress.com") + assert_equal("\"Login", button) end private diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb index b42865ae4..6f6d7779f 100644 --- a/test/integration/page_locale_test.rb +++ b/test/integration/page_locale_test.rb @@ -1,49 +1,45 @@ require "test_helper" class PageLocaleTest < ActionDispatch::IntegrationTest - def setup - I18n.locale = "en" - end - - def teardown - I18n.locale = "en" - end - def test_defaulting - user = create(:user, :languages => []) - - get "/login" - follow_redirect! - post "/login", :params => { :username => user.email, :password => "test" } - follow_redirect! - - get "/diary/new" - assert_empty User.find(user.id).languages - assert_select "html[lang=?]", "en" - - get "/diary/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => "fr, en" } - assert_equal %w[fr en], User.find(user.id).languages - assert_select "html[lang=?]", "fr" + I18n.with_locale "en" do + user = create(:user, :languages => []) + + get "/login" + follow_redirect! + post "/login", :params => { :username => user.email, :password => "test" } + follow_redirect! + + get "/diary/new" + assert_empty User.find(user.id).languages + assert_select "html[lang=?]", "en" + + get "/diary/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => "fr, en" } + assert_equal %w[fr en], User.find(user.id).languages + assert_select "html[lang=?]", "fr" + end end def test_override - user = create(:user, :languages => ["de"]) + I18n.with_locale "en" do + user = create(:user, :languages => ["de"]) - get "/diary" - assert_select "html[lang=?]", "en" + get "/diary" + assert_select "html[lang=?]", "en" - get "/diary", :params => { :locale => "es" } - assert_select "html[lang=?]", "es" + get "/diary", :params => { :locale => "es" } + assert_select "html[lang=?]", "es" - get "/login" - follow_redirect! - post "/login", :params => { :username => user.email, :password => "test" } - follow_redirect! + get "/login" + follow_redirect! + post "/login", :params => { :username => user.email, :password => "test" } + follow_redirect! - get "/diary" - assert_select "html[lang=?]", "de" + get "/diary" + assert_select "html[lang=?]", "de" - get "/diary", :params => { :locale => "fr" } - assert_select "html[lang=?]", "fr" + get "/diary", :params => { :locale => "fr" } + assert_select "html[lang=?]", "fr" + end end end diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb index 2483f1543..a9bd468ce 100644 --- a/test/integration/user_changeset_comments_test.rb +++ b/test/integration/user_changeset_comments_test.rb @@ -11,7 +11,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest assert_select "div#content" do assert_select "div#sidebar" do assert_select "div#sidebar_content" do - assert_select "div.browse-section" do + assert_select "div" do assert_select "div.notice" do assert_select "a[href='/login?referer=%2Fchangeset%2F#{changeset.id}']", :text => I18n.t("browse.changeset.join_discussion"), :count => 1 end @@ -43,7 +43,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest assert_select "div#content" do assert_select "div#sidebar" do assert_select "div#sidebar_content" do - assert_select "div.browse-section" do + assert_select "div" do assert_select "form[action='#']" do assert_select "textarea[name=text]" end diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index a39e423c0..9343487f6 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -2,16 +2,12 @@ require "test_helper" class UserCreationTest < ActionDispatch::IntegrationTest def setup - I18n.locale = "en" - OmniAuth.config.test_mode = true stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404) end def teardown - I18n.locale = "en" - OmniAuth.config.mock_auth[:openid] = nil OmniAuth.config.mock_auth[:google] = nil OmniAuth.config.mock_auth[:facebook] = nil @@ -22,138 +18,148 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_create_user_form - I18n.available_locales.each do |locale| - reset! - get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - follow_redirect! - assert_response :success - assert_template "users/new" + I18n.with_locale "en" do + I18n.available_locales.each do |locale| + reset! + get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + follow_redirect! + assert_response :success + assert_template "users/new" + end end end def test_user_create_submit_duplicate_email - Locale.available.each do |locale| - dup_email = create(:user).email - display_name = "#{locale}_new_tester" - assert_difference("User.count", 0) do - assert_difference("ActionMailer::Base.deliveries.size", 0) do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => dup_email, - :email_confirmation => dup_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } }, - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + I18n.with_locale "en" do + Locale.available.each do |locale| + dup_email = create(:user).email + display_name = "#{locale}_new_tester" + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => dup_email, + :email_confirmation => dup_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } }, + :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + end end end + assert_response :success + assert_template "users/new" + assert_equal locale.to_s, response.headers["Content-Language"] + assert_select "form" + assert_select "form > div.form-group > input.is-invalid#user_email" + assert_no_missing_translations end - assert_response :success - assert_template "users/new" - assert_equal locale.to_s, response.headers["Content-Language"] - assert_select "form" - assert_select "form > div.form-group > input.is-invalid#user_email" - assert_no_missing_translations end end def test_user_create_submit_duplicate_username - I18n.available_locales.each do |locale| - dup_display_name = create(:user).display_name - email = "#{locale}_new_tester" - assert_difference("User.count", 0) do - assert_difference("ActionMailer::Base.deliveries.size", 0) do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => email, - :email_confirmation => email, - :display_name => dup_display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } }, - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + I18n.with_locale "en" do + I18n.available_locales.each do |locale| + dup_display_name = create(:user).display_name + email = "#{locale}_new_tester" + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => email, + :email_confirmation => email, + :display_name => dup_display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } }, + :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + end end end + assert_response :success + assert_template "users/new" + assert_select "form > div.form-group > input.is-invalid#user_display_name" + assert_no_missing_translations end - assert_response :success - assert_template "users/new" - assert_select "form > div.form-group > input.is-invalid#user_display_name" - assert_no_missing_translations end end def test_user_create_success - I18n.available_locales.each do |locale| - new_email = "#{locale}newtester@osm.org" - display_name = "#{locale}_new_tester" - - assert_difference("User.count", 0) do - assert_difference("ActionMailer::Base.deliveries.size", 0) do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } } + I18n.with_locale "en" do + I18n.available_locales.each do |locale| + new_email = "#{locale}newtester@osm.org" + display_name = "#{locale}_new_tester" + + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } + end end end - end - assert_redirected_to "/user/terms" + assert_redirected_to "/user/terms" - assert_difference("User.count") do - assert_difference("ActionMailer::Base.deliveries.size", 1) do - perform_enqueued_jobs do - post "/user/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }, - :params => { :read_ct => 1, :read_tou => 1 } - follow_redirect! + assert_difference("User.count") do + assert_difference("ActionMailer::Base.deliveries.size", 1) do + perform_enqueued_jobs do + post "/user/save", + :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }, + :params => { :read_ct => 1, :read_tou => 1 } + follow_redirect! + end end end - end - # Check the e-mail - register_email = ActionMailer::Base.deliveries.first + # Check the e-mail + register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to.first, new_email - # Check that the confirm account url is correct - assert_match(/#{@url}/, register_email.body.to_s) + assert_equal register_email.to.first, new_email + # Check that the confirm account url is correct + assert_match(/#{@url}/, register_email.body.to_s) - # Check the page - assert_response :success - assert_template "confirmations/confirm" + # Check the page + assert_response :success + assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear + ActionMailer::Base.deliveries.clear + end end end def test_user_create_no_tou_failure - I18n.available_locales.each do |locale| - new_email = "#{locale}newtester@osm.org" - display_name = "#{locale}_new_tester" - - assert_difference("User.count", 0) do - assert_difference("ActionMailer::Base.deliveries.size", 0) do - perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } } + I18n.with_locale "en" do + I18n.available_locales.each do |locale| + new_email = "#{locale}newtester@osm.org" + display_name = "#{locale}_new_tester" + + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } + end end end - end - assert_redirected_to "/user/terms" - - perform_enqueued_jobs do - post "/user/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } assert_redirected_to "/user/terms" - end - ActionMailer::Base.deliveries.clear + perform_enqueued_jobs do + post "/user/save", + :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + assert_redirected_to "/user/terms" + end + + ActionMailer::Base.deliveries.clear + end end end diff --git a/test/models/changeset_tag_test.rb b/test/models/changeset_tag_test.rb index 1db2effd6..90674fbbe 100644 --- a/test/models/changeset_tag_test.rb +++ b/test/models/changeset_tag_test.rb @@ -5,7 +5,7 @@ class ChangesetTagTest < ActiveSupport::TestCase changeset = create(:changeset) key = "k" - (0..255).each do |i| + [0, 255].each do |i| tag = ChangesetTag.new tag.changeset_id = changeset.id tag.k = key * i @@ -18,7 +18,7 @@ class ChangesetTagTest < ActiveSupport::TestCase changeset = create(:changeset) val = "v" - (0..255).each do |i| + [0, 255].each do |i| tag = ChangesetTag.new tag.changeset_id = changeset.id tag.k = "k" diff --git a/test/models/message_test.rb b/test/models/message_test.rb index b1acd0805..99a471075 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -32,7 +32,7 @@ class MessageTest < ActiveSupport::TestCase end def test_utf8_roundtrip - (1..255).each do |i| + [1, 255].each do |i| assert_message_ok("c", i) assert_message_ok(EURO, i) end diff --git a/test/models/node_tag_test.rb b/test/models/node_tag_test.rb index 1a7125f08..47295770f 100644 --- a/test/models/node_tag_test.rb +++ b/test/models/node_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class NodeTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:node_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class NodeTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:node_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/models/old_node_tag_test.rb b/test/models/old_node_tag_test.rb index f432d04b8..62869c6ad 100644 --- a/test/models/old_node_tag_test.rb +++ b/test/models/old_node_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class OldNodeTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:old_node_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class OldNodeTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:old_node_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/models/old_relation_tag_test.rb b/test/models/old_relation_tag_test.rb index a05e67ee7..dbdbf54c5 100644 --- a/test/models/old_relation_tag_test.rb +++ b/test/models/old_relation_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class OldRelationTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:old_relation_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class OldRelationTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:old_relation_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/models/old_way_tag_test.rb b/test/models/old_way_tag_test.rb index 565633063..d794cc275 100644 --- a/test/models/old_way_tag_test.rb +++ b/test/models/old_way_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class OldWayTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:old_way_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class OldWayTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:old_way_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb index e81b8b49c..429e77a92 100644 --- a/test/models/relation_tag_test.rb +++ b/test/models/relation_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class RelationTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:relation_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class RelationTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:relation_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/models/user_preference_test.rb b/test/models/user_preference_test.rb index 952289d94..d6f1dcce5 100644 --- a/test/models/user_preference_test.rb +++ b/test/models/user_preference_test.rb @@ -15,7 +15,7 @@ class UserPreferenceTest < ActiveSupport::TestCase def test_check_valid_length key = "k" val = "v" - (1..255).each do |i| + [1, 255].each do |i| up = UserPreference.new up.user = create(:user) up.k = key * i diff --git a/test/models/way_tag_test.rb b/test/models/way_tag_test.rb index 990a43627..5860786c6 100644 --- a/test/models/way_tag_test.rb +++ b/test/models/way_tag_test.rb @@ -3,7 +3,7 @@ require "test_helper" class WayTagTest < ActiveSupport::TestCase def test_length_key_valid tag = create(:way_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.k = "k" * i assert tag.valid? end @@ -11,7 +11,7 @@ class WayTagTest < ActiveSupport::TestCase def test_length_value_valid tag = create(:way_tag) - (0..255).each do |i| + [0, 255].each do |i| tag.v = "v" * i assert tag.valid? end diff --git a/test/system/confirmation_resend.rb b/test/system/confirmation_resend.rb new file mode 100644 index 000000000..6bbde09e0 --- /dev/null +++ b/test/system/confirmation_resend.rb @@ -0,0 +1,26 @@ +require "application_system_test_case" + +class ConfirmationResendSystemTest < ApplicationSystemTestCase + def setup + @user = build(:user) + visit user_new_path + + fill_in "Email", :with => @user.email + fill_in "Email Confirmation", :with => @user.email + fill_in "Display Name", :with => @user.display_name + fill_in "Password", :with => "testtest" + fill_in "Confirm Password", :with => "testtest" + click_button "Sign Up" + + check "I have read and agree to the above contributor terms" + check "I have read and agree to the Terms of Use" + click_button "Continue" + end + + test "flash message should not contain raw html" do + visit user_confirm_resend_path(@user) + + assert page.has_content?("sent a new confirmation") + assert_not page.has_content?("

      ") + end +end diff --git a/yarn.lock b/yarn.lock index 3d22856b7..ac540af9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,15 +23,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@eslint/eslintrc@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" - integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" @@ -63,6 +63,16 @@ ajv@^6.10.0, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b" + integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-colors@^3.2.1: version "3.2.4" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" @@ -229,6 +239,11 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -255,27 +270,29 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.3.1: - version "7.26.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" - integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.1" + "@eslint/eslintrc" "^0.4.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" + fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^5.1.2" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" @@ -284,7 +301,7 @@ eslint@^7.3.1: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.21" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -293,7 +310,7 @@ eslint@^7.3.1: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^6.0.4" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -345,10 +362,10 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -404,10 +421,10 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -glob-parent@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -423,17 +440,10 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.6.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7" - integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: type-fest "^0.20.2" @@ -540,7 +550,7 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jshashes@~1.0.0: +jshashes@~1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.8.tgz#f60d837428383abf73ab022e1542e6614bd75514" integrity sha512-btmQZ/w1rj8Lb6nEwvhjM7nBYoj54yaEFo2PWh3RkxZ8qNwuvOxvQYN/JxVuwoMmdIluL+XwYVJ+pEEZoSYybQ== @@ -550,6 +560,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -573,10 +588,20 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= minimatch@^3.0.4: version "3.0.4" @@ -601,12 +626,11 @@ object-inspect@^1.9.0: integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== ohauth@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ohauth/-/ohauth-1.0.0.tgz#c2e8bff3bef0ae491447922243e1ba705117de4b" - integrity sha1-wui/877wrkkUR5IiQ+G6cFEX3ks= + version "1.0.1" + resolved "https://registry.yarnpkg.com/ohauth/-/ohauth-1.0.1.tgz#a5d4ab8e5390bb1cad68a58cc9c58630173c02f2" + integrity sha512-R9ZUN3+FVCwzeOOHCJpzA9jw/byRxp5O9X06mTL6Sp/LIQn/rLrMv6cwYctX+hoIKzRUsalGJXZ1kG5wBmSskQ== dependencies: - jshashes "~1.0.0" - xtend "~4.0.0" + jshashes "~1.0.8" once@^1.3.0: version "1.4.0" @@ -671,6 +695,11 @@ regexpp@^3.1.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -758,15 +787,17 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -table@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d" - integrity sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw== +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: - ajv "^6.12.4" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" text-table@^0.2.0: version "0.2.0" @@ -785,11 +816,6 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" @@ -818,8 +844,3 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -xtend@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

      <%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %><%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %><%= time_ago_in_words(comment.created_at, :scope => :"datetime.distance_in_words_ago") %> <%= comment.body.to_html %>
      <% if issue.user_updated %> <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)), - :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), + :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), :title => l(issue.updated_at) %> <% else %> - <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), + <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), :title => l(issue.updated_at) %> <% end %>